myslice.viewutils is a new place for holding stuff common to all views

diff --git a/auth/views.py b/auth/views.py
index f5db82d..9d71850 100644 (file)
--- a/auth/views.py
+++ b/auth/views.py
@@ -20,15 +20,13 @@ def login_user(request):
         if user is not None:
             if user.is_active:
                 login(request, user)
-                state = "You're successfully logged in!"
+                #state = "You're successfully logged in!"
                 return HttpResponseRedirect ('/')
             else:
-                state = "Your account is not active, please contact the site admin."
-                env['state']=state; env['username']=username
+                env['state'] = "Your account is not active, please contact the site admin."
                 return render_to_response('view-login.html',env, context_instance=RequestContext(request))
         else:
-            state = "Your username and/or password were incorrect."
-            env['state']=state; env['username']=username
+            env['state'] = "Your username and/or password were incorrect."
             return render_to_response('view-login.html',env, context_instance=RequestContext(request))
     else:
         state='Welcome to MySlice'

diff --git a/engine/views.py b/engine/views.py
index 56c375e..6d73a47 100644 (file)
--- 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 slice.views import menu_items, the_user
+from myslice.viewutils import menu_items, the_user
 
 def test_plugin_view (request):
     

diff --git a/myslice/viewutils.py b/myslice/viewutils.py
new file mode 100644 (file)
index 0000000..5360af5
--- /dev/null
+++ b/myslice/viewutils.py
@@ -0,0 +1,38 @@
+# a set of utilities to help make the global layout consistent across views
+
+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/'},
+                        ]
+
+login_out_items = { False: { 'label':'Login', 'href':'/login/'},
+                    True:  { 'label':'Logout', 'href':'/logout/'}}
+
+def menu_items (current,request=None):
+    result=deepcopy(standard_menu_items)
+    for d in result:
+        if d['label'].lower().find(current)>=0: d['active']=True
+    if not request: return result
+    has_user=request.user.is_authenticated()
+    result.append (login_out_items [ has_user] )
+    return result
+
+def the_user (request):
+    "This code below is broken"
+    return 'user-xxx-name'
+    if not request.user.is_authenticated (): return ''
+    else: return request.user.username
+
+
+# temporary for sample views
+lorem="""
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod <code>mazim placerat</code> facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.
+"""
+
+hard_wired_slice_names = []
+for site in [ 'inria', 'upmc' , 'ibbt' ]:
+    for slice in [ 'foo', 'bar', 'tutu', 'test', 'omf', 'heartbeat' ]:
+        hard_wired_slice_names.append ("ple.%s.%s"%(site,slice))

diff --git a/plugins/simplelist.py b/plugins/simplelist.py
index 5a97fcb..202dc1b 100644 (file)
--- a/plugins/simplelist.py
+++ b/plugins/simplelist.py
@@ -3,7 +3,15 @@ from engine.plugin import Plugin
 class SimpleList (Plugin) :
     
     def render_content (self):
-        return """<ul><li>hard-wired one</li><li>manual two</li>
-<li>this is defined</li>
+        return """<ul><li>this hard-wired list</li>
+<li>is defined</li>
 <li>in plugins.simplelist.py</li>
+<li>while it should of course</li>
+<li>instead issue a query</li>
+<li>and fill the DOM in js from there</li>
+<li>it would however maybe make sense</li>
+<li>to offer the option to 'datatablify'</li>
+<li>the list from the python code</li>
+<li>just like a standard plugin can be set as visible or not</li>
+<li>IMHO there should be explicit subclasses of SimpleList for slices or testbeds</li>
 </ul>"""

diff --git a/slice/views.py b/slice/views.py
index ce951ff..4d0acec 100644 (file)
--- a/slice/views.py
+++ b/slice/views.py
@@ -1,43 +1,12 @@
 # Create your views here.
-from copy import deepcopy
-
 from django.core.context_processors import csrf
 from django.template import RequestContext
 from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
 
-lorem="""
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod <code>mazim placerat</code> facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.
-"""
-
-standard_menu_items = [ { 'label':'Slice view',  'href': '/slice/'},
-                        { 'label':'Scroll view', 'href': '/scroll/'},
-                        { 'label':'Tab view', 'href': '/tab/'},
-                        { 'label':'Mini 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)
-    for d in result:
-        if d['label'].lower().find(current)>=0: d['active']=True
-    if not request: return result
-    has_user=request.user.is_authenticated()
-    result.append (login_out_items [ has_user] )
-    return result
-
-hard_wired_slice_names = []
-for site in [ 'inria', 'upmc' , 'ibbt' ]:
-    for slice in [ 'foo', 'bar', 'tutu', 'test', 'omf', 'heartbeat' ]:
-        hard_wired_slice_names.append ("ple.%s.%s"%(site,slice))
-
-def the_user (request):
-    "This code below is broken"
-    return 'user-xxx-name'
-    if not request.user.is_authenticated (): return ''
-    else: return request.user.username
+from myslice.viewutils import menu_items, the_user
+# tmp
+from myslice.viewutils import lorem, hard_wired_slice_names
 
 @login_required
 def fake_slice_view (request, name=None):