From 980dd90bb47c1ff82e8827896e3c2c34b42084cf Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 1 Feb 2023 11:59:09 +0000 Subject: [PATCH] Bug 32955: Standardize structure around action fieldsets in various templates This patch updates various templates so that fieldsets with the "action" class are placed outside the form's main fieldset. To test, apply the patch and check the following pages to confirm that changes to form structure look correct: - Cataloging -> Quick spine label creator - Patrons -> Patron details -> Files - Patrons -> Patron details -> Housebound - Circulation -> Upload offline circulation file - Tools -> Patron card creator -> Manage -> Images - Point of sale -> Transaction history -> "Older transactions" form Signed-off-by: Philip Orr Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 790ac29bd37e108a732fc6273a98ff24e2015e68) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/labels/spinelabel-home.tt | 4 +++- .../prog/en/modules/members/files.tt | 4 +++- .../prog/en/modules/members/housebound.tt | 10 +++++----- .../prog/en/modules/offline_circ/process_koc.tt | 4 +++- .../prog/en/modules/patroncards/image-manage.tt | 17 ++++++++--------- .../prog/en/modules/pos/register.tt | 4 ++-- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt index f77d25f339..3b400b0e0c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt @@ -34,8 +34,10 @@ -
+
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt index 94ea31a6a6..0f624093b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -90,7 +90,9 @@
  • -
    + +
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 2b8b61d31c..4f8bea30df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -232,11 +232,11 @@
    - - - Cancel - + + + Cancel +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index cb7154543c..94586b14e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -70,8 +70,10 @@ Required -
    +
    + +
    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 022f80c8f4..b3cf084ab0 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 @@ -58,10 +58,6 @@ -
    - - -
    [% IF ( IMPORT_SUCCESSFUL ) %]

    Image successfully uploaded

    @@ -70,7 +66,10 @@
    [% END %] - +
    + + +
    @@ -118,16 +117,16 @@ [% END %] [% END %] -
    - - -
    [% IF ( DELETE_SUCCESSFULL ) %]

    Image(s) successfully deleted

    [% END %] +
    + + +
    [% ELSE %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt index 776d8b19a4..21c4329512 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -183,10 +183,10 @@
    -
    +
    -
    + [% IF trange_f %] -- 2.39.5