X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=views%2Ftemplates%2Fwidget-topmenu.html;h=1b14c8a07e20e3e53382f23498bee857c6d28a7a;hb=208404a2dc21c6f9c083820df5117fa02fdef7ba;hp=97d20f1f93a9989e9958473e4f761ade56257072;hpb=54a5954fbb6d77b012bbe198c7d492989c1f1585;p=myslice.git

diff --git a/views/templates/widget-topmenu.html b/views/templates/widget-topmenu.html
index 97d20f1f..1b14c8a0 100644
--- a/views/templates/widget-topmenu.html
+++ b/views/templates/widget-topmenu.html
@@ -1,28 +1,20 @@
 {# <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">
+{% insert_str prelude "js/logout.js" %}
+<div 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>
+      <a class="brand" href="/"><img src="{{ STATIC_URL }}img/onelab-logo.png" height="30" alt="OneLab logo" /></a>
+      <!--<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 %}
-	  {% endfor %}
-	</ul>
-	<p class="navbar-text pull-right">
-	  {% if username %}
-	Logged in as <a href="/logout/">{{ username }}</a></p>
-	  {% else %}
-	  Not logged in
-	  {% endif %}
+	<ul class="nav nav-pills" id='menu_ul'> {% for d in topmenu_items %} {% if d.is_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 %} {% endfor %}
+	</ul> {# logout.js will attach a click function on that button, which then retrieves the 'username' attribute #}
+	<span class="navbar-text pull-right logged-in"> {% if username %} Logged in as {{ username }}
+	<button id='logout' class='btn btn-danger' username='{{ username }}'>Logout</a> {% else %}Not logged in{% endif %}</span>
       </div><!--nav-collapse-->
     </div><!--container-fluid-->
   </div><!--navbar-inner-->