Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / myslice / viewutils.py

diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index 37a7d63..b62e1a4 100644 (file)
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -5,20 +5,31 @@ from copy import deepcopy
 standard_topmenu_items = [ 
 #    { 'label':'Tab', 'href': '/tab/'},
 #    { 'label':'Scroll', 'href': '/scroll/'},
-    { 'label':'One Plugin', 'href': '/plugin/'},
-    { 'label':'Dashboard', 'href': '/dashboard/'},
+#    { 'label':'One Plugin', 'href': '/plugin/'},
+    { 'label':'Dashboard', 'href': '/portal/dashboard/'},
     { 'label':'Slice', 'href': '/slice/'},
+    #{'label':'My Account', 'href': '/portal/account/'}
     ]
 
 #login_out_items = { False: { 'label':'Login', 'href':'/login/'},
 #                    True:  { 'label':'Logout', 'href':'/logout/'}}
 
 def topmenu_items (current,request=None):
-    result=deepcopy(standard_topmenu_items)
+    has_user=request.user.is_authenticated()
+    if has_user:
+        result=deepcopy(standard_topmenu_items)
+        result.append({'label':'My Account', 'href': '/portal/account/'})
+        result.append({ 'label':'Request a slice', 'href': '/portal/slice_request/'})
+    else:
+        result = []
+        result.append({'label':'Home', 'href': '/login'})
+        result.append({ 'label':'Register', 'href': '/portal/register/'})
+    result.append({'label':'Platforms', 'href': '/portal/platforms/'})
+    result.append({'label':'Contact Support', 'href': '/portal/contact/'})
     for d in result:
-        if d['label'].lower().find(current)>=0: d['is_active']=True
+        #if d['label'].lower()find(current)>=0: d['is_active']=True
+        if d['label'] == current: d['is_active']=True
     if not request: return result
-    has_user=request.user.is_authenticated()
 #    result.append (login_out_items [ has_user] )
     return result