diff options
Diffstat (limited to 'ishtar')
| -rw-r--r-- | ishtar/furnitures/context_processors.py | 1 | ||||
| -rw-r--r-- | ishtar/furnitures/views.py | 2 | ||||
| -rw-r--r-- | ishtar/settings.py.example | 1 | ||||
| -rw-r--r-- | ishtar/templates/base.html | 8 |
4 files changed, 8 insertions, 4 deletions
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 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="stylesheet" href="{{MEDIA_URL}}/style.css" /> - <link rel="shortcut icon" href="{{MEDIA_URL}}/images/favicon.png"> + <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> + <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> + <script language="javascript" type="text/javascript" src="{{JQUERY_URL}}"></script> + <script language="javascript" type="text/javascript" src="{{MEDIA_URL}}/js/ishtar.js"></script> </head> <body> @@ -34,7 +36,7 @@ <li>{{section.label}} <ul> {% for menu_item in section.childs %} - <li><a href='{% url action menu_item.idx%}'>{{menu_item.label}}</a></li> + <li{%ifequal menu_item.idx current_action%} class='selected'{%endifequal%}><a href='{% url action menu_item.idx%}'>{{menu_item.label}}</a></li> {% endfor %} </ul> </li> |