X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=views%2Ftemplates%2Fwidget-topmenu.html;h=3b894a14d5407dcd574956edf0af43230e84eea4;hb=c59fa3df2098df4e683805e737d964f1916238fb;hp=97d20f1f93a9989e9958473e4f761ade56257072;hpb=54a5954fbb6d77b012bbe198c7d492989c1f1585;p=unfold.git

diff --git a/views/templates/widget-topmenu.html b/views/templates/widget-topmenu.html
index 97d20f1f..3b894a14 100644
--- a/views/templates/widget-topmenu.html
+++ b/views/templates/widget-topmenu.html
@@ -1,29 +1,44 @@
-{# <a id='menu_logo' href="/"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a> #}
-{% insert_str prelude "bootstrap/js/bootstrap.js" %}
-{% insert_str prelude "bootstrap/css/bootstrap.css" %}
+{% insert_str prelude "js/bootstrap.js" %}
+{% insert_str prelude "css/bootstrap.css" %}
 {% insert_str prelude "css/topmenu.css" %}
-
-<div id='topmenu' class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container-fluid">
-      <a class="brand" href="/"><img src="{{ STATIC_URL }}img/myslice-logo.png" height="30" alt="MySlice logo" /></a>
-      <div class="nav-collapse topmenu">
-	<ul class="nav nav-pills" id='menu_ul'>
-	  {% for d in topmenu_items %}
-	  {% if d.active %}
-	  <li class='active'> <a href="{{ d.href }}"> {{ d.label }} </a> </li>
-	  {% else %}
-	  <li class='other'> <a href="{{ d.href }}"> {{ d.label }} </a> </li>
-	  {% endif %}
+{% insert_str prelude "js/logout.js" %}
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-myslice-collapse">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="#">
+      <img src="{{ STATIC_URL }}img/onelab-logo.png" height="30" alt="OneLab logo" />
+    </a>
+  </div>
+  <div class="collapse navbar-collapse navbar-myslice-collapse topmenu">
+    <ul class="nav navbar-nav">
+	{% for d in topmenu_items %} 
+	{% if d.dropdown %}
+	<li class="dropdown">
+	  <a class="dropdown-toggle" data-toggle="dropdown" href="{{ d.href }}"> {{ d.label }}<b class="caret"></b></a>
+	  <ul class="dropdown-menu">
+	  {% for dd in d.contents %}
+	  {% if dd.is_active %} <li class='active'> {% else %} <li class='other'> {% endif %}
+	  <a class="dropdown-toggle" href="{{ dd.href }}"> {{ dd.label }} </a> </li>
 	  {% endfor %}
 	</ul>
-	<p class="navbar-text pull-right">
-	  {% if username %}
-	Logged in as <a href="/logout/">{{ username }}</a></p>
-	  {% else %}
-	  Not logged in
-	  {% endif %}
-      </div><!--nav-collapse-->
-    </div><!--container-fluid-->
-  </div><!--navbar-inner-->
-</div><!--topmenu-->
+        </li>
+        {% else %} 
+	{% if d.is_active %} <li class='active'> {% else %} <li class='other'> {% endif %}
+	<a href="{{ d.href }}"> {{ d.label }} </a> </li>
+	{% endif %}
+	{% endfor %}
+    </ul> {# logout.js will attach a click function on that button, which then retrieves the 'username' attribute #}
+    <ul class="nav navbar-nav pull-right logged-in">
+      <li> {% if username %}
+      Logged in as {{ username }}
+      <button id='logout' class='btn btn-danger logged-in' username='{{ username }}'>Logout</button> {% else %}
+      Not logged in{% endif %}
+      </li>
+    </ul>
+  </div>
+</nav>