From a4be135f5424a91ac3e2aa33d66d79e27a0a7936 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 2 May 2018 18:33:04 +0000
Subject: [PATCH] Bug 21438: Update two-column templates with Bootstrap grid:
 Patron card creator

This patch modifies the patron card creator templates to use the
Bootstrap grid instead of YUI.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Tools -> patron card creator
   - Manage -> Card batches
     - Edit card batch
   - Manage -> Layouts
     - Edit layout
   - Manage -> Images
   - Manage -> Card templates
     - Edit template
   - Manage -> Printer profiles
     - Edit profile
---
 .../prog/en/modules/patroncards/edit-batch.tt      | 25 ++++++----
 .../prog/en/modules/patroncards/edit-layout.tt     | 32 ++++++++-----
 .../prog/en/modules/patroncards/edit-profile.tt    | 34 +++++++------
 .../prog/en/modules/patroncards/edit-template.tt   | 56 +++++++++++-----------
 .../prog/en/modules/patroncards/home.tt            | 36 +++++++-------
 .../prog/en/modules/patroncards/image-manage.tt    | 37 +++++++-------
 .../prog/en/modules/patroncards/manage.tt          | 26 ++++++----
 7 files changed, 133 insertions(+), 113 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
index d16ad3f..f8b4eb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
@@ -21,10 +21,12 @@
             New
         [% END %]
     </div>
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-            <div id="yui-main">
-                <div class="yui-b">
+
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-sm-10 col-sm-push-2">
+                <main>
+
                     <div class="yui-g">
                     [% INCLUDE 'patroncards-toolbar.inc' %]
                         <div class="yui-u first">
@@ -118,13 +120,16 @@
                                 </fieldset>
                             [% END %]
                         </div>
-                    </div>
-                </div>
-                <div class="yui-b">
-                  [% INCLUDE 'tools-menu.inc' %]
-                </div>
-            </div>
 
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'greybox.inc' %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
index b93385b..014c6f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
@@ -14,10 +14,12 @@
         <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Layouts</a> &rsaquo;
         [% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %]
     </div>
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-            <div id="yui-main">
-                <div class="yui-b">
+
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-sm-10 col-sm-push-2">
+                <main>
+
                     <div class="yui-g">
                     [% INCLUDE 'patroncards-toolbar.inc' %]
                         <div class="yui-u first">
@@ -27,8 +29,8 @@
 
                 <!-- NOTE: The order of the elements on this form is crictical to correct processing. You've been warned...  -->
                 <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get">
-                <div class="yui-g">
-                <div class="yui-g first">
+                <div class="row">
+                <div class="col-sm-6">
                         <fieldset class="rows">
                             <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout</legend>
                             <ol>
@@ -259,7 +261,7 @@
                             </ol>
                         </fieldset>
                 </div>
-                <div class="yui-g">
+                <div class="col-sm-6">
                     <fieldset class="rows">
                     <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend>
                     <ol>
@@ -460,12 +462,16 @@
                         <input type="hidden" name="layout_id" value="[% layout_id | html %]" />
                     </fieldset>
                 </form>
-                </div>
-            </div>
-            <div class="yui-b">
-              [% INCLUDE 'tools-menu.inc' %]
-            </div>
-        </div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
index 0b5e8c9..d6ee17c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
@@ -14,19 +14,15 @@
         <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Profiles</a> &rsaquo;
         [% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%]
     </div>
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-        <div id="yui-main">
-            <div class="yui-b">
-                    <div class="yui-g">
+
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-sm-10 col-sm-push-2">
+                <main>
+
                     [% INCLUDE 'patroncards-toolbar.inc' %]
-                        <div class="yui-u first">
 
-                        </div>
-                    </div>
-                        <div class="yui-g">
                             <h3>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]</h3>
-                                <div class="yui-g first">
                                     <form name="input" action="/cgi-bin/koha/patroncards/edit-profile.pl" method="get">
                                     <fieldset class="rows"><legend>Profile settings</legend>
                                         <ol>
@@ -98,14 +94,16 @@
                                         <input type="hidden" name="profile_id" value="[% profile_id | html %]" />
                                     </fieldset>
                     </form>
-                                </div>
-                            </div>
-                        </div>
-                </div>
-                <div class="yui-b">
-                  [% INCLUDE 'tools-menu.inc' %]
-                </div>
-            </div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
index b561bbd..7d73d8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
@@ -16,20 +16,17 @@
         <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Templates</a> &rsaquo;
         [% IF (template_id) %]Edit ([% template_id | html %])[% ELSE %]New[% END %]
     </div>
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-            <div id="yui-main">
-                <div class="yui-b">
-                    <div class="yui-g">
-                    [% INCLUDE 'patroncards-toolbar.inc' %]
-                        <div class="yui-u first">
 
