move related imports as well

[unfold.git] / ui / topmenu.py

diff --git a/ui/topmenu.py b/ui/topmenu.py
index 1fc3b4b..4680c21 100644 (file)
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -1,21 +1,34 @@
 # a set of utilities to help make the global layout consistent across views
 
+def the_user (request):
+    "retrieves logged in user's email, or empty string"
+    if not request.user.is_authenticated (): 
+        return ''
+    else: 
+        return request.user.email
+
 # dropdowns are kind of ad hoc for now, and limited to one level
 # [ 
 # ### a regular first-level button
-# {'label':...,'href':...}, 
+# {'label':...,'href':..., ['domid':.., 'disabled':...]}, 
 # ### a dropdown
 # { 'label': ..., 'href'=..., 'dropdown':True, 'contents': [ { 'label':.., 'href'} ] }
 # , ..]
 
+# see also templates/widget-topmenu.html for how these items are put together
+# and plugins/topmenuvalidation for how this hident button is turned on when necessary
+
 # 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=[]
+    print request.user
     if has_user:
         result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
         result.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
-        result.append({'label':'Validation', 'href': '/portal/validate/'})
+        # always create a disabled button for validation, and let the 
+        # topmenuvalidation plugin handle that asynchroneously, based on this domid
+        result.append({'label':'Validation', 'href': '/portal/validate/', 'domid':'topmenu-validation', 'disabled':True})
         dropdown = []
         dropdown.append({'label':'Platforms', 'href': '/portal/platforms/'})
         dropdown.append({'label':'My Account', 'href': '/portal/account/'})
@@ -42,9 +55,3 @@ def topmenu_items (current,request=None):
                 for dd in d['contents']: mark_active(dd,d)
     return result
 
-def the_user (request):
-    "retrieves logged in user's email, or empty string"
-    if not request.user.is_authenticated (): 
-        return ''
-    else: 
-        return request.user.email