Bugzilla – Attachment 183150 Details for
Bug 34563
Move IntranetCirculationHomeHTML to HTML customizations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34563: (follow-up) Change name of customization
Bug-34563-follow-up-Change-name-of-customization.patch (text/plain), 6.95 KB, created by
Owen Leonard
on 2025-06-10 23:05:17 UTC
(
hide
)
Description:
Bug 34563: (follow-up) Change name of customization
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-06-10 23:05:17 UTC
Size:
6.95 KB
patch
obsolete
>From f5ef3931c804221decc95f37c027b1d39949f529 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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. > </div> > >-<div id="IntranetCirculationHomeHTML_notes" class="hint customization_note"> Include this content in its own section on the circulation home page</div> >+<div id="StaffCirculationHomeHTML_notes" class="hint customization_note"> Include this content in its own section on the circulation home page</div> > > <div id="IntranetmainUserblock_notes" class="hint customization_note"> Include this content in its own section on the main page of the staff interface </div> > >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 @@ > </div> > </div> > >- [% 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 ) %] > <div class="row"> > <div class="col-sm-12"> >- <div id="[% IntranetCirculationHomeHTML.location | html %]" class="page-section"> >- [% FOREACH n IN IntranetCirculationHomeHTML.content %] >+ <div id="[% StaffCirculationHomeHTML.location | html %]"> >+ [% FOREACH n IN StaffCirculationHomeHTML.content %] > <div class="[% n.lang | html %]_item"> > <div class="[% n.lang | html %]_body">[% n.content | $raw %]</div> > </div> > [% END %] > </div> >- <!-- /#IntranetCirculationHomeHTML --> >+ <!-- /#StaffCirculationHomeHTML --> > </div> > <!-- /.col-sm-12 --> > </div> > <!-- /.row --> >- [% END # /IF IntranetCirculationHomeHTML %] >+ [% END # /IF StaffCirculationHomeHTML %] > > <div class="row" id="offline-circulation"> > <div class="col-md-12"> >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 %] > </optgroup> >- [% 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' ] %] > <optgroup label="Staff interface"> > [% FOREACH l IN staff_available_options.sort %] > [% IF l == location %] >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34563
:
183134
|
183142
| 183150