Attachment 20519 Details for Bug 9603 – Bug 9603 - Fix layout of Patron Card Creator Layout screen for display in IE

[patch] Bug 9603 - Fix layout of Patron Card Creator Layout screen for display in IE

Bug-9603---Fix-layout-of-Patron-Card-Creator-Layou.patch (text/plain), 13.88 KB, created by David Cook on 2013-08-21 02:14:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cook

Created: 2013-08-21 02:14:52 UTC

Size: 13.88 KB

patch

obsolete

>From ea65285e17d70f4bfdec7c6539f1bfec00b972cc Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Wed, 21 Aug 2013 12:12:36 +1000
>Subject: [PATCH] Bug 9603 - Fix layout of Patron Card Creator Layout screen
> for display in IE
>
>Currently, the layout for the Edit/Add Layout screen of the Patron
>Card Creator is in complete disarray, when viewed in Internet Explorer
>(of any version).
>
>The nav bar is pushed to the bottom of the page, every fieldset is
>empty (as their contents have been pushed out into different parts
>of the page), and the checkboxes don't work.
>
>The cause appears to be some extraneous mark-up (a few extra fieldset
>and li elements)and some missing mark-up (ol elements to wrap the list
>elements, especially when nesting lists within each other and within
>div elements).
>
>---
>
>This patch removes empty and extraneous fieldset and li elements. It
>also adds ol elements to all of the nested li elements, which were
>creating layout problems in IE, especially when they were interwoven
>with div elements. IE had problems opening and closing tags,
>which created some major chaos.
>
>---
>
>Test Plan:
>
>Before applying the patch:
>
>1) Open Koha using any version of Internet Explorer
>2) Go to the Patron Card Creator in the Tools module
>3) Go to Manage Layouts
>4) Add or Edit a layout
>5) Note that all the elements on the page are presented in haphazard
> fashion with the navbar pushed to the bottom of the page.
>
>Apply the patch.
>
>6) Refresh the page
>7) Note that the elements are now laid out on the page in the same way
> that they would appear in a modern browser like Firefox or Chrome
> (look at the same page in one of those browsers to confirm).
>
>(N.B. The exception is IE7. While the layout has been improved, it is
>now displayed linearly (i.e. without the YUI grid system). I've opened
>up Bug 10772 to start discussing this problem.)
>---
> .../prog/en/modules/patroncards/edit-layout.tt     |   32 +++++++++++++++++--
> 1 files changed, 28 insertions(+), 4 deletions(-)
>
>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 798ad48..606a6ac 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
>@@ -130,6 +130,7 @@
>                                 <li>
>                                 <fieldset>
>                                 <legend>General settings</legend>
>+                                <ol>
>                                 <li>
>                                     <label for="layout_name">Layout name: </label>
>                                     <input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
>@@ -168,11 +169,13 @@
>                                     <input type="radio" name="guide_box" id="guide_box" value="0" checked="checked" />Off
>                                     [% END %]
>                                 </li>
>+                                </ol>
>                                 </fieldset>
>                                 </li>
>                                 <li>
>                                     <fieldset>
>                                     <legend>Text fields</legend>
>+                                    <ol>
>                                         <li>
>                                             <fieldset>
>                                             [% IF ( field_1 ) %]
>@@ -181,6 +184,7 @@
>                                             <legend><input type="checkbox" name="field_1_enable" id="field_1_enable" value="1" /> Field 1</legend>
>                                             [% END %]
>                                             <div id="field_1_select" style="display: none;">
>+                                            <ol>
>                                             <li>
>                                                 <label for="field_1_text">Text: </label>
>                                                 <input type="text" name="field_1_text" id="field_1_text" size="60" value="[% field_1_text |html %]" />
>@@ -222,6 +226,7 @@
>                                                 <label for="field_1_lly">Lower left Y coordinate: </label>
>                                                 <input type="text" name="field_1_lly" id="field_1_lly" size="2" value="[% field_1_lly |html %]" />
>                                             </li>
>+                                            </ol>
>                                             </div>
>                                             </fieldset>
>                                         </li>
>@@ -233,6 +238,7 @@
>                                             <legend><input type="checkbox" name="field_2_enable" id="field_2_enable" value="1" /> Field 2</legend>
>                                             [% END %]
>                                             <div id="field_2_select" style="display: none;">
>+                                            <ol>
>                                             <li>
>                                                 <label for="field_2_text">Text: </label>
>                                                 <input type="text" name="field_2_text" id="field_2_text" size="60" value="[% field_2_text |html %]" />
>@@ -274,6 +280,7 @@
>                                                 <label for="field_2_lly">Lower left Y coordinate: </label>
>                                                 <input type="text" name="field_2_lly" id="field_2_lly" size="2" value="[% field_2_lly |html %]" />
>                                             </li>
>+                                            </ol>
>                                             </div>
>                                             </fieldset>
>                                         </li>
>@@ -285,6 +292,7 @@
>                                             <legend><input type="checkbox" name="field_3_enable" id="field_3_enable" value="0" /> Field 3</legend>
>                                             [% END %]
>                                             <div id="field_3_select" style="display: none;">
>+                                            <ol>
>                                             <li>
>                                                 <label for="field_3_text">Text: </label>
>                                                 <input type="text" name="field_3_text" id="field_3_text" size="60" value="[% field_3_text |html %]" />
>@@ -326,13 +334,11 @@
>                                                 <label for="field_3_lly">Lower left Y coordinate: </label>
>                                                 <input type="text" name="field_3_lly" id="field_3_lly" size="2" value="[% field_3_lly |html %]" />
>                                             </li>
>+                                            </ol>
>                                             </div>
>                                             </fieldset>
>                                         </li>
>-                                    </fieldset>
>-                                </li>
>-                                    </fieldset>
>-                                </li>
>+                                    </ol>
>                                     </fieldset>
>                                 </li>
>                             </ol>
>@@ -357,6 +363,7 @@
>                         <li>
>                             <fieldset>
>                                 <legend>Barcode</legend>
>+                                <ol>
>                                 <li>
>                                     <label for="barcode_print">Print card number as barcode: </label>
>                                     [% IF ( barcode_print ) %]
>@@ -365,7 +372,9 @@
>                                     <input type="checkbox" name="barcode_print" id="barcode_print" value="1" />
>                                     [% END %]
>                                 </li>
>+                                </ol>
>                                 <div id="barcode_param" style="display: none;">
>+                                <ol>
>                                 <li>
>                                     <label for="barcode_llx">Lower left X coordinate: </label>
>                                     <input type="text" name="barcode_llx" id="barcode_llx" size="2" value="[% barcode_llx |html %]" />
>@@ -394,15 +403,18 @@
>                                     <input type="checkbox" name="barcode_text_print" id="barcode_text_print" value="1" />
>                                     [% END %]
>                                 </li>
>+                                </ol>
>                                 </div>
>                             </fieldset>
>                         </li>
>                         <li>
>                             <fieldset>
>                             <legend>Images</legend>
>+                                <ol>
>                                 <li>
>                                     <fieldset>
>                                     <legend>Image 1</legend>
>+                                    <ol>
>                                     <li>
>                                         <label for="image_1_image_source">Image source: </label>
>                                         <select name="image_1_image_source" id="image_1_image_source">
>@@ -415,7 +427,9 @@
>                                             [% END %]
>                                         </select>
>                                     </li>
>+                                    </ol>
>                                     <div id="image_1_image_name" style="display: none;">
>+                                    <ol>
>                                     <li>
>                                         <label for="image_1_image_name">Image: </label>
>                                         <select name="image_1_image_name" id="image_1_image_name">
>@@ -428,8 +442,10 @@
>                                             [% END %]
>                                         </select>
>                                     </li>
>+                                    </ol>
>                                     </div>
>                                     <div id="image_1_image_metrics" style="display: none;">
>+                                    <ol>
>                                     <li>
>                                         <label for="image_1_Dx">Display height: </label>
>                                         <input type="text" name="image_1_Dx" id="image_1_Dx" size="2" value="[% image_1_Dx |html %]" />
>@@ -442,6 +458,7 @@
>                                         <label for="image_1_Ty">Lower left Y coordinate: </label>
>                                         <input type="text" name="image_1_Ty" id="image_1_Ty" size="2" value="[% image_1_Ty |html %]" />
>                                     </li>
>+                                    </ol>
>                                     </div>
>                                     
>                                     <input type="hidden" name="image_1_Ox" value="0" />
>@@ -453,6 +470,7 @@
>                                 <li>
>                                     <fieldset>
>                                     <legend>Image 2</legend>
>+                                    <ol>
>                                     <li>
>                                         <label for="image_2_image_source">Image source: </label>
>                                         <select name="image_2_image_source" id="image_2_image_source">
>@@ -465,7 +483,9 @@
>                                             [% END %]
>                                         </select>
>                                     </li>
>+                                    </ol>
>                                     <div id="image_2_image_name" style="display: none;">
>+                                    <ol>
>                                     <li>
>                                         <label for="image_2_image_name">Image: </label>
>                                         <select name="image_2_image_name" id="image_2_image_name">
>@@ -478,8 +498,10 @@
>                                             [% END %]
>                                         </select>
>                                     </li>
>+                                    </ol>
>                                     </div>
>                                     <div id="image_2_image_metrics" style="display: none;">
>+                                    <ol>
>                                     <li>
>                                         <label for="image_2_Dx">Display height: </label>
>                                         <input type="text" name="image_2_Dx" id="image_2_Dx" size="2" value="[% image_2_Dx |html %]" />
>@@ -492,6 +514,7 @@
>                                         <label for="image_2_Ty">Lower left Y coordinate: </label>
>                                         <input type="text" name="image_2_Ty" id="image_2_Ty" size="2" value="[% image_2_Ty |html %]" />
>                                     </li>
>+                                    </ol>
>                                     </div>
>                                     
>                                     <input type="hidden" name="image_2_Ox" value="0" />
>@@ -500,6 +523,7 @@
>                                     <input type="hidden" name="image_2_Sy" value="0" />
>                                     </fieldset>
>                                 </li>
>+                                </ol>
>                             </fieldset>
>                         </li>
>                     </ol>
>-- 
>1.7.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 9603: 15287 | 15305 | 20519 | 20627 | 20672