Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[myslice.git] / portal / templates / fibre / fibre_institution.html

diff --git a/portal/templates/fibre/fibre_institution.html b/portal/templates/fibre/fibre_institution.html
index 1d6cf97..3e3d415 100644 (file)
--- a/portal/templates/fibre/fibre_institution.html
+++ b/portal/templates/fibre/fibre_institution.html
@@ -6,32 +6,29 @@
 
 {% 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 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="#about">About</a></li>-->
-                               <li class="active"><a href="#users">Users</a></li>
-                               <li><a href="#slices">Slices</a></li>
-                               <li><a href="#requests">Requests</a></li>
-                       </ul>
-           </div>
-       </div>
+  <div class="row">
+    <div class="col-md-12">
+      <ul class="nav nav-tabs nav-section">
+       <li class="active"><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="about">
-       </div>
--->
-       <div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
+       <div class="tab-pane active row" id="users" data-authority="{{user_details.parent_authority}}">
                <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;">
@@ -98,13 +95,10 @@ $(document).ready(function() {
     {% if user_details.parent_authority %}
 
         $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
-           var username = "{{person.username}}";
             var list_slices = [];
             var table_slices = [];
             /* "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 ) {
-               if(String(val.users[0]).indexOf("@") != -1){
-               if(String(val.users[0]).split("@")[1] == username.split("@")[1]){
                 list_slices.push( "<li><a href=\"portal/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );
                 if(val.nodes=="undefined" || val.nodes==null){
                     nodes_length=0;
@@ -133,8 +127,6 @@ $(document).ready(function() {
                 slice_row += "<td>"+val.slice_expires+"</td>";
                 slice_row += "</tr>";
                 table_slices.push(slice_row);
-               }
-              }
             });
            
             /* $("div#slice-list").html($( "<ul/>", { html: list_slices.join( "" ) })); */