From f5ef3931c804221decc95f37c027b1d39949f529 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 --- ...IntranetCirculationHome-to-additional-contents.pl | 8 ++++---- .../prog/en/includes/html-customization-help.inc | 2 +- .../prog/en/modules/circ/circulation-home.tt | 12 ++++++------ .../prog/en/modules/tools/additional-contents.tt | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) 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 6a999d3059d..2f33cd9c784 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/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index e20c00cc126..565562d99d0 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 @@ -181,24 +181,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 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt index 732432bc921..47f88e8cc0f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -542,7 +542,7 @@ [% END %] [% END %] - [% SET staff_available_options = [ 'IntranetCirculationHomeHTML', 'IntranetmainUserblock', 'RoutingListNote', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ] %] + [% SET staff_available_options = [ 'StaffCirculationHomeHTML', 'IntranetmainUserblock', 'RoutingListNote', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ] %] [% FOREACH l IN staff_available_options.sort %] [% IF l == location %] -- 2.39.5