From: Thierry Parmentelat Date: Mon, 10 Dec 2012 19:26:46 +0000 (+0100) Subject: fix various names and add various missing stuff for a plugin view X-Git-Tag: myslice-django-0.1-1~148 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=be9221212eade180e78a3566797f97a9e6178625;p=unfold.git fix various names and add various missing stuff for a plugin view --- diff --git a/engine/plugin.py b/engine/plugin.py index b766ad74..a76881a2 100644 --- a/engine/plugin.py +++ b/engine/plugin.py @@ -37,7 +37,7 @@ class Plugin: # compute an 'optionstr' from the set of available settings/options as a json string # that gets passed to jquery somehow # see the bottom of - result = render_to_string ('plugin-wrap.html', + result = render_to_string ('widget-plugin.html', {'uuid':uuid, 'title':title, 'visible':self.is_visible(), 'hidable':self.is_hidable(), diff --git a/engine/views.py b/engine/views.py index f7996a27..56c375e3 100644 --- a/engine/views.py +++ b/engine/views.py @@ -7,6 +7,8 @@ from django.shortcuts import render_to_response from plugins.simplelist import SimpleList +from slice.views import menu_items, the_user + def test_plugin_view (request): test_plugin = SimpleList (visible=True, hidable=True) @@ -16,7 +18,11 @@ def test_plugin_view (request): print plugin_content print '--------------------' - return render_to_response ('test-plugin.html', - {'content_main' : plugin_content}, + return render_to_response ('view-plugin.html', + {'title': 'Test Plugin View', + 'menu_items': menu_items('plugin', request), + 'content_main' : plugin_content, + 'username' : the_user (request), + }, context_instance=RequestContext(request)) diff --git a/slice/views.py b/slice/views.py index 76987a79..ce951ff7 100644 --- a/slice/views.py +++ b/slice/views.py @@ -13,6 +13,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh 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/'}, diff --git a/templates/view-plugin.html b/templates/view-plugin.html new file mode 100644 index 00000000..8413732c --- /dev/null +++ b/templates/view-plugin.html @@ -0,0 +1,5 @@ +{% extends 'layout-myslice.html' %} + +{% block content_main %} +{{ content_main }} +{% endblock content_main %}