From 139661a91c6dc5004d58a7ae31a9d174529f7777 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 31 Jan 2023 18:29:01 +0000 Subject: [PATCH] Bug 32769: Standardize structure around action fieldsets in administration This patch updates administration 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 the forms look correct: - Administration -> Keyboard shortcuts -> Audio alerts -> Share content with Mana KB - When the ManaToken system preference is empty, the page should have two forms with updated fieldsets: the form with the "Use Mana KB..." field and a "Configure Mana KB" form. - With a ManaToken defined the second form should be one labeled "Mana KB token." -> Budgets - Click on a budget which has existing funds. - In the page toolbar click Planning -> Plan by libraries. - Check the forms in the sidebar. -> System preferences -> OverDriveAuthName - Follow the link to "OverDrive library authnames table" and check the form on that page. Signed-off-by: Matt Blenkinsop Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 622581e5bfd8c42082bba6ee8a54e3249ea78c5d) Signed-off-by: Jacob O'Mara --- .../en/modules/admin/adveditorshortcuts.tt | 2 +- .../prog/en/modules/admin/aqplan.tt | 14 +++++------ .../prog/en/modules/admin/audio_alerts.tt | 4 ++-- .../prog/en/modules/admin/overdrive.tt | 17 +++++++------ .../prog/en/modules/admin/share_content.tt | 24 +++++++++---------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt index 9af7128fa4..3b27d3c017 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt @@ -64,7 +64,7 @@ [% END %] - +
[% ELSE %]

Enable the advanced cataloging editor ( EnableAdvancedCatalogingEditor system preference) to define keyboard shortcuts

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index a89abe7c61..29992d1436 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -252,10 +252,10 @@ -
- - -
+ +
+ +
[% IF ( budget_lines ) %] @@ -277,13 +277,13 @@ + + +
- - - [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index dc1ef0a9fc..2019ff2830 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -145,9 +145,9 @@ -

+

-

+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt index dd9b47907e..c0f495ade5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -37,10 +37,9 @@

OverDrive library authnames

-
-
- - + + +
@@ -62,11 +61,11 @@ [% END %]
-
- -
- -
+ +
+ +
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt index 29f03081cd..48060ea7e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt @@ -103,10 +103,10 @@ If checked, new subscriptions you create will be automatically shared with Mana KB. -
- - -
+ +
+ +
@@ -127,10 +127,10 @@
Your unique security token used for authentication on Mana KB service (anti spam).
-
- - -
+ +
+ +
[% ELSE %] @@ -147,10 +147,10 @@ -
- - -
+ +
+ +
[% END %] -- 2.39.5