X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_institution.html;h=c8a668f1f299631d6c9afab9790559605313b938;hb=0f9507be5bc87bdef40b3f34d6514bd888ee2abe;hp=1b6a1224f9ef7eeb22fce5d28c9aa97c68be972b;hpb=1b77de34cb9a655ab718543aafed5ee76b723fca;p=myslice.git

diff --git a/portal/templates/onelab/onelab_institution.html b/portal/templates/onelab/onelab_institution.html
index 1b6a1224..c8a668f1 100644
--- a/portal/templates/onelab/onelab_institution.html
+++ b/portal/templates/onelab/onelab_institution.html
@@ -5,147 +5,95 @@
 {% endblock head %}
 
 {% block content %}
+<div class="container">
+	<div class="row">
+		<div class="col-md-12">
+			 <div class="breadcrumbs">
+			 	 Management &nbsp;>&nbsp; Institution: <span id="authority_name"></span>
+			 </div>
+		</div>
+	</div>
+</div>
 <div class="container">
 	<div class="row">
 		<div class="col-md-12">
 			<ul class="nav nav-tabs nav-section">
-				<li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/authority-xs.png" alt="Institution" /> Institution {{user_details.parent_authority}}</a></li>
+				<li class="active"><a href="#about">About</a></li>
 				<li><a href="#users">Users</a></li>
 				<li><a href="#slices">Slices</a></li>
+				<li><a href="#requests">Requests</a></li>
 			</ul>
 	    </div>
 	</div>
 </div>
 <div class="container tab-content">
-	<div class="tab-pane active row" id="info">
-	  	<div class="col-md-12">
-		  	<div id="authority-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Authority" /></div>
-		    <div id="authority-tab-loaded" style="display:none;">
-		        <div id="authority-data" style="float:left; width:50%;"></div>
-				<div id="onelab_membership" style="float:right; width:50%;">
-				    <img src="{{ STATIC_URL }}img/onelab-logo.png" alt="" /><br>
-    				<div id="onelab-data"></div>
-				</div>
-		    </div>
-	   </div>
+	<div class="tab-pane active row" id="about">
 	</div>
 	
 	<div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
-		<div class="col-md-12">
+		<div class="col-md-12 el">
 			<div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 				<div id="user-tab-loaded" style="display:none;">
-    				<table id="user-tab">
+    				<table id="user-tab" class="table">
         				<tr>
             				<th>+/-</th>
-            				<th>email</th>
-            				<th>user_hrn</th>
-            				<th>first name</th>
-            				<th>last name</th>
-            				<th>enabled</th>
+            				<th>Email</th>
+            				<th>User hrn</th>
+            				<th>First name</th>
+            				<th>Last name</th>
+            				<th>Enabled</th>
         				</tr>
     				</table>
-				{%if 'is_pi'  in pi %}	
-				<div>
-					<button id="deleteusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Delete Users</button>
-				</div>
-				{%endif%}
+				
+			</div>
+			{%if 'is_pi'  in pi %}	
+			<div>
+				<button id="deleteusers" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete selected users</button>
 			</div>
+			{% endif %}
 		</div>
  	</div>
 
 	<div class="tab-pane row" id="slices">
-		{%if 'is_pi'  in pi %}
-	  	<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> create slice</button>
-		{%else%}
-		<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> request slice</button>
-		{%endif%}
+		<div class="col-md-12 el">
 	    <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 	    <div id="slice-tab-loaded" style="display:none;">
-	        <table id="slice-tab">
+	        <table id="slice-tab" class="table">
 	            <tr>
 	                <th>+/-</th>
-	                <th>slice_hrn</th>
-	                <th>users</th>
-	                <th>url</th>
-	                <th>nodes</th>
-	                <th>expiration</th>
+	                <th>Slice hrn</th>
+	                <th>Users</th>
+	                <th>Url</th>
+	                <!-- <th>nodes</th> -->
+	                <th>Expiration</th>
 	            </tr>
-	        </table>
-	        <br>
-			{%if 'is_pi'  in pi %}
-	        <div>
-	            <button id="renewslices" type="button" class="btn btn-default"><span class="glyphicon glyphicon-refresh"></span> Renew Slices</button>
-	            <button id="deleteslices" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Delete Slices</button>
-	        </div>
-			{%endif%} 
+	        </table>			
 	    </div>
