From ae3914e9de21423b33997b21c6c69db45154d79e 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 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 --- koha-tmpl/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 ba6c8fb..ff8e6b6 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 bb8b68d..503d6e6 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 a937bf1..f1df775 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.1.4