View | Details | Raw Unified | Return to bug 10328
Collapse All | Expand All

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 386-392 sub get_template_and_user { Link Here
386
            $opac_name = C4::Context->userenv->{'branch'};
386
            $opac_name = C4::Context->userenv->{'branch'};
387
        }
387
        }
388
        $template->param(
388
        $template->param(
389
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
389
            OpacColorStyleSheet       => C4::Context->preference("OpacColorStyleSheet"),
390
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
390
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
391
            AuthorisedValueImages     => C4::Context->preference("AuthorisedValueImages"),
391
            AuthorisedValueImages     => C4::Context->preference("AuthorisedValueImages"),
392
            BranchesLoop              => GetBranchesLoop($opac_name),
392
            BranchesLoop              => GetBranchesLoop($opac_name),
Lines 986-992 sub checkauth { Link Here
986
    my $template = C4::Templates::gettemplate($template_name, $type, $query );
986
    my $template = C4::Templates::gettemplate($template_name, $type, $query );
987
    $template->param(
987
    $template->param(
988
        branchloop           => GetBranchesLoop(),
988
        branchloop           => GetBranchesLoop(),
989
        opaccolorstylesheet  => C4::Context->preference("opaccolorstylesheet"),
989
        OpacColorStyleSheet  => C4::Context->preference("OpacColorStyleSheet"),
990
        opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
990
        opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
991
        login                => 1,
991
        login                => 1,
992
        INPUTS               => \@inputs,
992
        INPUTS               => \@inputs,
(-)a/C4/Templates.pm (-2 / +2 lines)
Lines 107-114 sub output { Link Here
107
    $vars->{interface} =
107
    $vars->{interface} =
108
      ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
108
      ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
109
    $vars->{theme} = $self->theme;
109
    $vars->{theme} = $self->theme;
110
    $vars->{opaccolorstylesheet} =
110
    $vars->{OpacColorStyleSheet} =
111
        C4::Context->preference('opaccolorstylesheet');
111
        C4::Context->preference('OpacColorStyleSheet');
112
    $vars->{opacsmallimage} = C4::Context->preference('opacsmallimage');
112
    $vars->{opacsmallimage} = C4::Context->preference('opacsmallimage');
113
    $vars->{opaclayoutstylesheet} =
113
    $vars->{opaclayoutstylesheet} =
114
        C4::Context->preference('opaclayoutstylesheet');
114
        C4::Context->preference('opaclayoutstylesheet');
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 67-73 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
67
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo');
67
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo');
68
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');
68
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');
69
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacCloud',0,'If ON, enables subject cloud on OPAC',NULL,'YesNo');
69
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacCloud',0,'If ON, enables subject cloud on OPAC',NULL,'YesNo');
70
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');
70
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');
71
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccredits','','Define HTML Credits at the bottom of the OPAC page','70|10','Textarea');
71
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccredits','','Define HTML Credits at the bottom of the OPAC page','70|10','Textarea');
72
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacSerialDefaultTab', 'subscriptions', 'Define the default tab for serials in OPAC.', 'holdings|serialcollection|subscriptions', 'Choice');
72
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacSerialDefaultTab', 'subscriptions', 'Define the default tab for serials in OPAC.', 'holdings|serialcollection|subscriptions', 'Choice');
73
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');
73
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');
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 6983-6988 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
6983
    SetVersion($DBversion);
6983
    SetVersion($DBversion);
6984
}
6984
}
6985
6985
6986
$DBversion = "3.13.00.XXX";
6987
if ( CheckVersion($DBversion) ) {
6988
   $dbh->do("UPDATE systempreferences SET variable = 'OpacColorStyleSheet' WHERE variable = 'opaccolorstylesheet'");
6989
   print "Upgrade to $DBversion done (Bug 10328 - Rename opaccolorstylesheet to OpacColorStyleSheet)\n";
6990
   SetVersion ($DBversion);
6991
}
6986
6992
6987
=head1 FUNCTIONS
6993
=head1 FUNCTIONS
6988
6994
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +1 lines)
Lines 159-165 OPAC: Link Here
159
              class: code
159
              class: code
160
        -
160
        -
161
            - Include the additional CSS stylesheet
161
            - Include the additional CSS stylesheet
162
            - pref: opaccolorstylesheet
162
            - pref: OpacColorStyleSheet
163
              class: file
163
              class: file
164
            - 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.
164
            - 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.
165
        -
165
        -
(-)a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc (-4 / +4 lines)
Lines 11-21 Link Here
11
[% ELSE %]
11
[% ELSE %]
12
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" />
12
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" />
13
[% END %]
13
[% END %]
14
[% IF ( opaccolorstylesheet ) %]
14
[% IF ( OpacColorStyleSheet ) %]
15
    [% IF (opaccolorstylesheet.match('^https?:|^\/')) %]
15
    [% IF (OpacColorStyleSheet.match('^https?:|^\/')) %]
16
        <link rel="stylesheet" type="text/css" href="[% opaccolorstylesheet %]" />
16
        <link rel="stylesheet" type="text/css" href="[% OpacColorStyleSheet %]" />
17
    [% ELSE %]
17
    [% ELSE %]
18
        <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaccolorstylesheet %]" />
18
        <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% OpacColorStyleSheet %]" />
19
    [% END %]
19
    [% END %]
20
[% END %]
20
[% END %]
21
[% IF ( opac_css_override ) %]
21
[% IF ( opac_css_override ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc (-5 / +4 lines)
Lines 9-19 Link Here
9
[% ELSE %]
9
[% ELSE %]
10
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" />
10
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" />
11
[% END %]
11
[% END %]
12
[% IF ( opaccolorstylesheet ) %]
12
[% IF ( OpacColorStyleSheet ) %]
13
    [% IF (opaccolorstylesheet.match('^https?:|^\/')) %]
13
    [% IF (OpacColorStyleSheet.match('^https?:|^\/')) %]
14
        <link rel="stylesheet" type="text/css" href="[% opaccolorstylesheet %]" />
14
        <link rel="stylesheet" type="text/css" href="[% OpacColorStyleSheet %]" />
15
    [% ELSE %]
15
    [% ELSE %]
16
        <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaccolorstylesheet %]" />
16
        <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% OpacColorStyleSheet %]" />
17
    [% END %]
17
    [% END %]
18
[% END %]
18
[% END %]
19
[% IF ( opac_css_override ) %]
19
[% IF ( opac_css_override ) %]
20
- 

Return to bug 10328