2 files changed, 17 insertions, 7 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 12f630de7..7f7e97c5b 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -2,7 +2,7 @@
 
 <p class="text-center">
 
-<button id='search_{{name}}' class='btn btn-primary'>
+<button id='search_{{name}}' class='btn btn-primary' type="button">
     {% trans "Search" %}</button>
 
 {% if url_new %}
@@ -145,7 +145,21 @@ jQuery(document).ready(function(){
             return json.rows;
         }
     },
-    "select": {% if multiple_select %}true{% else %}'single'{% endif %},
+    "select": {
+        "style": {% if multiple_select %}'multi'{% else %}'single'{% endif %}
+    },
+    {% if multiple_select %}"buttons": [
+        'selectAll',
+        'selectNone'
+    ],
+    language: {
+        buttons: {
+            selectAll: "{% trans 'Select all items' %}",
+            selectNone: "{% trans 'Select none' %}"
+        }
+    },
+    "dom": 'lBtip',
+    {% endif %}
     "columns": [
         { "data": "id", "visible": false },
         { "data": "link", "orderable": false },{% for col in extra_cols %}
@@ -236,8 +250,6 @@ jQuery(document).ready(function(){
   });
 {% else %}
   jQuery("#submit_form").click(function (){
-    var mygrid = jQuery("#grid_{{name}}");
-
     var data = datatable_{{sname}}.rows( { selected: true } ).data();
     {% if multiple_select %}
     var value = "";
@@ -256,7 +268,6 @@ jQuery(document).ready(function(){
 });
 
   function get_next_table_id(c_id){
-    // var mygrid = jQuery("#grid_{{name}}");
     var has_current_id = false;
 
     ids = datatable_{{sname}}.column(0).data();
@@ -267,7 +278,6 @@ jQuery(document).ready(function(){
     return false;
   }
   function get_previous_table_id(c_id){
-    // var mygrid = jQuery("#grid_{{name}}");
     var previous_id = 0;
 
     ids = datatable_{{sname}}.column(0).data();
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index ed0dc14e1..a4d772236 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -36,7 +36,7 @@
     </div>
     <div class="form-group col-lg">
         <p class="text-right">
-            <button type="button" class="btn btn-secondary btn-sm" data-toggle="modal"
+            <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>