From 23665e562e9b7d9e5c27cb2cab8fa8fc59f54071 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 7 Jan 2019 13:48:55 +0000 Subject: [PATCH] Bug 21089: Overlapping elements in ordering information on acqui/supplier.pl This patch changes the HTML structure of the vendor edit page so that the markup is a little simpler. CSS is modified to match. This structure should serve as a model for other similar form structures:
To test, apply the patch and regenerate the staff client CSS. - Go to Acquisitions -> Vendor search -> Vendor -> Edit vendor - In the "Ordering information" section, confirm that the position of radio buttons looks correct. - Confirm that radio button labels work correctly. - Confirm that the adjacent dropdown menus work well. Signed-off-by: David Cook Signed-off-by: Nick Clemens (cherry picked from commit 5c547ffff2ca04a87695a57e972171cd76cc828c) Signed-off-by: Martin Renvoize --- .../prog/css/src/staff-global.scss | 7 ++ .../prog/en/modules/acqui/supplier.tt | 110 +++++++++++------- 2 files changed, 75 insertions(+), 42 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index e17071b33e..a9eab91269 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1049,6 +1049,13 @@ fieldset { margin-left: 1em; } + &.radio { + display: inline-block; + margin: 0 1em 0 0; + padding: 0; + width: auto; + } + &.yesno { float: none; width: auto; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index c6db1925fe..4ceed6af0c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -159,16 +159,22 @@
Ordering information -
  1. +
    1. [% IF ( active ) %] - - + + [% ELSE %] - - + + [% END %]
    2. -
    -
    1. -
    -
      -
    1. +
    2. [% IF ( gstreg ) %] - - + + [% ELSE %] - - + + [% END %]
    3. - -
    4. + +
    5. [% IF ( listincgst ) %] - - + + [% ELSE %] - - + + [% END %]
    6. - -
    7. + +
    8. [% IF ( invoiceincgst ) %] - - + + [% ELSE %] - - + + [% END %]
    9. -
    + [% IF gst_values %] -
      -
    1. - - + [% FOREACH gst IN gst_values %] + [% IF ( tax_rate == gst.option ) %] + + [% ELSE %] + [% END %] - -
    2. -
    + [% END %] + +
  2. [% ELSE %] [% END %] -
    1. %
    2. @@ -246,7 +271,8 @@ days
    3. -
    + +
[% IF ( booksellerid ) %] [% ELSE %] -- 2.39.5