diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-12-08 20:41:25 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-12-08 20:41:25 +0100 |
| commit | 52b7cb7e3e876c9fbc7d5b5f1733daaa7070689a (patch) | |
| tree | 5c8bc0f4f7016a079c8f3e14e21402da39ed1e54 /ishtar_common/templates | |
| parent | 0643970751d46b73a7d1c48a6ef6593e7d43c8bc (diff) | |
| download | Ishtar-52b7cb7e3e876c9fbc7d5b5f1733daaa7070689a.tar.bz2 Ishtar-52b7cb7e3e876c9fbc7d5b5f1733daaa7070689a.zip | |
More responsive design + more flat design
Diffstat (limited to 'ishtar_common/templates')
| -rw-r--r-- | ishtar_common/templates/base.html | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/JQueryJqGrid.html | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index f6b4cd414..578b3edcc 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -62,7 +62,7 @@ <div id="logo"> {% if APP_NAME %}<p id="app_name">{{APP_NAME}}</p>{%endif%} </div> - <div id="context_menu"> + {% if not reminders %}<div id="context_menu"> {% block context %}{% if current_menu %} <form method="post" action="{% url 'update-current-item' %}"> <fieldset> @@ -85,7 +85,7 @@ </fieldset> </form> {% endif %}{% endblock %} - </div> + </div>{% endif %} {% if reminders %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend> {% for lbl, value in reminders%} <p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p> diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html index 103a569e5..7e7086738 100644 --- a/ishtar_common/templates/blocks/JQueryJqGrid.html +++ b/ishtar_common/templates/blocks/JQueryJqGrid.html @@ -79,7 +79,8 @@ jQuery(document).ready(function(){ emptyrecords: "{{no_result}}", loadtext: "{{loading}}", pager: '#pager_{{name}}', - width:740, + width: null, + shrinkToFit: false, rowNum:20, jsonReader : {repeatitems: false}, loadError: function (jqXHR, textStatus, errorThrown) { 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 27e1d3f82..76172d3ac 100644 --- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html +++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html @@ -34,7 +34,8 @@ setTimeout( emptyrecords: "{{no_result}}", loadtext: "{{loading}}", pager: '#pager_{{name}}', - width:720, + width: null, + shrinkToFit: false, rowNum:20, jsonReader : {repeatitems: false}, loadError: function (jqXHR, textStatus, errorThrown) { |