From 5d8a340c76470f47c45dd944a28f01b752ce6e98 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 17 Nov 2017 11:35:10 +0100
Subject: UI: search

---
 ishtar_common/templates/blocks/JQueryJqGrid.html   |  5 +--
 .../templates/blocks/bs_form_snippet.html          | 50 ++++++++++++----------
 .../templates/ishtar/wizard/default_wizard.html    |  2 +-
 ishtar_common/templates/ishtar/wizard/search.html  |  4 +-
 4 files changed, 33 insertions(+), 28 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index f9548a743..9c18c4399 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -11,12 +11,11 @@
 
 <h4 class="text-center">{% trans "Search and select an item" %}</h4>
 
-<h5 id="pinned_search_{{name}}">
+<div class="alert alert-info" role="alert" id="pinned_search_{{name}}">
     <i class="fa fa-thumb-tack"></i> &nbsp;
     <strong>{% trans "Pinned search:" %}</strong>
     <em><span id="pinned_search_content_{{name}}"></span></em>
-</h5>
-</p>
+</div>
 
 <table id='grid_{{name}}' class='jqgrid'></table>
 <div id='pager_{{name}}'></div>
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index f715c3ece..a6997507c 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -3,61 +3,65 @@
 <div class="alert alert-danger" role="alert">
     {{form.non_field_errors}}
 </div>
-{%endif%}
+{% endif %}
+
 {% for hidden in form.hidden_fields %}
 {{hidden}}
 {% if field.errors %}<div class="invalid-feedback">
     {{ field.errors }}
 </div>{% endif %}
 {% endfor %}
+
 {% for field in form.visible_fields %}
-{% if search and forloop.counter0 == 0 %}
+{% if field.name == 'pk' %}
+{{field}}
+{% elif field.name == 'search_vector' and forloop.counter0 == 0 %}
 
 <div class="form-row">
-    <div class="form-group col-lg">
+    <div class="form-group col-lg-10">
         <div class="input-group">
           <span class="input-group-addon">
               <i class="fa fa-search" aria-hidden="true"></i></span>
               {{field|safe}}
         </div>
-        {% if field.errors %}<div class="invalid-feedback">
-        {{ field.errors }}
-    </div>{% endif %}
         {% if field.help_text %}
         <small><a data-toggle="collapse" href="#{{field.auto_id}}_help"
                   aria-expanded="false" aria-controls="{{field.auto_id}}_help">
-            {% trans 'help'%}</a></small>
-        <div class="collapse" id="{{field.auto_id}}_help">
-            <div class="card card-body">
-                {{field.help_text}}
-            </div>
+            {% trans 'help'%}</a></small>{% endif %}
+        {% if field.errors %}
+        <div class="invalid-feedback">
+            {{ field.errors }}
+        </div>{% endif %}
+    </div>
+    <div class="form-group col-lg">
+        <p class="text-right">
+            <a class="btn btn-secondary btn-sm" data-toggle="collapse" href="#tail-form"
+               aria-expanded="false" aria-controls="tail-form">
+                {% trans "Advanced search" %}</a>
+        </p>
+    </div>
+
+    {% if field.help_text %}
+    <div class="collapse" id="{{field.auto_id}}_help">
+        <div class="card card-body">
+            {{field.help_text}}
         </div>
-        {% endif %}
     </div>
+    {% endif %}
 </div>
 {% else %}
-
 {% if search and forloop.counter0 == 1 %}
-</div>
-<div>
-    <p class="text-center">
-        <a class="btn btn-secondary btn-sm" data-toggle="collapse" href="#tail-form"
-           aria-expanded="false" aria-controls="tail-form">
-            {% trans "Criteria search" %}</a>
-    </p>
-</div>
 <div class="collapse" id="tail-form">
     <div class="card card-body">
         <div class="form-row">
 {% endif %}
 
-{% if search and forloop.counter0|divisibleby:2 or search and forloop.counter1|divisibleby:2 %}
+{% if not search and forloop.counter0|divisibleby:2 or search and forloop.counter1|divisibleby:2 %}
 {% if forloop.counter0 %}
   </div>{% endif %}
   <div class="form-row">
 {% endif %}
 
-
     <div class="form-group col-lg-6">
       {{ field.label_tag }}
       {{field|safe}}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 06e8be05a..7ba87c44d 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -5,7 +5,7 @@
 {% endblock %}
 {% block content %}
 {% block wizard_head %}
-<h2>{{wizard_label}}</h2>
+<h3>{{wizard_label}}</h3>
 
 {% include "ishtar/blocks/wizard_breadcrumb.html" %}
 
diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html
index 7b8f142e4..da7955c26 100644
--- a/ishtar_common/templates/ishtar/wizard/search.html
+++ b/ishtar_common/templates/ishtar/wizard/search.html
@@ -4,8 +4,9 @@
 {{wizard.form.media}}
 {% endblock %}
 {% block content %}
-<h2>{{wizard_label}}</h2>
+<h3>{{wizard_label}}</h3>
 
+{% comment %}
 <nav aria-label="breadcrumb" role="navigation">
   <ol class="breadcrumb">
     <li class="breadcrumb-item active">
@@ -13,6 +14,7 @@
     </li>
   </ol>
 </nav>
+{% endcomment %}
 
 {% if wizard.form.forms %}
 <div class='form'>
-- 
cgit v1.2.3