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

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 459-465 sub get_template_and_user { Link Here
459
            $opac_base_url = $ENV{'SERVER_NAME'} . ( $ENV{'SERVER_PORT'} eq ( $using_https ? "443" : "80" ) ? '' : ":$ENV{'SERVER_PORT'}" );
459
            $opac_base_url = $ENV{'SERVER_NAME'} . ( $ENV{'SERVER_PORT'} eq ( $using_https ? "443" : "80" ) ? '' : ":$ENV{'SERVER_PORT'}" );
460
        }
460
        }
461
        $template->param(
461
        $template->param(
462
            opaccolorstylesheet                   => C4::Context->preference("opaccolorstylesheet"),
462
            OpacAdditionalStylesheet                   => C4::Context->preference("OpacAdditionalStylesheet"),
463
            AnonSuggestions                       => "" . C4::Context->preference("AnonSuggestions"),
463
            AnonSuggestions                       => "" . C4::Context->preference("AnonSuggestions"),
464
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
464
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
465
            BranchesLoop                          => GetBranchesLoop($opac_name),
465
            BranchesLoop                          => GetBranchesLoop($opac_name),
Lines 1156-1162 sub checkauth { Link Here
1156
    my $template = C4::Templates::gettemplate( $template_name, $type, $query );
1156
    my $template = C4::Templates::gettemplate( $template_name, $type, $query );
1157
    $template->param(
1157
    $template->param(
1158
        branchloop                            => GetBranchesLoop(),
1158
        branchloop                            => GetBranchesLoop(),
1159
        opaccolorstylesheet                   => C4::Context->preference("opaccolorstylesheet"),
1159
        OpacAdditionalStylesheet                   => C4::Context->preference("OpacAdditionalStylesheet"),
1160
        opaclayoutstylesheet                  => C4::Context->preference("opaclayoutstylesheet"),
1160
        opaclayoutstylesheet                  => C4::Context->preference("opaclayoutstylesheet"),
1161
        login                                 => 1,
1161
        login                                 => 1,
1162
        INPUTS                                => \@inputs,
1162
        INPUTS                                => \@inputs,
(-)a/C4/Templates.pm (-2 / +2 lines)
Lines 106-113 sub output { Link Here
106
    $vars->{interface} =
106
    $vars->{interface} =
107
      ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
107
      ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
108
    $vars->{theme} = $self->theme;
108
    $vars->{theme} = $self->theme;
109
    $vars->{opaccolorstylesheet} =
109
    $vars->{OpacAdditionalStylesheet} =
110
        C4::Context->preference('opaccolorstylesheet');
110
        C4::Context->preference('OpacAdditionalStylesheet');
111
    $vars->{opaclayoutstylesheet} =
111
    $vars->{opaclayoutstylesheet} =
112
        C4::Context->preference('opaclayoutstylesheet');
112
        C4::Context->preference('opaclayoutstylesheet');
113
113
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 245-251 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
245
('OpacBrowser','0',NULL,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/sbuild_browser_and_cloud.pl)','YesNo'),
245
('OpacBrowser','0',NULL,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/sbuild_browser_and_cloud.pl)','YesNo'),
246
('OpacBrowseResults','1',NULL,'Disable/enable browsing and paging search results from the OPAC detail page.','YesNo'),
246
('OpacBrowseResults','1',NULL,'Disable/enable browsing and paging search results from the OPAC detail page.','YesNo'),
247
('OpacCloud','0',NULL,'If ON, enables subject cloud on OPAC','YesNo'),
247
('OpacCloud','0',NULL,'If ON, enables subject cloud on OPAC','YesNo'),
248
('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'),
248
('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'),
249
('OpacCustomSearch','','70|10','Replace the search box on the OPAC with the provided HTML','Textarea'),
249
('OpacCustomSearch','','70|10','Replace the search box on the OPAC with the provided HTML','Textarea'),
250
('opaccredits','','70|10','Define HTML Credits at the bottom of the OPAC page','Textarea'),
250
('opaccredits','','70|10','Define HTML Credits at the bottom of the OPAC page','Textarea'),
251
('OPACdefaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
251
('OPACdefaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 9793-9798 if(CheckVersion($DBversion)) { Link Here
9793
    SetVersion($DBversion);
9793
    SetVersion($DBversion);
9794
}
9794
}
9795
9795
9796
$DBversion = "3.19.00.XXX";
9797
if ( CheckVersion($DBversion) ) {
9798
    $dbh->do(q|
9799
        UPDATE systempreferences set variable="OpacAdditionalStylesheet" WHERE variable="opaccolorstylesheet"
9800
    |);
9801
    print "Upgrade to $DBversion done (Bug 10328: Rename opaccolorstylesheet to OpacAdditionalStylesheet\n";
9802
    SetVersion ($DBversion);
9803
}
9804
9805
9796
=head1 FUNCTIONS
9806
=head1 FUNCTIONS
9797
9807
9798
=head2 TableExists($table)
9808
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +1 lines)
Lines 187-193 OPAC: Link Here
187
              class: code
187
              class: code
188
        -
188
        -
189
            - Include the additional CSS stylesheet
189
            - Include the additional CSS stylesheet
190
            - pref: opaccolorstylesheet
190
            - pref: OpacAdditionalStylesheet
191
              class: file
191
              class: file
192
            - 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.
192
            - 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.
193
        -
193
        -
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (-5 / +4 lines)
Lines 21-31 Link Here
21
[% ELSE %]
21
[% ELSE %]
22
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% opaclayoutstylesheet %]" />
22
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% opaclayoutstylesheet %]" />
23
[% END %]
23
[% END %]
24
[% IF ( opaccolorstylesheet ) %]
24
[% IF ( OpacAdditionalStylesheet ) %]
25
    [% IF (opaccolorstylesheet.match('^https?:|^\/')) %]
25
    [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %]
26
        <link rel="stylesheet" type="text/css" href="[% opaccolorstylesheet %]" />
26
        <link rel="stylesheet" type="text/css" href="[% OpacAdditionalStylesheet %]" />
27
    [% ELSE %]
27
    [% ELSE %]
28
        <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% opaccolorstylesheet %]" />
28
        <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% OpacAdditionalStylesheet %]" />
29
    [% END %]
29
    [% END %]
30
[% END %]
30
[% END %]
31
[% IF ( opac_css_override ) %]
31
[% IF ( opac_css_override ) %]
32
- 

Return to bug 10328