diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-28 12:26:44 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-28 12:26:44 +0100 |
| commit | 0fcac04804de77f8a9cfb917c127fd3a7818edc0 (patch) | |
| tree | 449993fce875b72942b08c393ce3a97a2d61bf7c | |
| parent | a4f635716015c9f5ed5e6bcd2564da49a2b7f458 (diff) | |
| download | Ishtar-0fcac04804de77f8a9cfb917c127fd3a7818edc0.tar.bz2 Ishtar-0fcac04804de77f8a9cfb917c127fd3a7818edc0.zip | |
jQuery integration - reorganization - presentation work
| -rw-r--r-- | docs/src/INSTALL.t2t | 1 | ||||
| -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 | ||||
| -rw-r--r-- | static/js/ishtar.js | 10 | ||||
| -rw-r--r-- | static/media/images/favicon.png (renamed from media/images/favicon.png) | bin | 666 -> 666 bytes | |||
| -rw-r--r-- | static/media/images/ishtar-bg.jpg (renamed from media/images/ishtar-bg.jpg) | bin | 18732 -> 18732 bytes | |||
| -rw-r--r-- | static/media/images/ishtar-text.png (renamed from media/images/ishtar-text.png) | bin | 2928 -> 2928 bytes | |||
| -rw-r--r-- | static/media/images/logo.ico (renamed from media/images/logo.ico) | bin | 766 -> 766 bytes | |||
| -rw-r--r-- | static/media/images/logo.png (renamed from media/images/logo.png) | bin | 6198 -> 6198 bytes | |||
| -rw-r--r-- | static/media/style.css (renamed from media/style.css) | 27 |
12 files changed, 46 insertions, 4 deletions
diff --git a/docs/src/INSTALL.t2t b/docs/src/INSTALL.t2t index 6966e7147..68dcc462f 100644 --- a/docs/src/INSTALL.t2t +++ b/docs/src/INSTALL.t2t @@ -16,6 +16,7 @@ Last update: %%date(%m-%d-%Y) - [psycopg2 http://freshmeat.net/projects/psycopg/] - [django-simple-history https://bitbucket.org/q/django-simple-history/src] version 1.0 - registration +- libjs-jquery To install django-simple-history: ``` 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> diff --git a/static/js/ishtar.js b/static/js/ishtar.js new file mode 100644 index 000000000..9e94b4359 --- /dev/null +++ b/static/js/ishtar.js @@ -0,0 +1,10 @@ +$(document).ready(function(){ + $("#main_menu ul ul").hide(); + $("#main_menu ul ul .selected").parent().show(); +}); + +$("#main_menu ul li").live('click', function(){ + $("#main_menu ul ul").hide('slow'); + $(this).find('ul').show('slow'); +}); + diff --git a/media/images/favicon.png b/static/media/images/favicon.png Binary files differindex 49a143457..49a143457 100644 --- a/media/images/favicon.png +++ b/static/media/images/favicon.png diff --git a/media/images/ishtar-bg.jpg b/static/media/images/ishtar-bg.jpg Binary files differindex 31dff0f15..31dff0f15 100644 --- a/media/images/ishtar-bg.jpg +++ b/static/media/images/ishtar-bg.jpg diff --git a/media/images/ishtar-text.png b/static/media/images/ishtar-text.png Binary files differindex 34f3270eb..34f3270eb 100644 --- a/media/images/ishtar-text.png +++ b/static/media/images/ishtar-text.png diff --git a/media/images/logo.ico b/static/media/images/logo.ico Binary files differindex c6417a32e..c6417a32e 100644 --- a/media/images/logo.ico +++ b/static/media/images/logo.ico diff --git a/media/images/logo.png b/static/media/images/logo.png Binary files differindex e150baa6c..e150baa6c 100644 --- a/media/images/logo.png +++ b/static/media/images/logo.png diff --git a/media/style.css b/static/media/style.css index 890bd535b..d1b536f1f 100644 --- a/media/style.css +++ b/static/media/style.css @@ -24,6 +24,10 @@ label:first-letter { text-transform: uppercase; } +.hidden{ + display:none; +} + div#header{ width:100%; text-align:right; @@ -56,6 +60,29 @@ div#main_menu{ position:absolute; } +div#main_menu ul{ + padding-left:1.5em; + cursor:pointer; + list-style:none; +} + +div#main_menu a{ + color:#666; +} + +div#main_menu a:hover{ + color:#D14; +} + +div#main_menu .selected a{ + color:#D14; +} + + +div#main_menu > ul{ + color:#922; +} + div#content{ margin-left:200px; } |
