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

diff --combined portal/templates/onelab/onelab_home-view.html
index 511ac5a,6fd7e1d..002fe08
--- 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>
@@@ -59,7 -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>
@@@ -112,4 -112,4 +112,4 @@@
                {% endif %}
        });
  </script>
- {% endblock unfold_main %}
+ {% endblock %}