From cc721a183afd518abba74a62fdfda3968b52030d Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> 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 <charlotte.cordwell123@gmail.com> --- koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt | 8 ++------ 2 files changed, 3 insertions(+), 9 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 a2c6df9..7e1b078 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' %] <title>Koha › Barcodes and labels › Search results</title> [% INCLUDE 'doc-head-close.inc' %] - <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style> </head> <body id="labels_result" class="tools labels"> - <div id="custom-doc" class="yui-t7"> - <div id="bd"> + <div class="container-fluid"> <h1>Search results</h1> <div class="results"> [% IF ( displayprev || displaynext ) %] 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..c96d24b 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,10 @@ [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Labels</title> [% INCLUDE 'doc-head-close.inc' %] -<style type="text/css">#custom-doc { width:47.23em;*width:46.04em;min-width:610px; margin:auto;margin-top: .4em; text-align:left; }</style> </head> -<body id="labels_search" class="tools labels"> -<div id="custom-doc" class="yui-t7"> - <div id="bd"> +<body id="labels_search" class="tools labels"> + <div class="container-fluid"> <h1>Search for items [% IF ( batch_id ) %] @@ -104,8 +102,6 @@ to add to Batch [% batch_id %] <fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset> </form> -</div> -</div> [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] -- 2.1.4