From 4950725e0a9c47f1b6d90d69e3cb97be5de51abd 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 | 8 ++++ .../prog/en/includes/members-toolbar.inc | 55 ++++++++++------------ .../prog/en/modules/circ/circulation.tt | 2 +- 3 files changed, 33 insertions(+), 32 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..8774a6f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2778,3 +2778,11 @@ div[class$="_table_controls"] { #borrower_message { margin-top: 10px; } + +.form-group { + margin-bottom: 10px; +} + +.form-group label { + font-weight: bold; +} 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..d8402b7 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,35 @@ 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 6668aa5..178156d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -859,7 +859,7 @@ No patron matched [% message | html %] "[% message.message %]" [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %] - [ Delete] + Delete [% END %] [% END %] -- 2.1.4