From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 4 Nov 2013 14:38:21 +0000 (+0100)
Subject: menus with dropdown : also outline the whole 'More' button when a subitem is current
X-Git-Tag: myslice-0.3-0~118
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2cbdcad141edc8fe25af7e4cb22c657b48c96dd1

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

diff --git a/ui/templates/widget-topmenu.html b/ui/templates/widget-topmenu.html
index c465a849..dbcbe1fc 100644
--- a/ui/templates/widget-topmenu.html
+++ b/ui/templates/widget-topmenu.html
@@ -18,7 +18,7 @@
     <ul class="nav navbar-nav">
 	{% for d in topmenu_items %} 
 	{% if d.dropdown %}
-	<li class="other">
+	{% 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 %}
diff --git a/ui/topmenu.py b/ui/topmenu.py
index e6250f05..1be7c285 100644
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -31,12 +31,15 @@ def topmenu_items (current,request=None):
     if current is not None:
         current=current.lower()
         curlen=len(current)
-        def mark_active(d):
-            if d['label'][:curlen].lower() == current: d['is_active']=True
+        def mark_active(d,up=None):
+            if d['label'][:curlen].lower() == current: 
+                d['is_active']=True
+                if up is not None: up['is_active']=True
+            print 'mark_active OUT','d=',d,'up',up
         for d in result:
             mark_active(d)
             if 'dropdown' in d:
-                for dd in d['contents']: mark_active(dd)
+                for dd in d['contents']: mark_active(dd,d)
     return result
 
 def the_user (request):