X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_widget-topmenu.html;h=e81121b74a4c6a24b4b21e037be14183abfa89a9;hb=8b147c2787afcd2a94a71e2d2b1e57a7bc78ed64;hp=cf81029592bb299d21be73b62961f508f7345e03;hpb=c624b017611ae21cda21f28529cd8412dfc12669;p=unfold.git

diff --git a/portal/templates/onelab/onelab_widget-topmenu.html b/portal/templates/onelab/onelab_widget-topmenu.html
index cf810295..e81121b7 100644
--- a/portal/templates/onelab/onelab_widget-topmenu.html
+++ b/portal/templates/onelab/onelab_widget-topmenu.html
@@ -1,50 +1,54 @@
+{% load portal_filters %}
+<div class="header">
+<div class="container">
+	<div class="row">
+		<div class="col-sm-3 col-md-3 logo">
+			<a href="/"><img src="{{ STATIC_URL }}img/onelab-portal.png" alt="OneLab Portal - Future Internet Testbeds" /></a>
+		</div>
+		{% if username %}
+		<div class="col-sm-5 col-md-5 navigation">
+			<ul>
+				<li>
+					<a class="dropdown-toggle" data-toggle="dropdown" href="#">
+	       				EXPERIMENT <span class="caret"></span>
+	    			</a>
+					
+					<div class="dropdown-menu" style="z-index:99;">
+							<ul id="dropdown-slice-list">
+								<li><a href="/portal/slice_request/">Request Slice</a></li>
+							</ul>
+					</div>
+				</li>
+				<li id="nav-institution" class=""><a href="/portal/institution">MANAGEMENT</a></li>
+				<li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
+				<li><a href="/portal/support/">SUPPORT</a></li>
+				
+				
 
-<div id="header">
-	<div class="wrapper">
-		<div class="logo">
-			<a href="/"><img src="{{ STATIC_URL }}img/onelab-portal.png" alt="OneLab - Future Internet Testbeds" /></a>
+			</ul>
 		</div>
-		
-		<div id="secondary">
+		{% else %}
+		<div class="col-sm-5 col-md-5 navigation">
+		</div>
+		{% endif %}
+		<div class="col-sm-4 col-md-4 secondary">
 			<ul>
-				<li>News</li>
+				
+				<li><a href="/news">News</a></li>
 				<li><a href="/portal/about">About</a></li>
 				<li><a target="_blank" href="http://www.onelab.eu">Public Website</a></li>
 				<li><a target="_blank" href="http://intranet.onelab.eu">Intranet</a></li>
 			</ul>
+			{% if username %}
+			<div class="account">You are logged in as &nbsp;<a href="/portal/account/">{{ username }}</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</a></div>
+			{% endif %}
 		</div>
 	</div>
-	
-	{% if username %}
-	<div id="navigation">
-		<div class="wrapper">
-		<ul>
-			<li id="nav-account"><a href="/portal/account/">{{ username }}</a></li>
-			<li>|</li>
-			<li id="nav-institution" class=""><a href="/portal/institution">INSTITUTION</a></li>
-			<li class="slices">
-				<a class="dropdown-toggle" data-toggle="dropdown" href="#">
-       				SLICES <span class="caret"></span>
-    			</a>
-				
-				<div class="dropdown-menu" style="z-index:99;">
-						<ul id="dropdown-slice-list">
-							<li><a href="/portal/slice_request/">Request Slice</a></li>
-						</ul>
-				</div>
-				</li>
-			<li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
-			<li id="nav-support"><a href="/portal/support/">SUPPORT</a></li>
-			<li>|</li>
-			<li id="nav-logout" style="margin-top: 10px;"><a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> LOGOUT</a></li>
-		</ul>
-		</div>
-	</div>
-	{% else %}
-	<div id="navigation">
-		<div class="wrapper"></div>
-	</div>
-	{% endif %}
+</div>
+</div>
+
+<div class="row">
+{% widget '_widget-message.html' %}
 </div>
 <script>
 	$(document).ready(function() {