From 52b7cb7e3e876c9fbc7d5b5f1733daaa7070689a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 8 Dec 2015 20:41:25 +0100 Subject: More responsive design + more flat design --- ishtar_common/templates/base.html | 4 ++-- ishtar_common/templates/blocks/JQueryJqGrid.html | 3 ++- .../templates/ishtar/blocks/window_tables/dynamic_documents.html | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'ishtar_common/templates') 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 @@ -
+ {% if not reminders %}
{% block context %}{% if current_menu %}
@@ -85,7 +85,7 @@
{% endif %}{% endblock %} -
+
{% endif %} {% if reminders %}
{% trans "Current items" %} {% for lbl, value in reminders%}

{{lbl}}{% trans ":"%} {{value}}

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) { -- cgit v1.2.3