From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 27 Feb 2014 18:05:31 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~268^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6ba53085c00c1f416b28fd505e6611c154f0cc71;hp=-c;p=myslice.git

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

6ba53085c00c1f416b28fd505e6611c154f0cc71
diff --combined portal/templates/onelab/onelab_home-view.html
index 511ac5a3,6fd7e1d9..002fe080
--- a/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 %}