From aadbf1569c78615396f17ee688d8055529677dff Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Jan 2018 18:35:44 +0000 Subject: [PATCH] Bug 19959: Update popup window templates to use Bootstrap grid: Label creator This patch updates two label creator templates to use the Bootstrap grid instead of the YUI grid. To test, apply the patch and go to Label creator -> Manage -> Label batches. - Create a new or open an existing label batch. - Click "Add items." - The resulting pop-up window should look correct. - Perform a search - The search results screen should look correct. Signed-off-by: Charlotte Cordwell --- .../intranet-tmpl/prog/en/modules/labels/result.tt | 97 +++++++++++----------- .../intranet-tmpl/prog/en/modules/labels/search.tt | 15 ++-- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt index 9bf4e1a..ca2ac51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -1,55 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Barcodes and labels › Search results [% INCLUDE 'doc-head-close.inc' %] - - - + -
-
+

Search results

[% IF ( displayprev || displaynext ) %] @@ -150,4 +105,50 @@ z [% END -%] [% END %]
- [% INCLUDE 'popup-bottom.inc' %] + +[% MACRO jsinclude BLOCK %] + + +[% END %] + +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt index d9d5235..6795e2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -1,12 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %]Koha › Labels [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] - -
-
+ +

Search for items [% IF ( batch_id ) %] @@ -103,6 +101,9 @@ to add to Batch [% batch_id %]
Cancel
-

-
-[% INCLUDE 'popup-bottom.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'calendar.inc' %] +[% END %] + +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] -- 2.1.4