Bugzilla – Attachment 154524 Details for
Bug 6419
Add customizable areas to intranet home pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6419: Add StaffPatronsHome block to additional contents
Bug-6419-Add-StaffPatronsHome-block-to-additional-.patch (text/plain), 7.05 KB, created by
Caroline Cyr La Rose
on 2023-08-17 10:31:23 UTC
(
hide
)
Description:
Bug 6419: Add StaffPatronsHome block to additional contents
Filename:
MIME Type:
Creator:
Caroline Cyr La Rose
Created:
2023-08-17 10:31:23 UTC
Size:
7.05 KB
patch
obsolete
>From c9eda9ef8fa4ac70cd1c4b452421801b95812b9e Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 16 Aug 2023 07:33:01 +0100 >Subject: [PATCH] Bug 6419: Add StaffPatronsHome block to additional contents > >This patch adds a new `StaffPatronsHome` 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 patrons home page. > >NOTE: This one may highlight an issue with Panels directly followed >by page-sections. > >Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> >--- > ...19_Add_customizable_areas_to_module_start_pages.sql | 2 +- > installer/data/mysql/mandatory/sysprefs.sql | 1 - > .../en/modules/admin/preferences/staff_interface.pref | 6 ------ > .../intranet-tmpl/prog/en/modules/members/member.tt | 10 +++++++--- > .../prog/en/modules/tools/additional-contents.tt | 2 +- > 5 files changed, 9 insertions(+), 12 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 71ce17f175f..9f4db9fedcb 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 ('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 ('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 1bea4a4c5f3..b1efdbf3d19 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -315,7 +315,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'), >-('IntranetPatronsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the patrons home page', 'Free'), > ('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'), >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 3b0707248f9..a9337bcbe5d 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 patrons module:" >- - pref: IntranetPatronsHomeHTML >- 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 >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index a5e6589ca0d..6515ddbb1a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -1,4 +1,5 @@ > [% USE raw %] >+[% USE AdditionalContents %] > [% USE Asset %] > [% USE Koha %] > [% USE TablesSettings %] >@@ -110,9 +111,12 @@ > </form> > [% END %] > >- <div class="row" id="intranet-members-home-html"> >- [% Koha.Preference('IntranetPatronsHomeHTML') | $raw %] >- </div> >+ [%- SET StaffPatronsHome = AdditionalContents.get( location => "StaffPatronsHome", lang => lang, library => logged_in_user.branchcode ) -%] >+ [%- FOREACH block IN StaffPatronsHome.content -%] >+ <div class="page-section"> >+ [%- block.content | $raw -%] >+ </div> >+ [%- END -%] > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >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 f6e02856339..d8e8fbeb50a 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 >@@ -494,7 +494,7 @@ > [% END %] > [% END %] > [% ELSE %] >- [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'StaffAcquisitionsHome', 'IntranetAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome' ] %] >+ [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'StaffAcquisitionsHome', 'IntranetAuthoritiesHome', 'IntranetCataloguingHome', 'StaffListsHome', 'StaffPatronsHome' ] %] > [% FOREACH l IN available_options.sort %] > [% IF l == location %] > <option value="[% l | html %]" selected="selected">[% l | html %]</option> >-- >2.34.1
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 6419
:
105255
|
108633
|
137787
|
137822
|
139501
|
154433
|
154434
|
154435
|
154436
|
154437
|
154441
|
154442
|
154443
|
154444
|
154445
|
154446
|
154447
|
154448
|
154449
|
154450
|
154451
|
154452
|
154519
|
154520
|
154521
|
154522
|
154523
|
154524
|
154525
|
154526
|
154527
|
155808
|
155809
|
155810
|
155811
|
155812
|
155813
|
155814
|
155815
|
155816
|
155839
|
155840
|
155841
|
155842
|
155843
|
155844
|
155845
|
155846
|
155847