updates for onelab portal demo

[myslice.git] / myslice / viewutils.py

diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index 29ee071..a5f89f5 100644 (file)
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -3,10 +3,10 @@
 from copy import deepcopy
 
 standard_topmenu_items = [ 
-    { 'label':'Tab', 'href': '/tab/'},
-    { 'label':'Scroll', 'href': '/scroll/'},
-    { 'label':'Plugin', 'href': '/plugin/'},
-    { 'label':'Dashboard', 'href': '/dashboard/'},
+#    { 'label':'Tab', 'href': '/tab/'},
+#    { 'label':'Scroll', 'href': '/scroll/'},
+#    { 'label':'One Plugin', 'href': '/plugin/'},
+    { 'label':'Dashboard', 'href': '/portal/dashboard/'},
     { 'label':'Slice', 'href': '/slice/'},
     ]
 
@@ -15,10 +15,14 @@ standard_topmenu_items = [
 
 def topmenu_items (current,request=None):
     result=deepcopy(standard_topmenu_items)
+    has_user=request.user.is_authenticated()
+    if has_user:
+        result.append({ 'label':'Request a slice', 'href': '/portal/slice/request/'})
     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
+        print "CURRENT=", current
     if not request: return result
-    has_user=request.user.is_authenticated()
 #    result.append (login_out_items [ has_user] )
     return result