From 567e34baa40d0454ab07fc8afc7d4acf2cd8d4a7 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Mon, 31 Oct 2016 12:57:11 +0000 Subject: [PATCH] Bug 8612: QA followup - Make export button split button, unify button labels --- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 91a028e..5ed745c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -1,16 +1,15 @@ -[% BLOCK btn_group %] +[% BLOCK csv_export %]
-
- - -
+ Export as CSV + +
[% END %] [% USE KohaDates %] @@ -137,11 +136,13 @@ confirm_reopen(); }); // Generates a dynamic link for exporting the selections data as CSV - $("#exportbutton").click(function() { + $("#exportbutton, #export-csv-menu a").click(function() { // Building the url from currently checked boxes var url = '/cgi-bin/koha/acqui/basket.pl'; url += $('#exportbutton').attr('href'); - url += '&csv_profile=' + $("#csv_profile_for_export option:selected").val(); + if($(this).attr("data-value")) { + url += '&csv_profile=' + $(this).attr("data-value"); + } // And redirecting to the CSV page location.href = url; return false; @@ -223,8 +224,7 @@ [% END %] - [% PROCESS btn_group %] -
Export
+ [% PROCESS csv_export %] [% IF ediaccount %]
Create EDIFACT order
@@ -285,8 +285,8 @@
- [% PROCESS btn_group %] - + + [% PROCESS csv_export %]
[% END %] -- 2.1.4