import error config and manifoldapi.manifoldresult

[myslice.git] / ui / topmenu.py

diff --git a/ui/topmenu.py b/ui/topmenu.py
index 4680c21..0c8d225 100644 (file)
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -1,5 +1,7 @@
 # a set of utilities to help make the global layout consistent across views
 
+from myslice.settings import logger
+
 def the_user (request):
     "retrieves logged in user's email, or empty string"
     if not request.user.is_authenticated (): 
@@ -19,10 +21,10 @@ def the_user (request):
 # 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):
+def topmenu_items_static (current, request):
     has_user=request.user.is_authenticated()
     result=[]
-    print request.user
+    logger.debug("request user = {}".format(request.user))
     if has_user:
         result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
         result.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
@@ -39,9 +41,10 @@ def topmenu_items (current,request=None):
         # looks like this is accessible to non-logged users
         result.append({'label':'Platforms', 'href': '/portal/platforms/'})
         result.append({'label':'Register', 'href': '/portal/register/'})
+        result.append({'label':'Join us', 'href': '/portal/join/'})
         result.append({'label':'Contact Support', 'href': '/portal/contact/'})
+
     # 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)
@@ -55,3 +58,41 @@ def topmenu_items (current,request=None):
                 for dd in d['contents']: mark_active(dd,d)
     return result
 
+# tmp - transition phase
+def topmenu_items (current, request):
+    logger.warning("WARNING -- please now use topmenu_items_live (label, page) toplevel_items is deprecated -- WARNING")
+    return topmenu_items_static (current, request)
+
+# integrated helper function for an animated menu
+from unfold.page import Page
+from manifold.core.query import Query
+from plugins.topmenuvalidation import TopmenuValidation
+
+### this is now the 'live' version, that has plugins 
+# for asynchronous management of topmenu
+def topmenu_items_live (current, page):
+    request=page.request
+    # XXX TODO This should be triggered only when user is logged in
+    # We might use local storage instead
+
+    # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+    if request.user.is_authenticated ():
+        query_pi_auths = Query.get('myslice:user').filter_by('user_hrn', '==', '$user_hrn' ).select('user_hrn','pi_authorities')
+        page.enqueue_query(query_pi_auths)
+    else:
+        query_pi_auths = Query()
+#        # even though this plugin does not have any html materialization, the corresponding domid
+#        # must exist because it is searched at init-time to create the JS plugin
+#        # so we simply piggy-back the target button created in the topmenu
+    topmenuvalidation = TopmenuValidation (
+        page=page, 
+        # see above
+        domid='topmenu-validation',
+        query=query_pi_auths,
+        # this one is the target for a $.show() when the query comes back
+        button_domid="topmenu-validation")
+    # although the result does not matter, rendering is required for the JS init code to make it in the page
+    topmenuvalidation.render(request)
+
+    return topmenu_items_static (current, request)
+