X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fviewutils.py;h=b9309e1b123fddd2d44b1935690eab719b841171;hb=c33d0dd5fbfbd8e16c7d971100a851469d313eff;hp=fd364bc2d237cbc922028e699ae4cef620e48dac;hpb=f89424cffcb881206feeb0506705c470d4a73092;p=myslice.git

diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index fd364bc2..b9309e1b 100644
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -1,13 +1,15 @@
 # a set of utilities to help make the global layout consistent across views
 
-from copy import deepcopy
-
+# this 
 standard_topmenu_items = [ 
 #    { 'label':'Tab', 'href': '/tab/'},
 #    { 'label':'Scroll', 'href': '/scroll/'},
 #    { 'label':'One Plugin', 'href': '/plugin/'},
-    { 'label':'Dashboard', 'href': '/portal/dashboard/'},
-    { 'label':'Slice', 'href': '/slice/'},
+# Thierry : using this goes to some test slice that not every one is in
+# besides, the topmenu needs to be shrunk down horizontally
+# otherwise the topmenu takes more vertical space than avail. and the layout is broken
+#    { 'label':'Slice', 'href': '/slice/'},
+    #{'label':'My Account', 'href': '/portal/account/'}
     ]
 
 #login_out_items = { False: { 'label':'Login', 'href':'/login/'},
@@ -15,12 +17,19 @@ standard_topmenu_items = [
 
 def topmenu_items (current,request=None):
     has_user=request.user.is_authenticated()
+    result=[]
     if has_user:
-        result=deepcopy(standard_topmenu_items)
+        result.append({'label':'Platforms', 'href': '/portal/platforms/'})
+        result.append({ 'label':'Dashboard', 'href': '/portal/dashboard/'})
+        # This should probably go in dashboard at some point
         result.append({ 'label':'Request a slice', 'href': '/portal/slice_request/'})
+        result.append({'label':'My Account', 'href': '/portal/account/'})
     else:
-        result = []
-        result.append({ 'label':'Register', 'href': '/portal/user/register/'})
+        result.append({'label':'Home', 'href': '/login'})
+        # 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':'Contact Support', 'href': '/portal/contact/'})
     for d in result:
         #if d['label'].lower()find(current)>=0: d['is_active']=True
         if d['label'] == current: d['is_active']=True