From c03b4d3a7ca6255511935466803c5fd4cab99bf9 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 | 2 +- 3 files changed, 46 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 52ee8d4..ee5f80b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2778,3 +2778,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 b9d97ac..6f3a405 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 7c65ad0..f7d3242 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -863,7 +863,7 @@ No patron matched [% message | html %] "[% message.message %]" [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %] - [ Delete] + Delete [% END %] [% END %] -- 2.1.4