Bug 22195: (follow-up) Add tooltip to buttons

[koha_ffzg] / koha-tmpl / intranet-tmpl / prog / en / includes / columns_settings.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
index 636cc5a..cdca0fa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
@@ -1,6 +1,6 @@
 [% USE ColumnsSettings %]
 
-<script type="text/javascript">
+<script>
 function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
     var counter = 0;
     var hidden_ids = [];
@@ -20,43 +20,65 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
         }
         counter++;
     });
-    dt_parameters[ "buttons" ] = [
-        {
-            extend: 'colvis',
-            columns: included_ids,
-            text: _("Column visibility"),
-            exportOptions: {
-                columns: ':visible'
-            },
-        },
+
+    var exportColumns = ":visible";
+    if( dt_parameters.hasOwnProperty("exportColumns") ){
+        // A custom buttons configuration has been passed from the page
+        exportColumns = dt_parameters["exportColumns"];
+    }
+
+    var export_buttons = [
         {
             extend: 'excelHtml5',
             text: _("Excel"),
             exportOptions: {
-                columns: ':visible'
+                columns: exportColumns
             },
         },
         {
             extend: 'csvHtml5',
             text: _("CSV"),
             exportOptions: {
-                columns: ':visible'
+                columns: exportColumns
             },
         },
         {
             extend: 'copyHtml5',
             text: _("Copy"),
             exportOptions: {
-                columns: ':visible'
+                columns: exportColumns
             },
         },
         {
             extend: 'print',
             text: _("Print"),
             exportOptions: {
-                columns: ':visible'
+                columns: exportColumns
+            },
+        }
+    ];
+
+    dt_parameters[ "buttons" ] = [
+        {
+            extend: 'colvis',
+            fade: 100,
+            columns: included_ids,
+            className: "columns_controls",
+            titleAttr: _("Columns settings"),
+            text: '<i class="fa fa-lg fa-gear"></i>',
+            exportOptions: {
+                columns: exportColumns
             },
         },
+        {
+            extend: 'collection',
+            fade: 100,
+            className: "export_controls",
+            titleAttr: _("Export or print"),
+            text: '<i class="fa fa-lg fa-download"></i>',
+            buttons: export_buttons
+        }
+
     ];
 
     var table = $(selector);
@@ -83,6 +105,8 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
         deactivate_filters(id_selector);
     }
 
+    $(".columns_controls,.export_controls").tooltip();
+
     return table;
 }