From 6e443ef21bfa9eea67e7f983727c41d00405a816 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 3 Jul 2018 18:26:38 +0200
Subject: Change criteria search UI to put criteria in the search text (refs
 #4180)

---
 .../templates/blocks/bs_field_snippet.html         |  3 ++-
 .../templates/blocks/bs_form_snippet.html          | 25 +++++++---------------
 ishtar_common/templates/widgets/search_input.html  |  8 ++++++-
 3 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/blocks/bs_field_snippet.html b/ishtar_common/templates/blocks/bs_field_snippet.html
index 4c4e17bf1..a164c81d8 100644
--- a/ishtar_common/templates/blocks/bs_field_snippet.html
+++ b/ishtar_common/templates/blocks/bs_field_snippet.html
@@ -1,5 +1,6 @@
 {% load i18n %}
-    <div class="form-group {% if field.field.widget.attrs.cols %}col-lg-12{% else %}col-lg-6{% endif %}{% if field.errors %} is-invalid{% endif %}{% if field.field.required %} required{% endif %}">
+    <div class="form-group {% if field.field.widget.attrs.cols %}col-lg-12{% else %}col-lg-6{% endif %}{% if field.errors %} is-invalid{% endif %}{% if field.field.required %} required{% endif %}"
+         data-alt-name="{{field.field.alt_name}}">
         {{ field.label_tag }}
         {% if field.help_text %}
         <div class="input-group">
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index 74dbadf5c..820ef8c99 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -17,7 +17,7 @@
 {{field}}
 {% elif field.name == 'search_vector' and forloop.counter0 == 0 %}
 <div class="form-row">
-    <div class="form-group col-lg-10">
+    <div class="form-group col-lg-12">
         {{field|safe}}
         {% if field.help_text %}
         <small><a data-toggle="collapse" href="#{{field.auto_id}}_help"
@@ -28,14 +28,6 @@
             {{ field.errors }}
         </div>{% endif %}
     </div>
-    <div class="form-group col-lg">
-        <p class="text-right">
-            <button type="button" class="btn btn-secondary" data-toggle="modal"
-               data-target="#modal-advanced-search">
-                {% trans "Advanced search" %} <i class="fa fa-cogs" aria-hidden="true"></i>
-            </button>
-        </p>
-    </div>
 
     {% if field.help_text %}
     <div class="collapse" id="{{field.auto_id}}_help">
@@ -45,10 +37,6 @@
     </div>
     {% endif %}
 </div>
-<div class="alert alert-info" role="alert" id="advanced-search-resume">
-    <strong><i class="fa fa-cogs" aria-hidden="true"></i>{% trans ":" %}&nbsp;</strong>
-    <span id="advanced-search-resume-content"></span>
-</div>
 {% else %}
 {% if search and forloop.counter0 == 1 %}
 <div class="modal" id="modal-advanced-search" tabindex="-1" role="dialog"
@@ -56,7 +44,10 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h5>{% trans "Advanced search" %}</h5>
+                <h5>{% trans "Criteria search" %}</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
             <div class="modal-body form-row">
 {% endif %}
@@ -86,10 +77,10 @@
 {% if search and forloop.counter0 >= 1 %}
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary advanced-search-reset"
-                        data-dismiss="modal">{% trans 'Reset' %}</button>
+                <button type="button" class="btn btn-secondary"
+                        data-dismiss="modal">{% trans 'Close' %}</button>
                 <button type="button" class="btn btn-primary advanced-search-valid"
-                        data-dismiss="modal">{% trans "Validate" %}</button>
+                        data-dismiss="modal">{% trans "Add" %}</button>
             </div>
         </div>
     </div>
diff --git a/ishtar_common/templates/widgets/search_input.html b/ishtar_common/templates/widgets/search_input.html
index c68d2347d..1d7521a2a 100644
--- a/ishtar_common/templates/widgets/search_input.html
+++ b/ishtar_common/templates/widgets/search_input.html
@@ -1,10 +1,16 @@
-<div class="input-group search-widget">
+{% load i18n %}<div class="input-group search-widget">
     <span class="input-group-prepend">
       <span class="input-group-text">
          <i class="fa fa-search" aria-hidden="true"></i>
       </span>
     </span>
     <input type="{{ widget.type }}" name="{{ widget.name }}"{% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %}{% include "django/forms/widgets/attrs.html" %} />
+    <span class="input-group-append">
+        <button type="button" class="btn btn-secondary" data-toggle="modal"
+                data-target="#modal-advanced-search">
+            <i class="fa fa-cogs" aria-hidden="true"></i>
+        </button>
+    </span>
     <span class="input-group-append">
       <span class="input-group-text clear-search">
         <i class="fa fa-times" aria-hidden="true"></i>
-- 
cgit v1.2.3