diff options
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 5 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 10 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/default_wizard.html | 1 |
4 files changed, 16 insertions, 6 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 25fc3c66a..cba6f0044 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -41,7 +41,10 @@ $(document).ready(function(){ }); $("#main_menu ul li").live('click', function(){ - $("#main_menu ul ul").hide('slow'); + var current_id = $(this).attr('id'); + console.log(current_id); + $("#main_menu ul ul").not($(this).parents('ul')).not($(this).find('ul') + ).hide('slow'); $(this).find('ul').show('slow'); }); diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index ef58a1b0a..2aa673b51 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -23,11 +23,16 @@ a { text-decoration:none; } -caption, h3 { +caption, h2, h3 { color:#922; font-weight:bold; } +h2{ + margin:0; + font-size:1.2em; +} + h3{ text-align:center; margin:1em 0 0.5em 0; @@ -161,7 +166,8 @@ div#content{ ul#form_path{ text-align:left; - margin:10px 0; + margin:4px 0; + font-size:0.9em; } ul#form_path li{ diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 630fe666e..bfc78b166 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -60,13 +60,13 @@ <div id="main_menu"> <ul> {% for section in MENU.childs %} - {% if section.available %}<li>{{section.label}} + {% if section.available %}<li id='section-{{forloop.counter}}'>{{section.label}} <ul> {% for menu_item in section.childs %}{%if menu_item.available%} - {% if menu_item.childs %}<li>{{menu_item.label}} + {% if menu_item.childs %}<li id='section-{{forloop.parentloop.counter}}-{{forloop.counter}}'>{{menu_item.label}} <ul> {% for menu_subitem in menu_item.childs %}{%if menu_subitem.available%} - <li{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_subitem.idx%}'>{{menu_subitem.label}}</a></li> + <li id='section-{{forloop.parentloop.parentloop.counter}}-{{forloop.parentloop.counter}}-{{forloop.counter}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_subitem.idx%}'>{{menu_subitem.label}}</a></li> {%endif%}{% endfor %}</ul></li> {%else%} <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_item.idx%}'>{{menu_item.label}}</a></li> diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index 1996f4e46..c379d8fbb 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -6,6 +6,7 @@ {{form.media}} {% endblock %} {% block content %} +<h2>{{wizard_label}}</h2> <form action="." method="post" name='wizard'>{% csrf_token %} <ul id='form_path'> {% for step in previous_steps %} |