@@ -, +, @@ when OpacMaintenance = on - Enable OpacMaintenance systempreference - Observe the default maintenance message when OPAC is viewed - Edit OpacMaintenanceNotice systempreference, adding custom HTML - Observe the custom HTML appear on the opac - Remove OpacMaintenanceNotice (mindful of orphaned spaces etc.) - Observe the default opac notice appears in the opac - Disable OpacMaintenance - Observce opac is back online If someone else could test this, then I would be fine with marking it signed off. --- .../atomicupdate/Bug_15311-OpacMaintenanceNotice_syspref.sql | 1 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 10 ++++++++++ .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 6 ++++++ koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt | 9 +++++++-- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/Bug_15311-OpacMaintenanceNotice_syspref.sql --- a/installer/data/mysql/atomicupdate/Bug_15311-OpacMaintenanceNotice_syspref.sql +++ a/installer/data/mysql/atomicupdate/Bug_15311-OpacMaintenanceNotice_syspref.sql @@ -0,0 +1, @@ +INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'); --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -299,6 +299,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpacLocationBranchToDisplay','holding','holding|home|both','In the OPAC, under location show which branch for Location in the record details.','Choice'), ('OpacLocationBranchToDisplayShelving','holding','holding|home|both','In the OPAC, display the shelving location under which which column.', 'Choice'), ('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'), +('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'), ('OpacMainUserBlock','Welcome to Koha...\r\n
','70|10','A user-defined block of HTML in the main content area of the opac main page','Textarea'), ('OpacMaxItemsToDisplay','50','','Max items to display at the OPAC on a biblio detail','Integer'), ('OPACMySummaryHTML','','70|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my reading history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'), --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -11721,6 +11721,16 @@ if ( CheckVersion($DBversion) ) { } +$DBversion = "3.23.00.XXX"; +if(CheckVersion($DBversion)) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + VALUES ('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea') + }); + print "Upgrade to $DBversion done (Bug 15311: Let libraries set text to display when OpacMaintenance = on)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -54,6 +54,12 @@ OPAC: no: "Don't show" - "a warning that the OPAC is under maintenance, instead of the OPAC itself. Note: this shows the same warning as when the database needs to be upgraded, but unconditionally." - + - + - "Show the following HTML when OpacMaintenance is enabled:" + - pref: OpacMaintenanceNotice + type: htmlarea + class: code + - - By default, show bib records - pref: BiblioDefaultView choices: --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] @@ -26,8 +27,12 @@
-

System maintenance

-

The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the site administrator

+ [% IF Koha.Preference( 'OpacMaintenanceNotice' ) %] + [% Koha.Preference( 'OpacMaintenanceNotice' ).raw %] + [% ELSE %] +

System Maintenance

+

The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the site administrator

+ [% END %]
--