From: Thierry Parmentelat Date: Mon, 18 Mar 2013 14:36:48 +0000 (+0100) Subject: rename tempalte_env on prelude into prelude_env X-Git-Tag: myslice-django-0.1-2~76 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=4bc3a23f5ac1b989caa4862bd6f3f8099eee219b rename tempalte_env on prelude into prelude_env --- diff --git a/trash/dashboard.py b/trash/dashboard.py index 3f92b9dc..bf04ab4b 100644 --- a/trash/dashboard.py +++ b/trash/dashboard.py @@ -68,15 +68,6 @@ def dashboard_view (request): # define 'content_main' to the template engine template_env [ 'content_main' ] = main_plugin.render(request) -# ########## add another plugin with the same request, on the RHS pane -# # lacks a/href to /slice/%s -# related_plugin = SliceList (title='SliceList plugin',domid='slicelist1', -# with_datatables='yes', -# list=hard_wired_slice_names, -# header='Slices') -# # likewise but on the side view -# template_env [ 'content_related' ] = related_plugin.render (request) - # more general variables expected in the template template_env [ 'title' ] = 'Test view for a full request cycle' # the menu items on the top @@ -84,8 +75,8 @@ def dashboard_view (request): # so we can sho who is logged template_env [ 'username' ] = the_user (request) - ########## - # lacks a/href to /slice/%s +# ########## add another plugin with the same request, on the RHS pane +# will show up in the right-hand side area named 'related' related_plugin = SliceList ( page=page, title='Same request, other layout', @@ -109,7 +100,7 @@ def dashboard_view (request): # the prelude object in page contains a summary of the requirements() for all plugins # define {js,css}_{files,chunks} - prelude_env = page.template_env() + prelude_env = page.prelude_env() template_env.update(prelude_env) return render_to_response ('view-plugin.html',template_env, context_instance=RequestContext(request)) diff --git a/trash/pluginview.py b/trash/pluginview.py index da31dfaa..214acffb 100644 --- a/trash/pluginview.py +++ b/trash/pluginview.py @@ -82,7 +82,7 @@ def test_plugin_view (request): # the prelude object in page contains a summary of the requirements() for all plugins # define {js,css}_{files,chunks} - prelude_env = page.template_env() + prelude_env = page.prelude_env() template_env.update(prelude_env) return render_to_response ('view-plugin.html',template_env, context_instance=RequestContext(request)) diff --git a/trash/sampleviews.py b/trash/sampleviews.py index 8fbcb01c..bb472628 100644 --- a/trash/sampleviews.py +++ b/trash/sampleviews.py @@ -13,7 +13,7 @@ from myslice.viewutils import lorem, hard_wired_slice_names @login_required def tab_view (request): prelude=Prelude( js_files='js/bootstrap.js', css_files='css/bootstrap.css') - prelude_env = prelude.template_env() + prelude_env = prelude.prelude_env() tab_env = {'title':'Page for playing with Tabs', 'topmenu_items': topmenu_items('tab',request), 'username':the_user (request), diff --git a/unfold/page.py b/unfold/page.py index 5d37acff..a8bc0f42 100644 --- a/unfold/page.py +++ b/unfold/page.py @@ -111,4 +111,4 @@ class Page: @to_prelude def add_css_chunks (self):pass @to_prelude - def template_env (self):pass + def prelude_env (self):pass diff --git a/unfold/prelude.py b/unfold/prelude.py index 20beb7db..aa012f69 100644 --- a/unfold/prelude.py +++ b/unfold/prelude.py @@ -55,7 +55,7 @@ class Prelude: # probably insert_above is not powerful enough to handle that # # so a much simpler and safer approach is for use to compute the html header directly - def template_env (self): + def prelude_env (self): env={} env['js_files']= self.js_files env['css_files']= self.css_files