From cf50fc91670db81c45983e597a788a0e0290a915 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 15 Aug 2023 16:36:27 +0100 Subject: [PATCH] Bug 6419: Add StaffListsHome block to additional contents This patch adds a new `StaffListsHome` block to the HTML Customisations options. This allows for the addition of a block of content in a page-section at the bottom of the lists home page. NOTE: This one may highlight an issue with Panels directly followed by page-sections. Signed-off-by: Caroline Cyr La Rose Signed-off-by: Lucas Gass Signed-off-by: Tomas Cohen Arazi --- ...9_Add_customizable_areas_to_module_start_pages.sql | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 1 - .../en/modules/admin/preferences/staff_interface.pref | 6 ------ .../prog/en/modules/tools/additional-contents.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 11 +++++++---- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_6419_Add_customizable_areas_to_module_start_pages.sql b/installer/data/mysql/atomicupdate/bug_6419_Add_customizable_areas_to_module_start_pages.sql index 259b6506e4..71ce17f175 100644 --- a/installer/data/mysql/atomicupdate/bug_6419_Add_customizable_areas_to_module_start_pages.sql +++ b/installer/data/mysql/atomicupdate/bug_6419_Add_customizable_areas_to_module_start_pages.sql @@ -2,7 +2,7 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { # you can use $dbh here like: $dbh->do(q{ -INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('IntranetListsHomeHTML', '', 'Show the following HTML in a div on the bottom of the lists home page', NULL, 'Free'), ('IntranetPatronsHomeHTML', '', 'Show the following HTML in a div on the bottom of the patrons home page', NULL, 'Free'), ('IntranetPOSHomeHTML', '', 'Show the following HTML in a div on the bottom of the point of sale home page', NULL, 'Free'), ('IntranetSerialsHomeHTML', '', 'Show the following HTML in a div on the bottom of the serials home page', NULL, 'Free')}); +INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('IntranetPatronsHomeHTML', '', 'Show the following HTML in a div on the bottom of the patrons home page', NULL, 'Free'), ('IntranetPOSHomeHTML', '', 'Show the following HTML in a div on the bottom of the point of sale home page', NULL, 'Free'), ('IntranetSerialsHomeHTML', '', 'Show the following HTML in a div on the bottom of the serials home page', NULL, 'Free')}); SetVersion( $DBversion ); print "Upgrade to $DBversion done (Bug 6419 - Add customizable areas to intranet start pages)\n"; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 6256dece46..1a4fa5cc63 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -317,7 +317,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff interface', 'YesNo'), ('intranetcolorstylesheet','','50','Define the color stylesheet to use in the staff interface','free'), ('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the staff interface','free'), -('IntranetListsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the lists home page', 'Free'), ('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'), ('IntranetNav','','70|10','Use HTML tabs to add navigational links to the top-hand navigational bar in the staff interface','Textarea'), ('IntranetNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number staff interface searches','YesNo'), 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 5a92a6eef9..1e3741a3ee 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 @@ -113,12 +113,6 @@ Staff interface: type: textarea syntax: text/html class: code - - - - "Show the following HTML in its own div on the bottom of the home page of the lists module:" - - pref: IntranetListsHomeHTML - type: textarea - syntax: text/html - class: code - - "Show the following HTML in its own div on the bottom of the home page of the patrons module:" - pref: IntranetPatronsHomeHTML 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 1bf9e69634..d098095715 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 @@ -523,7 +523,7 @@ [% END %] [% END %] [% ELSE %] - [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'CookieConsentBar', 'CookieConsentPopup', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome' ] %] + [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'CookieConsentBar', 'CookieConsentPopup', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome' ] %] [% FOREACH l IN available_options.sort %] [% IF l == location %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 3a4538a9c6..0cffa3c089 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -1,4 +1,5 @@ [% USE raw %] +[% USE AdditionalContents %] [% USE Asset %] [% USE Koha %] [% USE KohaDates %] @@ -537,6 +538,12 @@ [% END # /WRAPPER tab_panels %] [% END # /WRAPPER tabs %] + [%- SET StaffListsHome = AdditionalContents.get( location => "StaffListsHome", lang => lang, library => logged_in_user.branchcode ) -%] + [%- FOREACH block IN StaffListsHome.content -%] +
+ [%- block.content | $raw -%] +
+ [%- END -%] [% END # /IF op == 'list' %]
@@ -547,10 +554,6 @@ -
- [% Koha.Preference('IntranetListsHomeHTML') | $raw %] -
- [% IF ( can_add_biblios ) %]