X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_widget-topmenu.html;h=3f2bd7ae37328cb53fe49748a2abebef9219fc98;hb=00446adb7d1cd10387002c24cf1fa267fe655d28;hp=8e0332640a73f65d0c1a238adf1ba9ebb87686dd;hpb=be718e3336ee7ad98e90b0b3c97b58b37a467788;p=unfold.git

diff --git a/portal/templates/fed4fire/fed4fire_widget-topmenu.html b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
index 8e033264..3f2bd7ae 100644
--- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html
+++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
@@ -1,56 +1,52 @@
 
 <div id="header">
-	<div class="wrapper">
-		<div class="logo">
-			<a href="/"><img src="{{ STATIC_URL }}img/f4f-logo.png" alt="Fed4Fire Portal" width="80px" /> Fed4Fire Portal</a>
-		</div>
-		
-		<div id="secondary">
+    <div class="container">
+    <div class="row">
+        <div class="col-sm-4 col-md-4 logo">
+            <a href="/"><img src="{{ STATIC_URL }}img/f4f-logo.png" alt="Fed4Fire Portal" width="80px" /></a>
+        </div>
+        
+        
+	    <div id="secondary" class="col-sm-8 col-md-8 secondary">
 			<ul>
-				<li>News</li>
 				<li><a href="/portal/about">About</a></li>
-				<li><a target="_blank" href="http://www.fed4fire.eu">Project Website</a></li>
+				<li><a href="http://doc.fed4fire.eu/">Documentation</a></li>
+				<li><a target="_blank" href="http://www.fed4fire.eu">Project website</a></li>
 			</ul>
 		</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>
-							<li><a href="/portal/slice_request/">Request Slice</a></li>
-                            <!--
-							<li><a href="/slice/ple.upmc.agent3/">ple.upmc.agent3</a></li>
-						    <li><a href="/slice/ple.upmc.agent/">ple.upmc.agent</a></li>
-						    <li><a href="/slice/ple.upmc.myslicedemo/">ple.upmc.myslicedemo</a></li>
-						    <li><a href="/slice/ple.upmc.slicestat/">ple.upmc.slicestat</a></li>
-						    <li><a href="/slice/ple.upmc.agent2/">ple.upmc.agent2</a></li>
-                            -->
-						</ul>
-				</div>
-				</li>
-			<li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
-			<li id="nav-support"><a href="http://doc.fed4fire.eu/support.html" target="_blank">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 id="navigation">
+    <div class="container"> 
+	<div class="row">
+	   {% if username %}
+        <div class="col-md-12 navigation">
+            <ul>
+                <li><a href="/">DASHBOARD</a></li>
+                <li>|</li>
+                <!--<li id="nav-institution" class=""><a href="/portal/institution">AUTHORITY</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-service"><a href="/portal/servicedirectory">SERVICES</a></li>
+                <li id="nav-support"><a href="http://doc.fed4fire.eu/support.html">SUPPORT</a></li>
+                <li>|</li>
+                <li id="nav-account"><a href="/portal/account/">{{ username }}</a></li>
+                <li id="nav-logout"><span class="glyphicon glyphicon-off iconlogout"></span> <a id="logout" data-username="{{ username }}" href="#">LOGOUT</a></li>
+            </ul>
+        </div>
+        {% else %}
+        <div class="col-sm-4 col-md-4 navigation">
+        </div>
+        {% endif %}
+    </div>
+    </div>
 </div>
 <script>
 	$(document).ready(function() {
@@ -62,16 +58,5 @@
 				$(this).fadeOut(100);
 			}
 		});
-		// var slices = localStorage.getItem('slices');
-		// if (slices.length == 0) {
-			// $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
-		  	// var items = [];
-		  		// localStorage.setItem('slices', data[0].slice);
-			// });
-		// }
-		// $.each(slices, function( key, val ) {
-		  	// items.push( "<li><a href=\"/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );
-		// });
-		// $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
 	});
 </script>