From c292824f14fcadadea6d95a54ebfe5d9db6647aa Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 14 Mar 2016 10:07:38 +0100
Subject: Shortcut list: choices for finds and context records not kept (refs
 #3082)

---
 ishtar_common/static/js/ishtar.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ishtar_common/static')

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index c50d050ef..7918f742f 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -41,6 +41,16 @@ $(document).ready(function(){
                {item:'operation', value:$("#current_operation").val()}
         );
     });
+    $("#current_contextrecord").change(function(){
+        $.post('/' + url_path + 'update-current-item/',
+               {item:'contextrecord', value:$("#current_contextrecord").val()}
+        );
+    });
+    $("#current_find").change(function(){
+        $.post('/' + url_path + 'update-current-item/',
+               {item:'find', value:$("#current_find").val()}
+        );
+    });
     if ($(document).height() < 1.5*$(window).height()){
         $('#to_bottom_arrow').hide();
         $('#to_top_arrow').hide();
-- 
cgit v1.2.3


From 693c2cbd884d5aa045d4ae2ae7ec005940d8321e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 16 Mar 2016 20:10:54 +0100
Subject: Show / hide advanced search (refs #3069)

---
 ishtar_common/static/js/ishtar.js                   |  8 ++++++++
 ishtar_common/static/media/style.css                |  2 +-
 .../templates/blocks/form_flex_snippet.html         | 21 ++++++++++++++++-----
 3 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'ishtar_common/static')

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 7918f742f..9af5cf2b0 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -187,3 +187,11 @@ function closeAllWindows(){
     jQuery("#window > div").hide("slow");
     jQuery("#window").html("");
 }
+
+function show_hide_flex(id){
+    if ($(id).is(':hidden')){
+        $(id).css('display', 'flex');
+    } else {
+        $(id).hide();
+    }
+}
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 2a0079706..dd555a2c8 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -204,7 +204,7 @@ input[role=textbox]:focus{
     border:1px solid #D14;
 }
 
-.hidden{
+ul.form-flex.hidden, .hidden{
     display:none;
 }
 
diff --git a/ishtar_common/templates/blocks/form_flex_snippet.html b/ishtar_common/templates/blocks/form_flex_snippet.html
index 03d8b15f0..97ac37b44 100644
--- a/ishtar_common/templates/blocks/form_flex_snippet.html
+++ b/ishtar_common/templates/blocks/form_flex_snippet.html
@@ -1,14 +1,25 @@
 {% load i18n %}
-<ul class='form-flex'>
-  {% if form.non_field_errors %}<li class='errors'>
+  {% if form.non_field_errors %}<p class='errors'>
     {{form.non_field_errors}}
-  </li>{%endif%}
-  {% for field in form %}{% if not field.is_hidden %}
+  </p>{%endif%}
+  {% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
+  {% for field in form.visible_fields %}
+{% if forloop.counter0 == 0 %}
+<ul class='form-flex head-form'>
+{% endif %}
+{% if forloop.counter0 == 6 %}
+</ul>
+<p class='center'><a href='#' onclick='show_hide_flex(".tail-form");return false'>{% trans "Show / hide advanced search" %}</a></p>
+<ul class='form-flex tail-form hidden'>
+{% endif %}
   <li{% if field.field.required %} class='required'{% endif %}>
     {{ field.label_tag }}
     <p class='input'>{{ field.errors }}{{field|safe}}</p>{% if field.help_text %}
     <a href="#{{field.auto_id}}" class="help_display" title="{% trans "Help"%}">?</a>
   <div class="help_text" id="{{field.auto_id}}_help">
     {{field.help_text}}</div>
-  {%endif%}</li>{% else %}{{field}}{% endif %}{% endfor %}
+  {%endif%}</li>
+{% if forloop.last %}
 </ul>
+{% endif %}
+{% endfor %}
-- 
cgit v1.2.3


From 4d37c7b138faaf70de2c2d3db14fc212ce4c3f2c Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 17 Mar 2016 00:29:29 +0100
Subject: Improve search button layout

---
 .../templates/ishtar/administrativeact_document.html     |  2 +-
 ishtar_common/static/media/style.css                     | 16 ++++++++++++++--
 ishtar_common/templates/blocks/JQueryJqGrid.html         |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'ishtar_common/static')

diff --git a/archaeological_files/templates/ishtar/administrativeact_document.html b/archaeological_files/templates/ishtar/administrativeact_document.html
index cdb2b45be..5d71519f0 100644
--- a/archaeological_files/templates/ishtar/administrativeact_document.html
+++ b/archaeological_files/templates/ishtar/administrativeact_document.html
@@ -10,7 +10,7 @@
 <form action="." method="post">{% csrf_token %}
 <div class='form'>
 <table>
-{{ search_form.as_table }}
+{{ search_form.as_p }}
 </table>
 <h4>{% trans "Choose the type of document" %}</h4>
 <table>
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index dd555a2c8..4467a0639 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -167,7 +167,7 @@ button, input[type=submit], button.submit{
     border:1px solid #FFF;
     margin:6px;
     font-size:0.9em;
-    padding:4px 3px;
+    padding:4px 8px;
     border-radius:4px;
     -moz-border-radius:4px;
     -webkit-border-radius:4px;
@@ -179,6 +179,18 @@ button:hover, input[type=submit]:hover{
     border:1px solid #922;
 }
 
+button.ui-widget-header {
+    font-weight: normal;
+    border:1px solid #f8b950;
+    background: #f8b950;
+}
+
+button.ui-widget-header:hover {
+    color:#fff;
+    border:1px solid #f8b950;
+    background: #f8b950;
+}
+
 textarea,
 input[type=text],
 input[type=password],
@@ -266,7 +278,7 @@ div#validation-bar.big{
 }
 
 a.button{
-    padding:0.5em;
+    padding: 8px;
 }
 
 #reset_wizards{
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 1639c70f2..063a3c1da 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<button id='search_{{name}}' class='submit'>{% trans "Search" %}</button>
+<button id='search_{{name}}' class='submit ui-widget-header'>{% trans "Search" %}</button>
 
 {% if url_new %}
 <p><a href="#" onclick="open_window('{{url_new}}');">{{new_message}}</a></p>
-- 
cgit v1.2.3


From ee77204a2bdde97080c7f12b715f5496ca7fb342 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 17 Mar 2016 00:53:48 +0100
Subject: Change default style of generated ODT files

---
 ishtar_common/static/template.odt | Bin 7013 -> 8034 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'ishtar_common/static')

diff --git a/ishtar_common/static/template.odt b/ishtar_common/static/template.odt
index d1d0515bf..87b578800 100644
Binary files a/ishtar_common/static/template.odt and b/ishtar_common/static/template.odt differ
-- 
cgit v1.2.3