-                        </div>
-                    </div>
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-sm-10 col-sm-push-2">
+                <main>
+
+                    [% INCLUDE 'patroncards-toolbar.inc' %]
                     <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get">
-                    <div class="yui-g">
                         <h3>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h3>
-                        <div class="yui-u first">
+                        <div class="row">
+                        <div class="col-sm-6">
                             <fieldset class="rows">
                                 <ol>
                                     <li>
@@ -92,7 +89,7 @@
                                 </ol>
                             </fieldset>
                         </div>
-                        <div class="yui-u">
+                        <div class="col-sm-6">
                             <fieldset class="rows">
                                 <ol><li>
                                     <label for="top_margin">Top page margin:</label>
@@ -141,23 +138,26 @@
                             </fieldset>
                         </div>
                     </div>
-                    <div class="yui-g">
-                        <fieldset class="action">
-                            <input type="submit" class="submit" value="Save" />
-                            <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Cancel</a>
-                            <input type="hidden" name="op" value="save" />
-                            [% IF ( template_id ) %]
-                            <input type="hidden" name="template_id" value="[% template_id | html %]" />
-                            [% END %]
-                        </fieldset>
-                    </div>
+
+                    <fieldset class="action">
+                        <input type="submit" class="submit" value="Save" />
+                        <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Cancel</a>
+                        <input type="hidden" name="op" value="save" />
+                        [% IF ( template_id ) %]
+                        <input type="hidden" name="template_id" value="[% template_id | html %]" />
+                        [% END %]
+                    </fieldset>
                 </form>
-            </div>
-        </div>
-        <div class="yui-b">
-          [% INCLUDE 'tools-menu.inc' %]
-        </div>
-    </div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
index a251810..a87f597 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
@@ -10,19 +10,23 @@
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         Patron card creator
     </div>
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-            <div id="yui-main">
-                <div class="yui-b">
-                    <div class="yui-g">
-                    [% INCLUDE 'patroncards-toolbar.inc' %]
-                        <div class="yui-u first">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="yui-b">
-              [% INCLUDE 'tools-menu.inc' %]
-            </div>
-        </div>
-        [% INCLUDE 'intranet-bottom.inc' %]
+
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
+                [% INCLUDE 'patroncards-toolbar.inc' %]
+
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- .col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
index fc9bed9..22fcf76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
@@ -13,19 +13,16 @@
     <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
     Images
 </div>
-<div id="doc3" class="yui-t2">
-    <div id="bd">
-        <div id="yui-main">
-            <div class="yui-b">
-                    <div class="yui-g">
-                    [% INCLUDE 'patroncards-toolbar.inc' %]
-                        <div class="yui-u first">
 
-                        </div>
-                    </div>
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
+                [% INCLUDE 'patroncards-toolbar.inc' %]
                 [% INCLUDE 'patroncards-errors.inc' %]
-                <div class="yui-g">
-                    <div class="yui-u first">
+                <div class="row">
+                    <div class="col-sm-6">
                         <h1>Upload additional images for patron cards</h1>
                         <p>Manage additional images to use as logo, decoration or background on a patron card layout.</p>
                         <form name="upload_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
@@ -64,7 +61,7 @@
 
                         </form>
                     </div>
-                    <div class="yui-u">
+                    <div class="col-sm-6">
                     <h1>Delete Images</h1>
                         [% IF ( TABLE ) %]
                         <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
@@ -134,12 +131,16 @@
                         [% END %]
                     </div>
                 </div>
-            </div>
-        </div>
-        <div class="yui-b">
-          [% INCLUDE 'tools-menu.inc' %]
-        </div>
-    </div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
index 6bd66b3..a79abf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
@@ -36,10 +36,12 @@
         <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
         [% PROCESS translate_card_element element=card_element_title %]
     </div>
-    <div id="doc3" class="yui-t2">
-        <div id="bd">
-            <div id="yui-main">
-                <div class="yui-b">
+
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-sm-10 col-sm-push-2">
+                <main>
+
                     [% INCLUDE 'patroncards-toolbar.inc' %]
                     [% INCLUDE 'patroncards-errors.inc' %]
                     <div class="yui-gc">
@@ -122,12 +124,16 @@
                             [% END %]
                         </div>
                     </div>
-                </div>
-            </div>
-            <div class="yui-b">
-              [% INCLUDE 'tools-menu.inc' %]
-            </div>
-        </div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'tools-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'greybox.inc' %]
-- 
2.1.4