From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 12 Dec 2012 16:57:45 +0000 (+0100)
Subject: smaller labels for topmenu
X-Git-Tag: myslice-django-0.1-1~137
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=704bebbe43202925f468656e1a91ac574af2fcf2;p=myslice.git

smaller labels for topmenu
---

diff --git a/engine/views.py b/engine/views.py
index a6f741a7..ba826c1f 100644
--- a/engine/views.py
+++ b/engine/views.py
@@ -7,7 +7,7 @@ from django.shortcuts import render_to_response
 
 from plugins.simplelist import SimpleList
 
-from myslice.viewutils import menu_items, the_user, hard_wired_slice_names
+from myslice.viewutils import topmenu_items, the_user, hard_wired_slice_names
 
 def test_plugin_view (request):
     
@@ -40,7 +40,7 @@ def test_plugin_view (request):
 
     return render_to_response ('view-plugin.html',
                                {'title': 'Test Plugin View',
-                                'menu_items': menu_items('plugin', request),
+                                'topmenu_items': topmenu_items('plugin', request),
                                 'content_main' : content_main,
                                 'content_related' : content_related,
                                 'username' : the_user (request),
diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index fa3a603d..212d3102 100644
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -2,17 +2,17 @@
 
 from copy import deepcopy
 
-standard_menu_items = [ { 'label':'Slice view',  'href': '/slice/'},
-                        { 'label':'Scroll view', 'href': '/scroll/'},
-                        { 'label':'Tab view', 'href': '/tab/'},
-                        { 'label':'Mini plugin', 'href': '/plugin/'},
+standard_topmenu_items = [ { 'label':'Slice',  'href': '/slice/'},
+                        { 'label':'Scroll', 'href': '/scroll/'},
+                        { 'label':'Tab', 'href': '/tab/'},
+                        { 'label':'Plugin', 'href': '/plugin/'},
                         ]
 
 #login_out_items = { False: { 'label':'Login', 'href':'/login/'},
 #                    True:  { 'label':'Logout', 'href':'/logout/'}}
 
-def menu_items (current,request=None):
-    result=deepcopy(standard_menu_items)
+def topmenu_items (current,request=None):
+    result=deepcopy(standard_topmenu_items)
     for d in result:
         if d['label'].lower().find(current)>=0: d['active']=True
     if not request: return result
diff --git a/slice/views.py b/slice/views.py
index 4d0acec5..407e0df0 100644
--- a/slice/views.py
+++ b/slice/views.py
@@ -4,7 +4,7 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
 
-from myslice.viewutils import menu_items, the_user
+from myslice.viewutils import topmenu_items, the_user
 # tmp
 from myslice.viewutils import lorem, hard_wired_slice_names
 
@@ -15,7 +15,7 @@ def fake_slice_view (request, name=None):
     result=render_to_response ('view-slice.html',
                                {'name':name,
                                 'title':title,
-                                'menu_items' : menu_items('slice',request),
+                                'topmenu_items' : topmenu_items('slice',request),
                                 'username':the_user (request),
                                 'slices': hard_wired_slice_names,
                                 'content_main' : lorem,
@@ -28,7 +28,7 @@ def fake_slice_view (request, name=None):
 def tab_view (request):
     return render_to_response ('view-tab.html',
                                {'title':'Page for playing with Tabs',
-                                'menu_items': menu_items('tab',request),
+                                'topmenu_items': topmenu_items('tab',request),
                                 'username':the_user (request),
                                 'lorem': lorem,                                
                                 },
@@ -38,7 +38,7 @@ def tab_view (request):
 def scroll_view (request):
     return render_to_response ('view-scroll.html',
                                {'title':'Toy page for scrolling',
-                                'menu_items': menu_items('scroll',request),
+                                'topmenu_items': topmenu_items('scroll',request),
                                 'username':the_user (request),
                                 'lorem':lorem,
                                 },
diff --git a/templates/widget-topmenu.html b/templates/widget-topmenu.html
index 47f43bf2..88d64261 100644
--- a/templates/widget-topmenu.html
+++ b/templates/widget-topmenu.html
@@ -8,7 +8,7 @@
       <a class="brand" href="/"><img src="{{ STATIC_URL }}img/myslice-logo.png" height="30" alt="MySlice logo" /></a>
       <div class="nav-collapse">
 	<ul class="nav nav-pills" id='menu_ul'>
-	  {% for d in menu_items %}
+	  {% for d in topmenu_items %}
 	  {% if d.active %}
 	  <li class='active'> <a href="{{ d.href }}"> {{ d.label }} </a> </li>
 	  {% else %}