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

diff --combined portal/templates/onelab/onelab_home-view.html
index 636f150,a1206de..6fd7e1d
--- 1/portal/templates/onelab/onelab_home-view.html
--- 2/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@@ -1,7 -1,7 +1,7 @@@
 -{% extends "layout-unfold1.html" %}
 +{% extends "base.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>
@@@ -26,7 -26,7 +26,7 @@@
                                        {% if person.last_name %}
                                                {{person.first_name}} {{person.last_name}}<br />
                                        {% endif %}
-                                       <span class="label">Email:</span> <a href='mailto:{{person.email}}'>{{person.email}}</a>
+                                       <span class="label">Email:</span> <a href='/portal/account/'>{{person.email}}</a>
                                </div>
                                {% else %}
                                <td>
@@@ -65,20 -65,17 +65,17 @@@
                        <tr>
                                {% if person %}
                                <td class="logged-in">
-                                       {% if person.last_name %}
-                                       <div><span id='username'>{{person.first_name}} {{person.last_name}}</span></div> {% endif %}
-                               <div><b>Email: </b><a href='mailto:{{person.email}}'>{{person.email}}</a></div>
+                                       <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
                                {% else %}
                                <td>
                                        {% include 'onelab__widget-login-manager.html' %}
                                {% endif %}
                                </td>
                                <td>
-                                       
+                                   <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create a Slice</button>
                                </td>
                                <td class="support">
-                                       <div><a href=""></a></div>
-                                       <div><a href=""></a></div>
+                                   <button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
                                </td>
                        </tr>
                </table>
@@@ -92,6 -89,9 +89,9 @@@
                        $('div.home-panel').hide();
                        $('div#'+$(this).data('panel')).show();
                });
+               $('button#validaterequestbtn').click(function() {
+                       window.location="/portal/validate/";
+               });
                $('button#ticketbtn').click(function() {
                        window.location="/portal/contact/";
                });
@@@ -103,7 -103,7 +103,7 @@@
          $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
                  var items = [];
                  $.each( data[0].slice, function( key, val ) {
-                       items.push( "<li><a href=\"portal/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );
+                       items.push( "<li><a href=\"/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );
                  });
                  
                  $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
@@@ -112,4 -112,4 +112,4 @@@
                {% endif %}
        });
  </script>
 -{% endblock unfold_main %}
 +{% endblock %}