From 194d5898c85abbf3a78d9c4c225a2e439fa54d48 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 4 Oct 2016 14:55:51 +0200 Subject: [PATCH] Bug 17398: Enhance circulation messages UI MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Test plan: 1) Apply patch 2) Add same circulation messages, note that both buttons are in bootstrap style and the whole form is a bit cleaner 3) Confirm that adding works as expected 4) Try to delete some of your messages, note the delete link is also button now 5) Confirm that deleting works as expected Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../intranet-tmpl/prog/css/staff-global.css | 12 ++++ .../prog/en/includes/members-toolbar.inc | 68 +++++++++---------- .../prog/en/modules/circ/circulation.tt | 4 +- 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index ba6c8fb30f..ff8e6b660d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2786,3 +2786,15 @@ div[class$="_table_controls"] { #borrower_message { margin-top: 10px; } + +.form-group { + margin-bottom: 10px; +} + +.form-group label { + font-weight: bold; +} + +.modal-textarea { + width: 98%; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index bb8b68ddf9..503d6e6a85 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -214,42 +214,40 @@ function searchToHold(){ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 6ab6985a1f..1444f2db42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -856,7 +856,7 @@ No patron matched [% message | html %] [% ELSE %] - [% END %]> + [% END %] [% message.message_date | $KohaDates %] [% Branches.GetName( message.branchcode ) %] [% IF message.manager_id %] @@ -865,7 +865,7 @@ No patron matched [% message | html %] "[% message.message %]" [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %] - [ Delete] + Delete [% END %] [% END %] -- 2.39.5