Bugzilla – Attachment 18377 Details for
Bug 10328
Rename opaccolorstylesheet to OpacAdditionalStyleSheet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10328 - Rename opaccolorstylesheet to OpacColorStyleSheet
Bug-10328---Rename-opaccolorstylesheet-to-OpacColo.patch (text/plain), 8.56 KB, created by
Kyle M Hall (khall)
on 2013-05-24 11:36:30 UTC
(
hide
)
Description:
Bug 10328 - Rename opaccolorstylesheet to OpacColorStyleSheet
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-05-24 11:36:30 UTC
Size:
8.56 KB
patch
obsolete
>From 56595138e5add7ca5ebb12acef34d4b6862672ec Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 24 May 2013 07:35:20 -0400 >Subject: [PATCH] Bug 10328 - Rename opaccolorstylesheet to OpacColorStyleSheet > >Test Plan: >1) Apply this patch >2) Run updatedatabase.pl >3) Verify the system pref OpacColorStyleSheet still works > i.e. no change should be noted >--- > C4/Auth.pm | 4 ++-- > C4/Templates.pm | 4 ++-- > installer/data/mysql/sysprefs.sql | 2 +- > installer/data/mysql/updatedatabase.pl | 7 +++++++ > .../prog/en/modules/admin/preferences/opac.pref | 2 +- > .../opac-tmpl/ccsr/en/includes/doc-head-close.inc | 8 ++++---- > .../opac-tmpl/prog/en/includes/doc-head-close.inc | 8 ++++---- > 7 files changed, 21 insertions(+), 14 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 9dba387..0923233 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -386,7 +386,7 @@ sub get_template_and_user { > $opac_name = C4::Context->userenv->{'branch'}; > } > $template->param( >- opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"), >+ OpacColorStyleSheet => C4::Context->preference("OpacColorStyleSheet"), > AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"), > AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"), > BranchesLoop => GetBranchesLoop($opac_name), >@@ -986,7 +986,7 @@ sub checkauth { > my $template = C4::Templates::gettemplate($template_name, $type, $query ); > $template->param( > branchloop => GetBranchesLoop(), >- opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"), >+ OpacColorStyleSheet => C4::Context->preference("OpacColorStyleSheet"), > opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"), > login => 1, > INPUTS => \@inputs, >diff --git a/C4/Templates.pm b/C4/Templates.pm >index 88b9b01..bc328b7 100644 >--- a/C4/Templates.pm >+++ b/C4/Templates.pm >@@ -107,8 +107,8 @@ sub output { > $vars->{interface} = > ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' ); > $vars->{theme} = $self->theme; >- $vars->{opaccolorstylesheet} = >- C4::Context->preference('opaccolorstylesheet'); >+ $vars->{OpacColorStyleSheet} = >+ C4::Context->preference('OpacColorStyleSheet'); > $vars->{opacsmallimage} = C4::Context->preference('opacsmallimage'); > $vars->{opaclayoutstylesheet} = > C4::Context->preference('opaclayoutstylesheet'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 9aabdb1..5907c71 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -67,7 +67,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacBrowser',0,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/sbuild_browser_and_cloud.pl)',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacCloud',0,'If ON, enables subject cloud on OPAC',NULL,'YesNo'); >-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccolorstylesheet','colors.css','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'); >+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacColorStyleSheet','colors.css','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'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccredits','','Define HTML Credits at the bottom of the OPAC page','70|10','Textarea'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacSerialDefaultTab', 'subscriptions', 'Define the default tab for serials in OPAC.', 'holdings|serialcollection|subscriptions', 'Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacheader','','Add HTML to be included as a custom header in the OPAC','70|10','Textarea'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 3134261..bbf1fff 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -6971,6 +6971,13 @@ if(CheckVersion($DBversion)) { > SetVersion ($DBversion); > } > >+$DBversion = "3.13.00.XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do("UPDATE systempreferences SET variable = 'OpacColorStyleSheet' WHERE variable = 'opaccolorstylesheet'"); >+ print "Upgrade to $DBversion done (Bug 10328 - Rename opaccolorstylesheet to OpacColorStyleSheet)\n"; >+ SetVersion ($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index 81824e4..96c2f1f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -159,7 +159,7 @@ OPAC: > class: code > - > - Include the additional CSS stylesheet >- - pref: opaccolorstylesheet >+ - pref: OpacColorStyleSheet > 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 <code>http://</code> (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. > - >diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >index fcbab2a..df648a6 100644 >--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >@@ -11,11 +11,11 @@ > [% ELSE %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" /> > [% END %] >-[% IF ( opaccolorstylesheet ) %] >- [% IF (opaccolorstylesheet.match('^https?:|^\/')) %] >- <link rel="stylesheet" type="text/css" href="[% opaccolorstylesheet %]" /> >+[% IF ( OpacColorStyleSheet ) %] >+ [% IF (OpacColorStyleSheet.match('^https?:|^\/')) %] >+ <link rel="stylesheet" type="text/css" href="[% OpacColorStyleSheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaccolorstylesheet %]" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% OpacColorStyleSheet %]" /> > [% END %] > [% END %] > [% IF ( opac_css_override ) %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc >index 147b82c..5895fe9 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc >@@ -9,11 +9,11 @@ > [% ELSE %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" /> > [% END %] >-[% IF ( opaccolorstylesheet ) %] >- [% IF (opaccolorstylesheet.match('^https?:|^\/')) %] >- <link rel="stylesheet" type="text/css" href="[% opaccolorstylesheet %]" /> >+[% IF ( OpacColorStyleSheet ) %] >+ [% IF (OpacColorStyleSheet.match('^https?:|^\/')) %] >+ <link rel="stylesheet" type="text/css" href="[% OpacColorStyleSheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaccolorstylesheet %]" /> >+ <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% OpacColorStyleSheet %]" /> > [% END %] > [% END %] > [% IF ( opac_css_override ) %] >-- >1.7.2.5
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 10328
:
18377
|
18719
|
36123
|
36156
|
36172
|
36409