diff options
Diffstat (limited to 'ishtar_common/templates')
5 files changed, 29 insertions, 10 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 614a83595..b20cb1ccb 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -90,15 +90,18 @@ <li id='section-{{section.idx}}'{% if section.css %} class="{{section.css}}"{% endif %}> {{section.label}} <ul> - {% for menu_item in section.childs %}{%if menu_item.available%} - {% if menu_item.childs %}<li id='subsection-{{menu_item.idx}}'{% if menu_item.css %} class="{{menu_item.css}}"{% endif %}>{{menu_item.label}} + {% for menu_item in section.childs %}{%if menu_item.available%} + {% if menu_item.childs %}<li id='subsection-{{menu_item.idx}}'{% if menu_item.css %} class="{{menu_item.css}}"{% endif %}>{{menu_item.label}} <ul> - {% for menu_subitem in menu_item.childs %}{%if menu_subitem.available%} - <li id='{{menu_subitem.idx}}'{% ifequal menu_subitem.idx CURRENT_ACTION %} class='selected'{% endifequal %}><a href='{% url "action" menu_subitem.idx%}'>{{menu_subitem.label}}</a></li> + {% for menu_subitem in menu_item.childs %}{% if menu_subitem.available %} + {% url 'action' menu_subitem.idx as item_url %} + <li id='{{menu_subitem.idx}}'{% if item_url in CURRENT_PATH %} class='selected'{% endif %}><a + href='{{item_url}}'>{{menu_subitem.label}}</a></li> {%endif%}{% endfor %}</ul></li> - {%else%} + {% else %} + {% url 'action' menu_item.idx as item_url %} <li id='{{menu_item.idx}}' - class="{% ifequal menu_item.idx CURRENT_ACTION %}selected{% endifequal %} {% if menu_item.css %}{{menu_item.css}}{% endif %}"><a href="{% url 'action' menu_item.idx%}">{{menu_item.label}}</a></li> + class="{% if item_url in CURRENT_PATH %}selected{% endif %} {% if menu_item.css %}{{menu_item.css}}{% endif %}"><a href="{{item_url}}">{{menu_item.label}}</a></li> {%endif%}{% endif %}{% endfor %} </ul> </li>{%endif%} diff --git a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html index 1758bcf54..5cea8b5a7 100644 --- a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html +++ b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html @@ -42,5 +42,9 @@ </table> </fieldset> </form> -<script type='text/javascript'>var advanced_menu = true;</script> +<script type='text/javascript'> +var advanced_menu = true; +{% if SHORTCUT_SHOW == 'off' %}var shortcut_menu_hide = true; +{% else %}var shortcut_menu_hide = false;{% endif %} +</script> {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html index 5973eba3f..c03cb3806 100644 --- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html +++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html @@ -38,5 +38,8 @@ </div> </fieldset> </form> -<script type='text/javascript'>var advanced_menu = false;</script> +<script type='text/javascript'>var advanced_menu = false; +{% if SHORTCUT_SHOW == 'off' %}var shortcut_menu_hide = true; +{% else %}var shortcut_menu_hide = false;{% endif %} +</script> {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html index f751cebe3..891cd0f6f 100644 --- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html +++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html @@ -41,7 +41,7 @@ setTimeout( alert("{% trans "An error as occured during search. Check your query fields." %}"); } }); - {% if large %}jQuery("#grid_{{name}}").jqGrid('setGridHeight', 400);{% endif %} + {% if large %}jQuery("#grid_{{name}}").jqGrid('setGridHeight', 272);{% endif %} }, 200); </script> diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html index 93e11d604..6a5a67a63 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html @@ -15,7 +15,16 @@ {% endblock %} {% block content %} <script> -$(function() { $( "#dash-tabs" ).tabs(); }); +$(function() { + $( "#dash-tabs" ).tabs({ + beforeActivate: function( event, ui ) { + $("#progress").show(); + }, + load: function( event, ui ) { + $("#progress").hide(); + } + }); +}); </script> <div id='dashboard'> <div id="dash-tabs"> |