From d7f62a76bd887db792223dff2b6695ac0374ad34 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Sun, 6 Mar 2016 21:35:04 +0000 Subject: [PATCH] Bug 15966: Move MARC frameworks actions into a drop down menu EDIT: Switching icons for Export and Import. What I had initially was what I intended because export is like downloading and import is like upload, but it seems to make more sense reversed. EDIT2: Fixing Import problem To test: 1) Go to Administration -> MARC bibliographic framework (admin/biblio_framework.pl) 2) Confirm that all actions have now been moved into drop down menus. a) For Default framework, actions available are 'MARC structure', 'Export' and 'Import'. b) Confirm these buttons all work as expected. c) For all other frameworks, actions available are 'MARC structure', 'Edit', 'Delete', 'Export' and 'Import'. d) Confirm these buttons all work as expected. Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard --- .../prog/en/modules/admin/biblio_framework.tt | 196 ++++++++++---------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index f870026..a1de430 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -17,7 +17,7 @@ $(document).ready(function() { $("#table_biblio_frameworks").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ - { "aTargets": [ -1, -2, -3, -4, -5 ], "bSortable": false, "bSearchable": false }, + { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, { "aTargets": [ 0, 1 ], "sType": "natural" }, ], "bSort": true, @@ -63,6 +63,7 @@ $('form.form_import').submit(function() { var id = $(this).attr('id'); var obj = $('#' + id + ' input:file'); + alert(obj.val()); if (/(?:\.csv|\.ods|\.xml)$/.test(obj.val())) { if (confirm(_("Do you really want to import the framework fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup"))) { var frameworkcode = $('#' + id + ' input:hidden[name=frameworkcode]').val(); @@ -205,71 +206,66 @@ Code Description   - Edit - Delete - Export - Import   Default framework - MARC structure -   -   - - - Export - +