@@ -, +, @@
OpacAdditionalStylesheet
---
C4/Auth.pm | 4 ++--
C4/Templates.pm | 4 ++--
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 10 ++++++++++
.../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 8 ++++----
6 files changed, 20 insertions(+), 10 deletions(-)
--- a/C4/Auth.pm
+++ a/C4/Auth.pm
@@ -459,7 +459,7 @@ sub get_template_and_user {
$opac_base_url = $ENV{'SERVER_NAME'} . ( $ENV{'SERVER_PORT'} eq ( $using_https ? "443" : "80" ) ? '' : ":$ENV{'SERVER_PORT'}" );
}
$template->param(
- opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
+ OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"),
BranchesLoop => GetBranchesLoop($opac_name),
@@ -1156,7 +1156,7 @@ sub checkauth {
my $template = C4::Templates::gettemplate( $template_name, $type, $query );
$template->param(
branchloop => GetBranchesLoop(),
- opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
+ OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
login => 1,
INPUTS => \@inputs,
--- a/C4/Templates.pm
+++ a/C4/Templates.pm
@@ -106,8 +106,8 @@ sub output {
$vars->{interface} =
( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
$vars->{theme} = $self->theme;
- $vars->{opaccolorstylesheet} =
- C4::Context->preference('opaccolorstylesheet');
+ $vars->{OpacAdditionalStylesheet} =
+ C4::Context->preference('OpacAdditionalStylesheet');
$vars->{opaclayoutstylesheet} =
C4::Context->preference('opaclayoutstylesheet');
--- a/installer/data/mysql/sysprefs.sql
+++ a/installer/data/mysql/sysprefs.sql
@@ -245,7 +245,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('OpacBrowser','0',NULL,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/sbuild_browser_and_cloud.pl)','YesNo'),
('OpacBrowseResults','1',NULL,'Disable/enable browsing and paging search results from the OPAC detail page.','YesNo'),
('OpacCloud','0',NULL,'If ON, enables subject cloud on OPAC','YesNo'),
-('opaccolorstylesheet','','','Define an auxiliary stylesheet for OPAC use, to override specified settings from the primary opac.css stylesheet. Enter the filename (if the file is in the server\'s css directory) or a complete URL beginning with http (if the file lives on a remote server).','free'),
+('OpacAdditionalStylesheet','','','Define an auxiliary stylesheet for OPAC use, to override specified settings from the primary opac.css stylesheet. Enter the filename (if the file is in the server\'s css directory) or a complete URL beginning with http (if the file lives on a remote server).','free'),
('OpacCustomSearch','','70|10','Replace the search box on the OPAC with the provided HTML','Textarea'),
('opaccredits','','70|10','Define HTML Credits at the bottom of the OPAC page','Textarea'),
('OPACdefaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -9793,6 +9793,16 @@ if(CheckVersion($DBversion)) {
SetVersion($DBversion);
}
+$DBversion = "3.19.00.XXX";
+if ( CheckVersion($DBversion) ) {
+ $dbh->do(q|
+ UPDATE systempreferences set variable="OpacAdditionalStylesheet" WHERE variable="opaccolorstylesheet"
+ |);
+ print "Upgrade to $DBversion done (Bug 10328: Rename opaccolorstylesheet to OpacAdditionalStylesheet\n";
+ SetVersion ($DBversion);
+}
+
+
=head1 FUNCTIONS
=head2 TableExists($table)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -187,7 +187,7 @@ OPAC:
class: code
-
- Include the additional CSS stylesheet
- - pref: opaccolorstylesheet
+ - pref: OpacAdditionalStylesheet
class: file
- to override specified settings from the default stylesheet (leave blank to disable). Enter just a filename, a full local path or a complete URL starting with http:// (if the file lives on a remote server). Please note that if you just enter a filename, the file should be in the css subdirectory for each active theme and language within the Koha templates directory. A full local path is expected to start from your HTTP document root.
-
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -21,11 +21,11 @@
[% ELSE %]
[% END %]
-[% IF ( opaccolorstylesheet ) %]
- [% IF (opaccolorstylesheet.match('^https?:|^\/')) %]
-
+[% IF ( OpacAdditionalStylesheet ) %]
+ [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %]
+
[% ELSE %]
-
+
[% END %]
[% END %]
[% IF ( opac_css_override ) %]
--