From ea65285e17d70f4bfdec7c6539f1bfec00b972cc Mon Sep 17 00:00:00 2001 From: David Cook 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 @@
  • General settings +
    1. @@ -168,11 +169,13 @@ Off [% END %]
    2. +
  • Text fields +
    1. [% IF ( field_1 ) %] @@ -181,6 +184,7 @@ Field 1 [% END %]
    2. @@ -233,6 +238,7 @@ Field 2 [% END %]
  • @@ -285,6 +292,7 @@ Field 3 [% END %] - - - - + @@ -357,6 +363,7 @@
  • Barcode +
    1. [% IF ( barcode_print ) %] @@ -365,7 +372,9 @@ [% END %]
    2. +
  • Images +
    1. Image 1 +
      1. +
      @@ -453,6 +470,7 @@
    2. Image 2 +
      1. +
      @@ -500,6 +523,7 @@
    3. +
  • -- 1.7.7.4