institution style

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 1d73942..e61d07a 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -339,24 +339,24 @@ div#ticket-request p {
 }
 
 /* SLICE VIEW */
-ul.nav-sliceview {}
-ul.nav-sliceview li {
+ul.nav-tabs {}
+ul.nav-tabs li {
     
 }
-ul.nav-sliceview li a {
+ul.nav-tabs li a {
     border-bottom:0;
 }
-ul.nav-sliceview li:first-child {
+ul.nav-tabs li:first-child {
     padding:0;
 }
-ul.nav-sliceview li:first-child a {
+ul.nav-tabs li:first-child a {
     font-weight:bold;
     padding:6px 15px 4px 15px;
 }
-ul.nav-sliceview li:first-child.active a {
+ul.nav-tabs li:first-child.active a {
     padding:6px 15px 3px 15px;
 }
-ul.nav-sliceview li:first-child img {
+ul.nav-tabs li:first-child img {
     margin:0 4px 1px 0;
     padding:0;
 }

diff --git a/portal/static/js/institution.js b/portal/static/js/institution.js
index 1ddb3e3..e8c863e 100644 (file)
--- a/portal/static/js/institution.js
+++ b/portal/static/js/institution.js
@@ -1,24 +1,20 @@
 $(document).ready(function() {
-       $('li#nav-institution').addClass("active");
-
-    $('a.home-tab').click(function() {
-        $('ul.nav-tabs li').removeClass('active');
-        $(this).parent().addClass('active');
-        $('div.home-panel').hide();
-        $('div#'+$(this).data('panel')).show();
-    });
-    var url = window.location;
-    if(url.hash) {
-        // Fragment exists 
-        tab = url.href.split("#")[1];
-        tab_exists = $('div#'+tab).length;
-        if (tab_exists) {
-           $('ul.nav-tabs li').removeClass('active');
-           $('li#'+tab+'-tab').addClass('active');
-           $('div.home-panel').hide();            
-           $('div#'+tab).show();
-        }
-    }
+       loadedTabs = [];
+       
+       $('.nav-tabs a').click(function (e) {
+               e.preventDefault();
+               $(this).tab('show');
+               id = $(this).attr('href').substr(1);
+               if (!(id in loadedTabs)) {
+                       switch(id) {
+                               case 'users':
+                                       loadUsers();
+                                       loadedTabs[id] = true;
+                               break;
+                       }
+               }
+               
+       });
 
     /* TODO: factorize into functions */
     $('button#deleteusers').click(function() {
@@ -86,3 +82,13 @@ $(document).ready(function() {
         */
     });
 });
+
+function loadUsers() {
+       $('div#users table').load('/table/user/',
+               {
+                       'fields'  : [ 'user_hrn', 'user_first_name', 'user_last_name', 'user_email', 'user_phone' ],
+                       'filters' : { 'parent_authority' : $('div#users').data('authority') },
+                       'options' : [ 'checkbox' ]
+               }
+       );
+}

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index ca9fe5a..79b7361 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -1,70 +1,70 @@
-{% extends "layout.html" %}
+{% extends "layout_wide.html" %}
+
 {% block head %} 
 <script type="text/javascript" src="{{STATIC_URL}}/js/institution.js"></script>
 {% endblock head %}
+
 {% block content %}
-<div class="row">
-       <h1><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /> Institution: {{user_details.parent_authority}}</h1>
+<div class="container">
+       <div class="row">
+               <div class="col-md-12">
+                       <ul class="nav nav-tabs">
+                               <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>
+                       </ul>
+           </div>
+       </div>
 </div>
-<div class="row" id="institution">
-    <ul class="nav nav-tabs">
-      <li class="active" id="authority-tab"><a class="home-tab" data-panel="institution" href="#">INFO</a></li>
-      <li id="users-tab"><a class="home-tab" data-panel="users" href="#">USERS</a></li>
-      <li id="slices-tab"><a class="home-tab" data-panel="slices" href="#">SLICES</a></li>
-    </ul>
-    <div class="home-panel" id="institution">
-        <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="home-panel" id="users" style="display:none;">
-        <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>
-            <br>
-            <button id="deleteusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Delete Users</button>
-        </div>
-       </div>
-    <div class="home-panel" id="slices" style="display:none;">
-        <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;">
-            <table id="slice-tab">
-                <tr>
-                    <th>+/-</th>
-                    <th>slice_hrn</th>
-                    <th>users</th>
-                    <th>url</th>
-                    <th>nodes</th>
-                    <th>expiration</th>
-                </tr>
-            </table>
-            <br>
-            <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>
-        </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>
+       
+       <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>
+               </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;">
+               <table id="slice-tab">
+                   <tr>
+                       <th>+/-</th>
+                       <th>slice_hrn</th>
+                       <th>users</th>
+                       <th>url</th>
+                       <th>nodes</th>
+                       <th>expiration</th>
+                   </tr>
+               </table>
+               <br>
+               <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>
+           </div>
+       </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 = [];
@@ -161,34 +161,37 @@
             $("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");
-         });
+               
+               
+        // $.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 %}
     });
+
+
 </script>
 {% endblock %}

diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
index 0444a82..cf9ee7d 100644 (file)
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-<div class="wrapper">
+<div class="container">
        <div class="row">
                <div class="col-md-12">
                        {% include theme|add:"_widget-slice-sections.html" %}

diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html
index 6a98632..3088158 100644 (file)
--- a/portal/templates/onelab/onelab_widget-slice-sections.html
+++ b/portal/templates/onelab/onelab_widget-slice-sections.html
@@ -1,5 +1,5 @@
 {% if section == "resources" %}
-<ul class="nav nav-tabs nav-sliceview">
+<ul class="nav nav-tabs">
        <li><a href="/slice/{{ slice }}#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
        <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li>
        <li class="active"><a class="link" href="/resources/{{ slice }}">Resources</a></li>
@@ -9,7 +9,7 @@
        <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">Experiment</a></li>
 </ul>
 {% else %}
-<ul class="nav nav-tabs nav-sliceview">
+<ul class="nav nav-tabs">
        <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
        <li class="testbeds"><a href="#testbeds">Testbeds</a></li>
        <li><a class="link" href="/resources/{{ slice }}">Resources</a></li>
@@ -20,7 +20,7 @@
 </ul>
 <script>
 $(document).ready(function() {
-       $('.nav-sliceview a').click(function (e) {
+       $('.nav-tabs a').click(function (e) {
                if ($(this).hasClass('link')) return;
                e.preventDefault();
                $(this).tab('show');

diff --git a/portal/templates/supportview.html b/portal/templates/supportview.html
index d35d226..f0d9ff0 100644 (file)
--- a/portal/templates/supportview.html
+++ b/portal/templates/supportview.html
@@ -2,7 +2,7 @@
 
 {% block content %}
        <div class="row">
-               <h1><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="Request a Slice" /> OneLab Portal Support</h1>
+               <h1><img src="{{ STATIC_URL }}icons/support-xs.png" alt="Support" /> OneLab Portal Support</h1>
        </div>