From a3542c00870e0ae3053338bf4015d9707b51a744 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 30 Oct 2018 14:30:12 +0000 Subject: [PATCH] Bug 20844: (follow-up) Fix style of dialogs This patch modifies the add item and item detail templates so that the hold cancellation dialogs match other similar dialogs in Koha. To test, apply the patch and perform step 10 or the original test plan. Confirm that the confirmation dialogs look correct. Confirmation dialogs look correct Signed-off-by: Alex Buckley Signed-off-by: Martin Renvoize --- .../prog/en/modules/catalogue/moredetail.tt | 19 +++++++---- .../prog/en/modules/cataloguing/additem.tt | 32 +++++++++++-------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 95af665733..74c7a3f608 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -50,16 +50,23 @@ [% FOREACH ITEM_DAT IN ITEM_DATA %]
-

Barcode [% ITEM_DAT.barcode | html %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]

+

Barcode [% ITEM_DAT.barcode | html %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]

[% IF ((ITEM_DAT.itemnumber == lostitemnumber) && (LostItemLevelHold)) %] -
-
+
+

This item has an item-level hold on it:

+ - This item has an item-level hold on it: - - + + + +
+ + + + +
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 0d79293017..057bf9b74b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -247,6 +247,25 @@ function confirm_deletion() {
+ + [% IF (LostItemLevelHold) %] +
+

This item has an item-level hold on it:

+
+ + +
+
+ + + + + + +
+
+ [% END %] +
[% IF (popup) %] @@ -259,19 +278,6 @@ function confirm_deletion() {

Edit Item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]

[% END %] - - [% IF (LostItemLevelHold) %] -
- - - This item has an item-level hold on it: - - - -
- [% END %] - -
    [% FOREACH ite IN item %] -- 2.19.1