X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Ftemplates%2Finstitution.html;h=a1275950c1f7c211ff61efbaeada275b18dbb8d0;hb=8b147c2787afcd2a94a71e2d2b1e57a7bc78ed64;hp=79b7361c9186beb717492e409c9745d341a4d241;hpb=e187276bb5da1d4e7195fd9aea066ae3b34b2df4;p=unfold.git

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index 79b7361c..a1275950 100644
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -8,7 +8,7 @@
 <div class="container">
 	<div class="row">
 		<div class="col-md-12">
-			<ul class="nav nav-tabs">
+			<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><a href="#users">Users</a></li>
 				<li><a href="#slices">Slices</a></li>
@@ -21,49 +21,66 @@
 	  	<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 id="authority-data"></div>
 		    </div>
 	   </div>
 	</div>
-	
+
 	<div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
 		<div class="col-md-12">
-			<table class="table"><tr><td><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></td></tr></table>
-			<div>
-				<button id="deleteusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Delete Users</button>
+			<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">
+        				<tr>
+            				<th>+/-</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>
 		</div>
-	</div>
+ 	</div>
+	
 	<div class="tab-pane row" id="slices">
-	  	<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> create slice</button>
 	    <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 	    <div id="slice-tab-loaded" style="display:none;">
+	    	{%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%}
 	        <table id="slice-tab">
 	            <tr>
 	                <th>+/-</th>
 	                <th>slice_hrn</th>
 	                <th>users</th>
 	                <th>url</th>
-	                <th>nodes</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%} 
 	    </div>
 	</div>
 </div>
 <script>
-    $(document).ready(function() {
-        {% if person %}
-        {% if user_details.parent_authority %}
+$(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 = [];
@@ -74,44 +91,6 @@
                 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( "" ));
@@ -123,7 +102,7 @@
         $.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){
@@ -131,11 +110,10 @@
                 }else{
                     nodes_length=val.nodes.length;
                 }
-
-                if(val.user=="undefined" || val.user==null){
-                    user_length=0;
+                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){
@@ -147,9 +125,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);
@@ -161,37 +139,34 @@
             $("div#slice-tab-loaded").css("display","block");
             $("div#slice-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");
-         // });
-         {% endif %}
-         {% endif %}
-    });
 
+		$.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");
+          });
+
+   {% endif %}
+   {% endif %}
 
+}); // end document.ready
 </script>
 {% endblock %}