From ae842b62ffac71bab5f5225121aabd359e46ece8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 16 Aug 2023 07:40:14 +0100 Subject: [PATCH] Bug 6419: Add StaffPOSHome block to additional contents This patch adds a new `StaffPOSHome` 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 point of sale page. NOTE: All the blocks have been placed at the bottom of the home pages respectively for consistency. However, in this case it doesn't look as clean as the content above is a form. 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 - .../en/modules/admin/preferences/staff_interface.pref | 6 ------ koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 9 +++++++-- .../prog/en/modules/tools/additional-contents.tt | 2 +- 5 files changed, 9 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 9f4db9fedc..daf737c514 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 ('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 ('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 12a12bb2ef..8a45d36f31 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -320,7 +320,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('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'), -('IntranetPOSHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the point of sale home page', 'Free'), ('intranetreadinghistory','1','','If ON, Checkout history is enabled for all patrons','YesNo'), ('IntranetReportsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'), ('IntranetSerialsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the serials home page', 'Free'), 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 e523db2d15..cc3580a23e 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 POS module:" - - pref: IntranetPOSHomeHTML - type: textarea - syntax: text/area - class: code - - "Show the following HTML in its own div on the bottom of the home page of the reports module:" - pref: IntranetReportsHomeHTML diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt index 1d1466c2d0..7194d7a21d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -1,4 +1,5 @@ [% USE raw %] +[% USE AdditionalContents %] [% USE Asset %] [% USE Branches %] [% USE Koha %] @@ -160,9 +161,13 @@ [% END %] -
- [% Koha.Preference('IntranetPOSHomeHTML') | $raw %] + [%- SET StaffPOSHome = AdditionalContents.get( location => "StaffPOSHome", lang => lang, library => logged_in_user.branchcode ) -%] + [%- FOREACH block IN StaffPOSHome.content -%] +
+ [%- block.content | $raw -%]
+ [%- END -%] +
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 6756802ff8..1320fa8d25 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', 'StaffListsHome', 'StaffPatronsHome' ] %] + [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'CookieConsentBar', 'CookieConsentPopup', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffPatronsHome', 'StaffPOSHome' ] %] [% FOREACH l IN available_options.sort %] [% IF l == location %] -- 2.39.5