From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 24 Feb 2014 11:33:40 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~316
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=758fe73ec299e651eea0b2dc948ab320d30672a2;p=unfold.git

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

758fe73ec299e651eea0b2dc948ab320d30672a2
diff --cc portal/templates/institution.html
index e31c43c6,fdae516a..0f68468e
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@@ -1,10 -1,10 +1,10 @@@
  {% 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="#">MANAGERS & USERS</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">