1 files changed, 27 insertions, 19 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 1768ab427..74ccd7780 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -1,33 +1,41 @@
 {% load i18n %}
 
-<button id='search_{{name}}' class='submit ui-widget-header'>{% trans "Search" %}</button>
+<p class="text-center">
+
+<button id='search_{{name}}' class='btn btn-primary btn-block'>
+    {% trans "Search" %}</button>
 
 {% if url_new %}
 <p><a href="#" onclick="open_window('{{url_new}}');">{{new_message}}</a></p>
 {% endif %}
 
-<h4>{% trans "Search and select an item" %}</h4>
+<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>
+</div>
 
 <table id='grid_{{name}}' class='jqgrid'></table>
 <div id='pager_{{name}}'></div>
 
-<div id='foot_{{name}}' class='gridfooter'>
-
-{% if source_full or extra_sources %}
-<a class='badge {{sname}}-csv' href='{{source}}csv' target='_blank' title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
-{% if source_full %}<a class='badge {{sname}}-csv-full' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>{% endif %}
-{% for slug, name, extra_source in extra_sources %}
-<a class='badge {{slug}}-csv-full' href='{{extra_source}}csv' target='_blank' title="{% trans 'Export as CSV - ' %}{{name}}">{{name}}</a>
-{% endfor %}
-{% else %}
-<a class='{{sname}}-csv' href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
-{% endif %} {{encoding}}
+<div id='foot_{{name}}' class="gridfooter row toolbar">
+    <div class='col-md-2'>
+        <div class="btn-group btn-group-sm" role="group"
+             aria-label="{% trans 'Export'%}">
+            {% if source_full or extra_sources %}
+            <a class="btn btn-secondary" href='{{source}}csv' target='_blank'
+               title="{% trans 'Export as CSV - ' %}{% trans 'simple'%}">{% trans "CSV" %}</a>
+            {% if source_full %}<a class='btn btn-secondary' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>{% endif %}
+            {% for slug, name, extra_source in extra_sources %}
+            <a class="btn btn-secondary" href='{{extra_source}}csv' target='_blank' title="{% trans 'Export as CSV - ' %}{{name}}">{{name}}</a>
+            {% endfor %}
+            {% else %}
+            <a class="btn btn-secondary" href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
+            {% endif %}
+        </div>
+    </div>
 </div>
 
 {% if multiple %}
@@ -43,8 +51,8 @@ var query_vars = new Array({{col_idx|safe}});
 var selItems_{{sname}} = new Array();
 jQuery(document).ready(function(){
   jQuery("#search_{{name}}").click(function (){
-    if ($("#progress").length > 0){
-        $("#progress").show();
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('show');
     }
     var data = "";
     for (idx in query_vars)
@@ -76,8 +84,8 @@ jQuery(document).ready(function(){
 
     mygrid.setGridParam({url:url, page:1});
     mygrid.trigger("reloadGrid");
-    if ($("#progress").length > 0){
-        $("#progress").hide();
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('hide');
     }
     return false;
   });