From 4f9c3cf2bcebd844f6c17d4a178f44dc19446df6 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 13 Feb 2013 16:44:40 +1100 Subject: [PATCH] [SIGNED-OFF] Bug 9603 - Fix layout of Patron Card Creator Layout screen for display in IE Content-Type: text/plain; charset="utf-8" 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). 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. This patch also adds stylistic spacing/nesting to the HTML, so that it is easier to visually separate elements when debugging. 99.9% of the mods in this patch are actually just whitespace alterations. 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). Signed-off-by: Owen Leonard I don't like all the whitespace changes in this patch. Making whitespace changes as well as code/markup changes is generally speaking a violation of coding guidelines. However, this is not a frequently-modified template and a diff which ignores whitespace changes shows that the real changes are minor and effective. I'm signing off and correcting the commit message to include a description of the fix and the test plan. --- .../prog/en/modules/patroncards/edit-layout.tt | 682 ++++++++++---------- 1 file changed, 353 insertions(+), 329 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 862a2fa..b0e3a91 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 @@ -151,55 +151,58 @@
-
- [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Patron card text layout -
    -
  1. +
    + [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Patron card text layout +
      +
    1. General settings -
    2. - - -
    3. -
    4. - - -
    5. -
    6. - - [% IF ( page_side ) %] - Front - Back - [% ELSE %] - Front - Back - [% END %] -
    7. -
    8. - - [% IF ( guide_box ) %] - On - Off - [% ELSE %] - On - Off - [% END %] -
    9. +
        +
      1. + + +
      2. +
      3. + + +
      4. +
      5. + + [% IF ( page_side ) %] + Front + Back + [% ELSE %] + Front + Back + [% END %] +
      6. +
      7. + + [% IF ( guide_box ) %] + On + Off + [% ELSE %] + On + Off + [% END %] +
      8. +
      -
    10. -
    11. -
      - Text fields +
    12. +
    13. +
      + Text fields +
      1. [% IF ( field_1 ) %] @@ -207,49 +210,51 @@ [% ELSE %] Field 1 [% END %] - +
      2. @@ -259,49 +264,51 @@ [% ELSE %] Field 2 [% END %] -
      3. - - -
      4. -
      5. - - -
      6. -
      7. - - - pt -
      8. -
      9. - - -
      10. -
      11. - - -
      12. -
      13. - - -
      14. -
+
  • @@ -311,64 +318,63 @@ [% ELSE %] Field 3 [% END %] -
  • - - -
  • -
  • - - -
  • -
  • - - - pt -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
    + - - - - - - - - + + + + +
    [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Patron card graphic layout -
      +
        -
      1. -
        +
      2. +
        Barcode -
      3. - - [% IF ( barcode_print ) %] - - [% ELSE %] - - [% END %] -
      4. - -
        -
      5. -
      6. -
        - Images -
      7. -
        - Image 1 -
      8. - - -
      9. - - - - - - - -
        -
      10. -
      11. -
        - Image 2 -
      12. - - -
      13. - -
      14. +
      + - - - - - -
    - - - - + + +
  • +
    + Images +
      +
    1. +
      + Image 1 +
        +
      1. + + +
      2. +
      + + + + + + + +
      +
    2. +
    3. +
      + Image 2 +
        +
      1. + + +
      2. +
      + + + + + + + +
      +
    4. +
    +
    +
  • +
    -- 1.7.9.5