From 49b75a201bbac298af9d9fbd31aa386891aab914 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 10 Jun 2025 14:08:24 +0000 Subject: [PATCH] Bug 34563: (follow-up) Change name of customization Based on feedback on Bug 34561, this patch renames the HTML customization from IntranetCirculationHomeHTML to StaffCirculationHomeHTML. It also removes the "page-section" class from the display of the custom content. Sponsored-by: Athens County Public Libraries --- Koha/AdditionalContents.pm | 6 +++--- ...IntranetCirculationHome-to-additional-contents.pl | 8 ++++---- .../prog/en/includes/html-customization-help.inc | 2 +- .../modules/admin/preferences/staff_interface.pref | 2 +- .../prog/en/modules/circ/circulation-home.tt | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Koha/AdditionalContents.pm b/Koha/AdditionalContents.pm index b3f327dcbbe..4395296d973 100644 --- a/Koha/AdditionalContents.pm +++ b/Koha/AdditionalContents.pm @@ -176,9 +176,9 @@ sub get_html_customizations_options { if ( $interface eq 'staff' ) { return [ - 'IntranetCirculationHomeHTML', 'IntranetmainUserblock', 'StaffReportsHome', 'RoutingListNote', - 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', - 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' + 'StaffCirculationHomeHTML', 'IntranetmainUserblock', 'StaffReportsHome', 'RoutingListNote', + 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', + 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ]; } diff --git a/installer/data/mysql/atomicupdate/bug-34563-move-IntranetCirculationHome-to-additional-contents.pl b/installer/data/mysql/atomicupdate/bug-34563-move-IntranetCirculationHome-to-additional-contents.pl index 0e9a6d8b0f0..2ca909e5307 100755 --- a/installer/data/mysql/atomicupdate/bug-34563-move-IntranetCirculationHome-to-additional-contents.pl +++ b/installer/data/mysql/atomicupdate/bug-34563-move-IntranetCirculationHome-to-additional-contents.pl @@ -16,20 +16,20 @@ return { if ($intranetcirculationhomehtml) { $dbh->do( - "INSERT INTO additional_contents ( category, code, location, branchcode, published_on ) VALUES ('html_customizations', 'IntranetCirculationHomeHTML', 'IntranetCirculationHomeHTML', NULL, CAST(NOW() AS date) )" + "INSERT INTO additional_contents ( category, code, location, branchcode, published_on ) VALUES ('html_customizations', 'StaffCirculationHomeHTML', 'StaffCirculationHomeHTML', NULL, CAST(NOW() AS date) )" ); my ($insert_id) = $dbh->selectrow_array( - "SELECT id FROM additional_contents WHERE category = 'html_customizations' AND code = 'IntranetCirculationHomeHTML' AND location = 'IntranetCirculationHomeHTML' LIMIT 1", + "SELECT id FROM additional_contents WHERE category = 'html_customizations' AND code = 'StaffCirculationHomeHTML' AND location = 'StaffCirculationHomeHTML' LIMIT 1", {} ); $dbh->do( - "INSERT INTO additional_contents_localizations ( additional_content_id, title, content, lang ) VALUES ( ?, 'IntranetCirculationHomeHTML default', ?, 'default' )", + "INSERT INTO additional_contents_localizations ( additional_content_id, title, content, lang ) VALUES ( ?, 'StaffCirculationHomeHTML default', ?, 'default' )", undef, $insert_id, $intranetcirculationhomehtml ); - say $out "Added 'IntranetCirculationHomeHTML' HTML customization"; + say $out "Added 'StaffCirculationHomeHTML' HTML customization"; } # Remove old system preference diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc index 3fae5344fe9..c850fd5feb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc @@ -14,7 +14,7 @@ Adding content to this region will enable the copyright clearance stage in request creation. The content will appear on the OPAC during the process of placing an ILL request. -
Include this content in its own section on the circulation home page
+
Include this content in its own section on the circulation home page
Include this content in its own section on the main page of the staff interface
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref index 82a90da0464..b5a1567691c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref @@ -222,4 +222,4 @@ Staff interface: "enforced": Enforce "enabled": Enable "disabled": "Don't enable" - - two-factor authentication (2FA) for staff members. \ No newline at end of file + - two-factor authentication (2FA) for staff members. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 1f87b055134..eb24f0e2a4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -183,24 +183,24 @@ - [% SET IntranetCirculationHomeHTML = AdditionalContents.get( location => "IntranetCirculationHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %] + [% SET StaffCirculationHomeHTML = AdditionalContents.get( location => "StaffCirculationHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %] - [% IF ( IntranetCirculationHomeHTML.content && IntranetCirculationHomeHTML.content.count > 0 ) %] + [% IF ( StaffCirculationHomeHTML.content && StaffCirculationHomeHTML.content.count > 0 ) %]
-
- [% FOREACH n IN IntranetCirculationHomeHTML.content %] +
+ [% FOREACH n IN StaffCirculationHomeHTML.content %]
[% n.content | $raw %]
[% END %]
- +
- [% END # /IF IntranetCirculationHomeHTML %] + [% END # /IF StaffCirculationHomeHTML %]
-- 2.39.5