+    	{% if 'is_pi'  in pi %}
+        <div>
+        	{% if 'is_pi'  in pi %}
+	  		<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
+			{% else %}
+			<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
+			{% endif %}
+            <button id="renewslices" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-refresh"></span> Renew Slices</button>
+            <button id="deleteslices" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete Slices</button>
+        </div>
+		{% endif %} 
+	   </div>
+	</div>
+	<div class="tab-pane row" id="requests">
 	</div>
 </div>
 <script>
-    $(document).ready(function() {
-        {% if person %}
-        {% if user_details.parent_authority %}
-        
-        $.post("/rest/authority/",{'filters':{'authority_hrn':'{{user_details.parent_authority}}'}}, function( data ) {
-            var authority_data = [];
-            var onelab_data = [];
-			/* 'city','enabled','legal','longitude','onelab_membership','address','parent_authority','slice','user','country',
-            'tech','abbreviated_name','url','postcode','description','scientific','authority_hrn','latitude','name'	*/
-            $.each( data, function( key, val ) {
-                authority_row = "<img src='{{ STATIC_URL }}img/institutions/{{user_details.parent_authority}}.gif' alt='' /><br>";
-                authority_row += "<br>";
-                authority_row += "<b>authority:</b> "+val.authority_hrn+"<br>";
-				authority_row += "<br>";
-                authority_row += "<b>"+val.name+"</b><br>";
-                authority_row += "<br>";
-                authority_row += "<b>Address:</b> "+val.address+"<br>";
-                authority_row += "<b>City:</b> "+val.postcode+" "+val.city+"<br>";
-                authority_row += "<br>";
-                authority_row += "<b>Country:</b> "+val.country+"<br>";
-                authority_row += "<br>";
-                authority_row += "<br>";
-                authority_row += "<h2>Contacts</h2>";
-                authority_row += "<b>Legal:</b> ";
-				/*
-
-                TODO: find a way to express JSON correctly given the constrains: CSV / JSON
-
-                legal = jQuery.parseJSON(val.legal);
-                if($.isArray(legal)){
-                    $.each(legal, function(k,v){
-                        authority_row += k+" "+v+"<br>";
-                    });
-                }else{
-                */
-                    authority_row += val.legal+"<br>";
-                //}
-                authority_row += "<br>";
-                authority_row += "<b>Scientific:</b> ";
-                /*
-                scientific = jQuery.parseJSON(val.scientific);
-                if($.isArray(scientific)){
-                    $.each(scientific, function(v){
-                        authority_row += v+", ";
-                    });
-                }else{
-                */
-                    authority_row += val.scientific+"<br>";
-                //}
-                onelab_membership = "<b>Status: </b>"+val.onelab_membership;
-                onelab_data.push(onelab_membership);
-                authority_data.push(authority_row);
-
-            });
-            $("div#authority-data").html(authority_data.join( "" ));
-            $("div#onelab-data").html(onelab_data.join( "" ));
-            $("div#authority-tab-loaded").css("display","block");
-            $("div#authority-tab-loading").css("display","none");
-         });
+$(document).ready(function() {
+    {% if person %}
+    {% if user_details.parent_authority %}
 
         $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];
-            /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "user", "slice_urn", "slice_expires" */
+            /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */
             $.each( data, function( key, val ) {
                 list_slices.push( "<li><a href=\"portal/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );
                 if(val.nodes=="undefined" || val.nodes==null){
@@ -153,11 +101,11 @@
                 }else{
                     nodes_length=val.nodes.length;
                 }
-
-                if(val.user=="undefined" || val.user==null){
-                    user_length=0;
+                console.log(val);
+                if(val.users=="undefined" || val.users==null){
+                    users_length=0;
                 }else{
-                    user_length=val.user.length;
+                    users_length=val.users.length;
                 }
 
                 if(val.slice_url=="undefined" || val.slice_url==null){
@@ -169,9 +117,9 @@
                 slice_row = "<tr id='"+val.slice_hrn+"'>";
                 slice_row += "<td><input type='checkbox' class='slice' id='"+val.slice_hrn+"'></td>";
                 slice_row += "<td><a href=\"/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></td>";
-                slice_row += "<td>"+user_length+"</td>";
+                slice_row += "<td>"+users_length+"</td>";
                 slice_row += "<td>"+slice_url+"</td>";
-                slice_row += "<td>"+nodes_length+"</td>";
+                //slice_row += "<td>"+nodes_length+"</td>";
                 slice_row += "<td>"+val.slice_expires+"</td>";
                 slice_row += "</tr>";
                 table_slices.push(slice_row);
@@ -185,50 +133,49 @@
         });
 		
 		
-         $.post("/rest/user/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
-             var list_users = [];
-             var table_users = [];
-			 /* Available fields
-			 user_gid, user_enabled, slices, pi_authorities, keys, parent_authority, user_first_name,
-			 user_urn, user_last_name, user_phone, user_hrn, user_email, user_type
-			 */
-             $.each( data, function( key, val ) {
-                 list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
-                 user_row = "<tr id='"+val.user_hrn+"'>";
-                 user_row += "<td><input type='checkbox' class='user' id='"+val.user_hrn+"'></td>";
-                 user_row += "<td>"+val.user_email+"</td>";
-                 user_row += "<td>"+val.user_hrn+"</td>";
-                 user_row += "<td>"+val.user_first_name+"</td>";
-                 user_row += "<td>"+val.user_last_name+"</td>";
-				 user_row += "<td>"+val.user_enabled+"</td>";
-                 user_row += "</tr>";
-                 table_users.push(user_row);
-//                 
-             });
-             $("table#user-tab tr:last").after(table_users.join( "" ));
-             $("div#user-tab-loaded").css("display","block");
-             $("div#user-tab-loading").css("display","none");
-          });
+        $.post("/rest/user/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+            var list_users = [];
+            var table_users = [];
+		    /* Available fields
+		    user_gid, user_enabled, slices, pi_authorities, keys, parent_authority, user_first_name,
+		    user_urn, user_last_name, user_phone, user_hrn, user_email, user_type
+		    */
+            $.each( data, function( key, val ) {
+                list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
+                user_row = "<tr id='"+val.user_hrn+"'>";
+                user_row += "<td><input type='checkbox' class='user' id='"+val.user_hrn+"'></td>";
+                user_row += "<td>"+val.user_email+"</td>";
+                user_row += "<td>"+val.user_hrn+"</td>";
+                user_row += "<td>"+val.user_first_name+"</td>";
+                user_row += "<td>"+val.user_last_name+"</td>";
+		   	    user_row += "<td>"+val.user_enabled+"</td>";
+                user_row += "</tr>";
+                table_users.push(user_row);
+            });
+            $("table#user-tab tr:last").after(table_users.join( "" ));
+            $("div#user-tab-loaded").css("display","block");
+            $("div#user-tab-loading").css("display","none");
+        });
 
- 		$('button#deleteusers').click(function() {
-     		$('input:checkbox.user').each(function (index) {
-         		if(this.checked){
-             		var record_id = this.id;
-             		$.post("/delete/user/",{'filters':{'user_hrn':this.id}}, function(data) {
-                 	if(data.success){
-                     	$('tr[id="'+record_id+'"]').fadeOut("slow");
-                     	$('tr[id="'+record_id+'"]').remove();
-                 	}else{
-                     	alert("Rest Error for "+record_id+": "+data.error);
-                 	}   
-             	});     
-         	} 
-     	}); 
- 	}); 
- {% endif %}
- {% endif %}
-});
+    {% endif %}
+    {% endif %}
 
+}); // End document.ready
 
+$(document).ready(function() {
+	$('.nav-tabs a').click(function (e) {
+  		e.preventDefault();
+  		$(this).tab('show');
+    	var id = $(this).attr('href').substr(1);
+    	if ((id == 'requests') || (id == 'about'))
+    		$("#" + id).load('/management/' + id);
+	});
+	var hash = window.location.hash;
+	if (hash) {
+		$('.nav-tabs a[href='+hash+']').click();
+	} else {
+		$('.nav-tabs a[href=#about]').click();
+	}
+});
 </script>
 {% endblock %}