From 0ad37aa4100e48701672f7c18f847ea5505be1c2 Mon Sep 17 00:00:00 2001 From: Devinim Date: Fri, 18 Oct 2019 13:51:55 +0000 Subject: [PATCH] Bug 22773: (follow-up) Recommended changes are made on datatable and butons Signed-off-by: Kelly McElligott Signed-off-by: Christopher Kellermeyer Signed-off-by: Katrin Fischer Rebase add comma --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 ---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index d54a1ecdb1..869ad2dd76 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -3714,10 +3714,6 @@ span { margin: 1em auto; } -#merge { - margin: .5em 0 0; -} - #merge_table { tr { &.active { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 646b7240e6..33c6f60b0f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -121,9 +121,9 @@ [% IF CAN_user_acquisition_merge_invoices %] Merge selected invoices [% IF tab == 'closed' %] - Reopen selected invoices + Reopen selected invoices [% ELSE %] - Close selected invoices + Close selected invoices [% END %] [% END %] @@ -370,7 +370,8 @@ aoColumnDefs: [ { "bSortable": false, "aTargets": [1, -1] }, { "bVisible": false, "aTargets": [0] } - ] + ], + autoWidth: false })); $(".show_only_subscription").prop("checked", false); -- 2.11.0