resolved rest conflicts

[myslice.git] / portal / templates / institution.html

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index fdae516..44aa55d 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -1,19 +1,17 @@
 {% extends "layout-unfold1.html" %}
 
 {% block unfold_main %}
-<div class="wrapper" id="home-dashboard">
+<div class="wrapper" id="institution">
     <ul class="nav nav-tabs">
       <li class="active"><a class="home-tab" data-panel="institution" href="#">INSTITUTION</a></li>
       <li><a class="home-tab" data-panel="users" href="#">USERS</a></li>
       <li><a class="home-tab" data-panel="slices" href="#">SLICES</a></li>
     </ul>
     <div class="home-panel" id="institution">
-        <br>
-        <h1>Affiliation to an Institution</h1>
+        <h1><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /> Affiliation to an Institution</h1>
         <br>
         <div style="float:left; width:30%;">
-            <img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /><br>
-            <br>
+            
             <img src="{{ STATIC_URL }}img/onelab-logo.png" alt="" /><br>
             <b>Membership:</b> Governor
         </div>
@@ -71,29 +69,22 @@
     <div class="home-panel" id="slices" style="display:none;">
         <br>
         <h1>Slices: onelab.upmc <button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create a Slice</button></h1>
-        <table>
-            <tr>
-                <th>+/-</th>
-                <th>slice_hrn</th>
-                <th>number of users</th>
-                <th>expiration date</th>
-            </tr>
-            <tr>
-                <td><input type="checkbox"></td>
-                <td><a href="/portal/slice/ple.upmc.myslicedemo">onelab.upmc.myslicedemo</a></td>
-                <td>3</td>
-                <td>2014-02-11 17:20:37</td>
-            </tr>
-            <tr>
-                <td><input type="checkbox"></td>
-                <td><a href="/portal/slice/ple.upmc.zzzz">onelab.upmc.zzzz</a></td>
-                <td>3</td>
-                <td>2014-02-11 17:20:37</td>
-            </tr>
-        </table>
-        <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 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>
+            <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>
@@ -113,6 +104,48 @@
             window.location="/portal/slice_request/";
             */
         });
+        {% if person %}
+        $.getJSON("/rest/slice/", 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" */
+            $.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){
+                    nodes_length=0;
+                }else{
+                    nodes_length=val.nodes.length;
+                }
+
+                if(val.user=="undefined" || val.user==null){
+                    user_length=0;
+                }else{
+                    user_length=val.user.length;
+                }
+
+                if(val.slice_url=="undefined" || val.slice_url==null){
+                    slice_url="";
+                }else{
+                    slice_url="<a href='"+val.slice_url+"' target='_blank'>"+val.slice_url+"</a>";
+                }
+                
+                slice_row = "<tr>";
+                slice_row += "<td><input type='checkbox'></td>";
+                slice_row += "<td><a href=\"/portal/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></td>";
+                slice_row += "<td>"+user_length+"</td>";
+                slice_row += "<td>"+slice_url+"</td>";
+                slice_row += "<td>"+nodes_length+"</td>";
+                slice_row += "<td>"+val.slice_expires+"</td>";
+                table_slices.push(slice_row);
+                
+            });
+           
+            /* $("div#slice-list").html($( "<ul/>", { html: list_slices.join( "" ) })); */
+            $("table#slice-tab tr:last").after(table_slices.join( "" ));
+            $("div#slice-tab-loaded").css("display","block");
+            $("div#slice-tab-loading").css("display","none");
+         });
+         {% endif %}
     });
 </script>
 {% endblock unfold_main %}