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

[myslice.git] / portal / templates / onelab / onelab_home-view.html

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index a1206de..4915b9e 100644 (file)
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -1,7 +1,7 @@
-{% extends "layout-unfold1.html" %}
+{% extends "layout.html" %}
 
-{% block unfold_main %}
-<div class="wrapper" id="home-dashboard">
+{% block content %}
+<div class="row" id="home-dashboard">
        <ul class="nav nav-tabs">
          <li class="active"><a class="home-tab" data-panel="user" href="#">USER</a></li>
          <li><a class="home-tab" data-panel="manager" href="#">MANAGER</a></li>
@@ -59,7 +59,7 @@
                        </tr>
                        <tr>
                                <td><a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a></td>
-                               <td><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></td>
+                               <td><a href="/portal/institution#slices"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a></td>
                                <td><a href="/portal/validate"><img src="{{ STATIC_URL }}img/icon_testbed_color.png" alt="" /></a></td>
                        </tr>
                        <tr>
@@ -72,10 +72,14 @@
                                {% endif %}
                                </td>
                                <td>
+                                       {% if person %}
                                    <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create a Slice</button>
+                                       {% endif %}
                                </td>
                                <td class="support">
+                                       {% if person %}
                                    <button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
+                                       {% endif %}
                                </td>
                        </tr>
                </table>
@@ -102,8 +106,8 @@
                {% if person %}
         $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
                  var items = [];
-                 $.each( data[0].slice, function( key, val ) {
-                       items.push( "<li><a href=\"/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );
+                 $.each( data[0].slices, function(i, val) {
+                       items.push( "<li><a href=\"/slice/"+val+"\">" + val + "</a></li>" );
                  });
                  
                  $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
@@ -112,4 +116,4 @@
                {% endif %}
        });
 </script>
-{% endblock unfold_main %}
+{% endblock %}