portal: updated views

[myslice.git] / myslice / viewutils.py

diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index 37a7d63..fd364bc 100644 (file)
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -5,8 +5,8 @@ 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/'},
     ]
 
@@ -14,11 +14,17 @@ standard_topmenu_items = [
 #                    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':'Request a slice', 'href': '/portal/slice_request/'})
+    else:
+        result = []
+        result.append({ 'label':'Register', 'href': '/portal/user/register/'})
     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