Display pined search on search input

3 files changed, 43 insertions, 74 deletions

diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 309bb0b09..8af5f1a7b 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -10,12 +10,6 @@
 <p><a href="#" onclick="open_window('{{url_new}}');">{{new_message}}</a></p>
 {% endif %}
 
-<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>
-</div>
-
 <div class="modal fade table-modal-lg" tabindex="-1" role="dialog"
      aria-hidden="true" id="modal_grid_{{name}}">
   <div class="modal-dialog full modal-lg">
@@ -207,49 +201,6 @@ jQuery(document).ready(function(){
   if (datatables_i18n) datatable_options['language'] = datatables_i18n;
   datatable_{{sname}} = jQuery("#grid_{{name}}").DataTable(datatable_options);
 
-{% comment %}
-
-  jQuery("#grid_{{name}}").jqGrid({
-    url:'{{source}}',
-    datatype: "json",
-    mtype: 'GET',
-    colNames:['id', '', {{col_names|safe}}],
-    colModel:[
-      {name:'id', index:'id', hidden:true},
-      {name:'link', index:'link', width:30},
-      {{extra_cols|safe}}
-    ],
-    height: 300,
-    sortname: '__default__',
-    viewrecords: true,
-    sortorder: "asc",
-    emptyrecords: "{{no_result}}",
-    loadtext: "{{loading}}",
-    pager: '#pager_{{name}}',
-    width: null,
-    shrinkToFit: false,
-    rowNum:20,
-    {% if multiple_select %}multiselect: true,{% endif %}
-    jsonReader : {repeatitems: false},
-    loadError: function (jqXHR, textStatus, errorThrown) {
-        alert("{% trans "An error as occured during search. Check your query fields." %}");
-    },
-    beforeProcessing: function(data, status, xhr){
-        $('#pinned_search_content_{{name}}').html('');
-        for (idx in data){
-            if (idx == 'pinned-search' && data[idx] != ''){
-               $('#pinned_search_content_{{name}}').html(data[idx]);
-            }
-        }
-        if ($('#pinned_search_content_{{name}}').html()){
-            $('#pinned_search_{{name}}').show();
-        } else {
-            $('#pinned_search_{{name}}').hide();
-        }
-    }
-  });
-{% endcomment %}
-
 {% if multiple %}
   jQuery("#add_button_{{name}}").click(function (){
     var mygrid = jQuery("#grid_{{name}}");
diff --git a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
index 953b0ef40..e1dc852d9 100644
--- a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
@@ -1,27 +1,36 @@
 {% extends "ishtar/blocks/base_shortcut_menu.html" %}
 {% load i18n %}
 {% block short_content %}
-<div class="short-menu-buttons btn-group" role="group">
-    <button type="button" class="btn btn-secondary"
-            id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
-    <button type="button" class="btn btn-secondary active" id='short-menu-advanced' title="{% trans 'Advanced menu' %}">{% trans "advanced" %}</button>
-</div>
-<div id='action_current_items' class="btn-group" role="group">
-    <button type="button" onclick='return activate_own_search();'
-           title="{% trans 'Search within my items' %}"
-           class='btn btn-secondary activate_own_search{% if SHORTCUT_SEARCH == "own" %} active{% endif %}'>
-        <i class="icon fa fa-user" aria-hidden="true"></i>
-    </button>
-    <button type="button" onclick='return activate_all_search();'
-           title="{% trans 'Search within all items' %}"
-           class='btn btn-secondary activate_all_search{% if SHORTCUT_SEARCH == "all" %} active{% endif %}'>
-        <i class="icon fa fa-users" aria-hidden="true"></i>
-    </button>
-    {% comment %}
-    <p>
-        <a href='' onclick='return load_shortcut_menu();' class='disabled'><i class="icon fa fa-2x fa-refresh" aria-hidden="true" title="{% trans 'Refresh menu' %}"></i></a>
-    </p>
-    {% endcomment %}
+<div class="d-flex">
+    <div class="short-menu-buttons btn-group p-2" role="group">
+        <button type="button" class="btn btn-secondary"
+                id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
+        <button type="button" class="btn btn-secondary active" id='short-menu-advanced' title="{% trans 'Advanced menu' %}">{% trans "advanced" %}</button>
+    </div>
+    <div id='action_current_items' class="btn-group p-2" role="group">
+        <button type="button" onclick='return activate_own_search();'
+               title="{% trans 'Search within my items' %}"
+               class='btn btn-secondary activate_own_search{% if SHORTCUT_SEARCH == "own" %} active{% endif %}'>
+            <i class="icon fa fa-user" aria-hidden="true"></i>
+        </button>
+        <button type="button" onclick='return activate_all_search();'
+               title="{% trans 'Search within all items' %}"
+               class='btn btn-secondary activate_all_search{% if SHORTCUT_SEARCH == "all" %} active{% endif %}'>
+            <i class="icon fa fa-users" aria-hidden="true"></i>
+        </button>
+        {% comment %}
+        <p>
+            <a href='' onclick='return load_shortcut_menu();' class='disabled'><i class="icon fa fa-2x fa-refresh" aria-hidden="true" title="{% trans 'Refresh menu' %}"></i></a>
+        </p>
+        {% endcomment %}
+    </div>
+    <div class="short-menu-buttons btn-group ml-auto p-2" role="group">
+        <button type="button" class="btn btn-secondary active"
+                id='short-menu-refresh' onclick="location.reload();"
+                title="{% trans 'Refresh current page' %}">
+            <i class="icon fa fa-refresh" aria-hidden="true"></i>
+        </button>
+    </div>
 </div>
 <p id='current_items'>
     {% for lbl, model_name, current, widget in menu %}
diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
index 10113aa59..447deb573 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -1,10 +1,19 @@
 {% extends "ishtar/blocks/base_shortcut_menu.html" %}
 {% load i18n %}
 {% block short_content %}
-<div class="short-menu-buttons btn-group" role="group">
-    <button type="button" class="btn btn-secondary active"
-            id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
-    <button type="button" class="btn btn-secondary" id='short-menu-advanced' title="{% trans 'Advanced menu' %}">{% trans "advanced" %}</button>
+<div class="d-flex">
+    <div class="short-menu-buttons btn-group p-2" role="group">
+        <button type="button" class="btn btn-secondary active"
+                id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
+        <button type="button" class="btn btn-secondary" id='short-menu-advanced' title="{% trans 'Advanced menu' %}">{% trans "advanced" %}</button>
+    </div>
+    <div class="short-menu-buttons btn-group ml-auto p-2" role="group">
+        <button type="button" class="btn btn-secondary active"
+                id='short-menu-refresh' onclick="location.reload();"
+                title="{% trans 'Refresh current page' %}">
+            <i class="icon fa fa-refresh" aria-hidden="true"></i>
+        </button>
+    </div>
 </div>
 <div>
     <p class="alert alert-info mt-2">