From 71e370980efa9ff69cd176d6af431c99b9f080e4 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 10 Jul 2018 13:34:38 +0200
Subject: UI: improve layout and action for search

---
 ishtar_common/templates/ishtar/forms/search_query.html | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'ishtar_common/templates/ishtar/forms/search_query.html')

diff --git a/ishtar_common/templates/ishtar/forms/search_query.html b/ishtar_common/templates/ishtar/forms/search_query.html
index e842fd591..ff51d483d 100644
--- a/ishtar_common/templates/ishtar/forms/search_query.html
+++ b/ishtar_common/templates/ishtar/forms/search_query.html
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-sm" id="save-search-div">
     <div class="modal-content">
         <div class="modal-header">
-            <h5>{% trans "Save search" %}</h5>
+            <h5>{% trans "Bookmark search" %}</h5>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
             </button>
@@ -11,7 +11,7 @@
               action="{% url 'save-search-query' app_label model %}"
               method="post"
               id="save-search-form">
-            <div class="modal-body form-row">
+            <div class="modal-body form-row-modal">
               {% csrf_token %}
 
               <div class='form'>
@@ -29,11 +29,6 @@
                 </div>{% endif %}
                 {% endfor %}
 
-                <div class="form-row">
-                    <div class="form-group col-lg-12">
-                        {{form.query}}
-                    </div>
-                </div>
                 {% if form.search_query %}
                 <div class="form-row">
                     <input type="radio" name="create_or_update" value="create"
@@ -50,9 +45,12 @@
                         {% endwith %}
                     </div>
                     <div class="form-row">
-                        {% with form.is_alert as field %}
-                        {% include "blocks/bs_field_snippet.html" %}
-                        {% endwith %}
+                        <div class="form-group col-lg-12">
+                            <span>
+                                {{form.is_alert}}
+                                <label for="{{form.is_alert.auto_id}}">{{form.is_alert.label}}</label>
+                            </span>
+                        </div>
                     </div>
                 </div>
                 {% if form.search_query %}
-- 
cgit v1.2.3