From 0fcac04804de77f8a9cfb917c127fd3a7818edc0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Dec 2010 12:26:44 +0100 Subject: jQuery integration - reorganization - presentation work --- ishtar/furnitures/context_processors.py | 1 + ishtar/furnitures/views.py | 2 +- ishtar/settings.py.example | 1 + ishtar/templates/base.html | 8 +++++--- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'ishtar') diff --git a/ishtar/furnitures/context_processors.py b/ishtar/furnitures/context_processors.py index e187d2f76..f58a4cadd 100644 --- a/ishtar/furnitures/context_processors.py +++ b/ishtar/furnitures/context_processors.py @@ -30,5 +30,6 @@ def get_base_context(request): menu.init() request.session['MENU'] = menu dct['MENU'] = request.session['MENU'] + dct['JQUERY_URL'] = settings.JQUERY_URL return dct diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py index cce399d1f..20ef4d597 100644 --- a/ishtar/furnitures/views.py +++ b/ishtar/furnitures/views.py @@ -37,7 +37,7 @@ def action(request, action): """ Main page """ - dct = {} + dct = {'current_action':action} return render_to_response('index.html', dct, context_instance=RequestContext(request)) diff --git a/ishtar/settings.py.example b/ishtar/settings.py.example index 2fe347345..97d396fb5 100644 --- a/ishtar/settings.py.example +++ b/ishtar/settings.py.example @@ -6,6 +6,7 @@ APP_NAME = "" ROOT_PATH = "/var/local/webapp/ishtar/ishtar/" URL_PATH = "" +JQUERY_URL = "/javascript/jquery/jquery.js" DEBUG = True TEMPLATE_DEBUG = DEBUG diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html index ff9744391..1433d932d 100644 --- a/ishtar/templates/base.html +++ b/ishtar/templates/base.html @@ -4,10 +4,12 @@ - - + + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} + + @@ -34,7 +36,7 @@
  • {{section.label}}
    • -- cgit v1.2.3