X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=templates%2Fwidget-topmenu.html;h=97d20f1f93a9989e9958473e4f761ade56257072;hb=058958cdd4f1d5f2f5da50e8dd988c5e623f41d8;hp=70cc1492dadbcd905edb8dcc79fb904091d36d57;hpb=20028a8cc2b83ed3c8d98218958ebd34bc75f891;p=unfold.git

diff --git a/templates/widget-topmenu.html b/templates/widget-topmenu.html
index 70cc1492..97d20f1f 100644
--- a/templates/widget-topmenu.html
+++ b/templates/widget-topmenu.html
@@ -1,14 +1,15 @@
 {# <a id='menu_logo' href="/"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a> #}
-{# {% insert_str prelude "js/mymenu.js" %} #}
-{# {% insert_str prelude "css/mymenu.css" %} #}
+{% insert_str prelude "bootstrap/js/bootstrap.js" %}
+{% insert_str prelude "bootstrap/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">
+      <div class="nav-collapse topmenu">
 	<ul class="nav nav-pills" id='menu_ul'>
-	  {% for d in menu_items %}
+	  {% for d in topmenu_items %}
 	  {% if d.active %}
 	  <li class='active'> <a href="{{ d.href }}"> {{ d.label }} </a> </li>
 	  {% else %}
@@ -16,8 +17,13 @@
 	  {% endif %}
 	  {% endfor %}
 	</ul>
-	<p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
-      </div><!--/.nav-collapse -->
+	<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-->