From fe04bbf462255b176c89508df1e208e95629e20a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 15 Aug 2023 15:41:47 +0100 Subject: [PATCH] Bug 6419: Add StaffAcquisitionsHome block to additional contents This patch adds a new `StaffAcquisitionsHome` 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 acquisitions home page. Signed-off-by: Caroline Cyr La Rose Signed-off-by: Lucas Gass Signed-off-by: Tomas Cohen Arazi --- ..._6419_Add_customizable_areas_to_module_start_pages.sql | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 1 - .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 8 ++++++-- .../en/modules/admin/preferences/staff_interface.pref | 6 ------ .../prog/en/modules/tools/additional-contents.tt | 2 +- 5 files changed, 8 insertions(+), 11 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 6c6e411a7e..6de6dd9802 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 ('IntranetAcquisitionsHomeHTML', '', 'Show the following HTML in a div on the bottom of the acquisitions home page', NULL, 'Free'), ('IntranetAuthoritiesHomeHTML', '', 'Show the following HTML in a div on the bottom of the authorities home page', NULL, 'Free'), ('IntranetCatalogingHomeHTML', '', 'Show the following HTML in a div on the bottom of the cataloging home page', NULL, 'Free'), ('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 ('IntranetAuthoritiesHomeHTML', '', 'Show the following HTML in a div on the bottom of the authorities home page', NULL, 'Free'), ('IntranetCatalogingHomeHTML', '', 'Show the following HTML in a div on the bottom of the cataloging home page', NULL, 'Free'), ('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')}); 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 0e1b055df6..57369bad19 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -307,7 +307,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('IndependentBranchesPatronModifications','0', NULL, 'Show only modification request for the logged in branch','YesNo'), ('IndependentBranchesTransfers','0', NULL, 'Allow non-superlibrarians to transfer items between libraries','YesNo'), ('IntranetAddMastheadLibraryPulldown','0', NULL, 'Add a library select pulldown menu on the staff header search','YesNo'), -('IntranetAcquisitionsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the acquisitions home page', 'Free'), ('IntranetAuthoritiesHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the authorities home page', 'Free'), ('IntranetCatalogingHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the cataloging home page', 'Free'), ('IntranetCatalogSearchPulldown','0', NULL, 'Show a search field pulldown for \"Search the catalog\" boxes','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index e59164d61f..a3a464cd7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -1,4 +1,5 @@ [% USE raw %] +[% USE AdditionalContents %] [% USE Asset %] [% USE Price %] [% USE Branches %] @@ -202,9 +203,12 @@ [% END %] -
- [% Koha.Preference('IntranetAcquisitionsHomeHTML') | $raw %] + [%- SET StaffAcquisitionsHome = AdditionalContents.get( location => "StaffAcquisitionsHome", lang => lang, library => logged_in_user.branchcode ) -%] + [%- FOREACH block IN StaffAcquisitionsHome.content -%] +
+ [%- block.content | $raw -%]
+ [%- END -%]
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 8272f4937e..e3712bfed4 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 @@ -107,12 +107,6 @@ Staff interface: - pref: SlipCSS class: url - on Issue and Hold Slips. (This should be a complete URL, starting with http://.) - - - - "Show the following HTML in its own div on the bottom of the home page of the acquisitions module:" - - pref: IntranetAcquisitionsHomeHTML - type: textarea - syntax: text/html - class: code - - "Show the following HTML in its own div on the bottom of the home page of the authorities module:" - pref: IntranetAuthoritiesHomeHTML 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 76b395dea7..e8d9d5a585 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' ] %] + [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'CookieConsentBar', 'CookieConsentPopup', 'StaffAcquisitionsHome' ] %] [% FOREACH l IN available_options.sort %] [% IF l == location %] -- 2.39.5