From 5c97d2f0be14a34ecc4314be8ca232281560613c 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 --- 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 6d03d1a310..9a9bb50ed5 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -3644,10 +3644,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 7c1b3cb96d..f4c916520a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -116,9 +116,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 %] @@ -366,7 +366,8 @@ { "bSortable": false, "aTargets": [1, -1] }, { "bVisible": false, "aTargets": [0] }, { "sType": "title-string", "aTargets" : [ "title-string" ] } - ] + ], + autoWidth: false })); $(".show_only_subscription").prop("checked", false); -- 2.11.0