From 7479d719fcb4b038c41c5e9bd20ba1c0d9781e12 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 1 Feb 2023 11:59:53 +0000 Subject: [PATCH] Bug 32954: Standardize action fieldsets in rotating collections, suggestions, tools As per Bug 32744: Fieldsets with the class "action" should be placed outside of the fieldset containing the main body of the form. This report covers a few templates in rotating collections, suggestions, and tools. To test, apply the patch and check the following pages to confirm that changes to form structure look correct: - Tools -> Rotating collections. Create a collection if necessary, then click "Action" -> "Manage items." Check the form on the manage items page. - Suggestions -> Sidebar filter. Check that different sets of filters expand and collapse correctly. - Tools -> Batch item modification (initial form) - Tools -> Inventory (initial form) - Cataloging -> Stage records for import (initial form) - Tools -> Upload (upload and search forms) Signed-off-by: Matt Blenkinsop Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 508ad15cb789b4b190f8172fcf58265b8a957a66) Signed-off-by: Matt Blenkinsop --- .../modules/rotating_collections/addItems.tt | 10 +-- .../prog/en/modules/suggestion/suggestion.tt | 79 +++++++++++-------- .../prog/en/modules/tools/batchMod.tt | 4 +- .../prog/en/modules/tools/inventory.tt | 2 +- .../en/modules/tools/stage-marc-import.tt | 2 +- .../prog/en/modules/tools/upload.tt | 6 +- 6 files changed, 58 insertions(+), 45 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt index 68fb2048b7..30520c3c82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -103,11 +103,11 @@ [% END %] -

- - - -

+ +
+ + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 0a502e7788..f516c5f9a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -31,7 +31,8 @@ font-size: 80%; text-decoration: none; } - #limits fieldset.brief { + #limits fieldset.brief, + #limits fieldset.action { display: none; } .overlay { @@ -644,9 +645,8 @@ - -
+ [% IF ( suggestionid ) %] [% IF ( need_confirm ) %] @@ -948,13 +948,13 @@ -
- -
+
+
+
-
+
+
+
@@ -976,9 +976,9 @@ -
- -
+ +
+
@@ -987,9 +987,9 @@ Delete selected -
- -
+ +
+
@@ -1058,17 +1058,17 @@ -
- -
+
+ +

Filter by: [clear]

Bibliographic information

-
+
  1. @@ -1095,13 +1095,13 @@
-
- -
-
+
+
+ +

Suggestion information

-
+
  1. @@ -1219,15 +1219,15 @@
-
- -
+
+ +

Acquisition information

-
+
  1. @@ -1248,10 +1248,23 @@
-
- -
+
+ +
+ +
+
    +
  1. + + [% IF filter_archived %] + + [% ELSE %] + + [% END %] +
  2. +
+
@@ -1409,7 +1422,7 @@ $("h4.local_collapse a").on("click", function(e){ e.preventDefault(); const target = $(this).data("target"); - $("#" + target).toggle(); + $("." + target).toggle(); }); // Note: the selector below passes a second 'context' param - it is not a multiple selector diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt index fc37f49172..3bca0ad225 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt @@ -63,8 +63,8 @@ + - [% UNLESS del %]
@@ -79,8 +79,8 @@
[% END %] - [% IF ( del ) %][% END %]
+ [% IF ( del ) %][% END %] Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index 1571f6a3ee..3209c016f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -235,8 +235,8 @@ - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt index dfb1d05fe7..0fe36f2ba4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt @@ -98,11 +98,11 @@
+
-
Upload progress: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt index 2ee6c6a489..8f4952148f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -99,11 +99,11 @@ [% END %] +
-
Upload progress: @@ -137,10 +137,10 @@ +
- [% END %] [% END %] @@ -157,10 +157,10 @@ +
- [% END %] -- 2.39.5