From a7f2aed5808435538758dad87e19c65a8da77724 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. --- koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt | 5 +---- koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt | 7 +------ 2 files changed, 2 insertions(+), 10 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 958d44b..8a5ddce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -2,12 +2,10 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Barcodes and labels › Search results [% INCLUDE 'doc-head-close.inc' %] - -
-
+

Search results

[% IF ( displayprev || displaynext ) %] @@ -107,7 +105,6 @@ z [% END -%]

[% END %] -
[% MACRO jsinclude BLOCK %] 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 ef8e8fa..0907462 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -2,12 +2,9 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Labels [% INCLUDE 'doc-head-close.inc' %] - - -
-
+

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

-
[% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] -- 2.1.4