menus with dropdown : also outline the whole 'More' button when a subitem is current

[myslice.git] / ui / templates / widget-topmenu.html

diff --git a/ui/templates/widget-topmenu.html b/ui/templates/widget-topmenu.html
index 156d0a6..dbcbe1f 100644 (file)
--- a/ui/templates/widget-topmenu.html
+++ b/ui/templates/widget-topmenu.html
@@ -18,12 +18,12 @@
     <ul class="nav navbar-nav">
        {% for d in topmenu_items %} 
        {% if d.dropdown %}
-       <li class="dropdown">
+       {% if d.is_active %} <li class='active'> {% else %} <li class='other'> {% endif %}
          <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>
+           <a href="{{ dd.href }}"> {{ dd.label }} </a> </li>
            {% endfor %}
          </ul>
         </li>
@@ -34,9 +34,9 @@
        {% 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 %}
+      <li class='username'> {% if username %}
       Logged in as {{ username }}
-      <button id='logout' class='btn btn-danger logged-in' username='{{ username }}'>Logout</button> {% else %}
+      <button id='logout' class='btn btn-xs btn-danger logged-in' username='{{ username }}'>Logout</button> {% else %}
       Not logged in{% endif %}
       </li>
     </ul>