From 55f1df9472d33afb41d0fc7a9262d293377b1e6f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Dec 2019 23:42:28 +0000 Subject: [PATCH] Bug 10469: Display more when editing subfields in frameworks This patch removes the accordion feature from the MARC subfields structure editor. The form is not long, and I think in this case the accordion makes the process more difficult to navigate. To test, apply the patch and go to Administration -> MARC frameworks -> Framework structure -> Subfield structure -> Edit. Choose a tag with multiple subfields to best test the changes. The whole form should apppear, and tabs functionality should work correctly. Test that making changes under multiple tabs works correctly. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit a7fecfd8274a72ac268dd8b4e631b6976f06a4d2) Signed-off-by: Lucas Gass --- .../en/modules/admin/marc_subfields_structure.tt | 14 ++++++++------ .../prog/js/marc_subfields_structure.js | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index f4d0fefcec..09991e99f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -5,6 +5,7 @@ Koha › Administration ›[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure › Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure › [% action | html %][% END %][% END %] [% IF ( delete_confirm ) %] MARC subfield structure › Confirm deletion of subfield [% tagsubfield | html %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure › Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %] [% INCLUDE 'doc-head-close.inc' %] + @@ -60,9 +61,9 @@ [% FOREACH loo IN loop %]
-

Basic constraints

-
+
+ Basic constraints
    [% IF ( subfieldcode == 0 || subfieldcode ) %]
  1. Subfield code: [% loo.subfieldcode | html %]
    2. @@ -114,9 +115,9 @@
-

Advanced constraints

-
+
+ Advanced constraints
  2. (see online help)
    3. @@ -161,9 +162,10 @@
-

Other options (choose one)

-
+ +
+ Other options (choose one)
  1. diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js index 197c04ce32..1f1cc909e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js +++ b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js @@ -1,5 +1,4 @@ $(document).ready(function() { - $( ".constraints" ).accordion(); $('#subfieldtabs').tabs(); $("input[id^='hidden_']").click(setHiddenValue); $("input[id^='hidden-']").each(function() { -- 2.39.5