X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ui%2Ftopmenu.py;h=1be7c2857443cb14ef72297584d974204484f0ac;hb=558f83af287568d57dfdd915f10fd36f071d940f;hp=bcf74b1c117bfda3c0905b9d57806c23881bef04;hpb=33685b5e51564e1d4d61f32b2ab6be45436fb692;p=myslice.git

diff --git a/ui/topmenu.py b/ui/topmenu.py
index bcf74b1c..1be7c285 100644
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -7,15 +7,16 @@
 # ### a dropdown
 # { 'label': ..., 'href'=..., 'dropdown':True, 'contents': [ { 'label':.., 'href'} ] }
 # , ..]
+
+# current: the beginning of the label in the menu that you want to outline
 def topmenu_items (current,request=None):
     has_user=request.user.is_authenticated()
     result=[]
     if has_user:
-        result.append({'label':'Platforms', 'href': '/portal/platforms/'})
         result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
-        # This should probably go in dashboard at some point
+        result.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
+        result.append({'label':'Validation', 'href': '/portal/validate/'})
         dropdown = []
-        dropdown.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
         dropdown.append({'label':'My Account', 'href': '/portal/account/'})
         dropdown.append({'label':'Contact Support', 'href': '/portal/contact/'})
         result.append({'label': 'More', 'href':"#", 'dropdown':True, 'contents':dropdown})
@@ -25,13 +26,20 @@ def topmenu_items (current,request=None):
         result.append({'label':'Platforms', 'href': '/portal/platforms/'})
         result.append({'label':'Register', 'href': '/portal/register/'})
         result.append({'label':'Contact Support', 'href': '/portal/contact/'})
-    # mark active
-    for d in result:
-        if 'dropdown' in d:
-            for dd in d['contents']:
-                if dd['label'] == current: dd['is_active']=True
-        else:
-            if d['label'] == current: d['is_active']=True
+    # mark active if the provided 'current', even if shorter, matches the beginning of d['label']
+    
+    if current is not None:
+        current=current.lower()
+        curlen=len(current)
+        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,d)
     return result
 
 def the_user (request):