Attachment #91654 for bug #23078

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




[% USE raw %]
[% USE Koha %]
[%- USE KohaPlugins -%]
[% USE Asset %]
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Koha [% Version | html %]" /> <!-- leave this for stats -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon') ) %][% Koha.Preference('OpacFavicon') | url %][% ELSE %][% interface | url %]/[% theme | url %]/images/favicon.ico[% END %]" type="image/x-icon" />
[% IF ( bidi ) %]
    [% Asset.css("lib/bootstrap/css/bootstrap-rtl.min.css") | $raw %]
    [% Asset.css("lib/jquery/jquery-ui-rtl.css") | $raw %]
    [% Asset.css("css/right-to-left.css") | $raw %]
[% ELSE %]
    [% Asset.css("lib/bootstrap/css/bootstrap.min.css") | $raw %]
    [% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
[% END %]
[% IF ( Koha.Preference('opaclayoutstylesheet') ) %]
    [% SET opaclayoutstylesheet = Koha.Preference('opaclayoutstylesheet') %]
    [% Asset.css("lib/jquery/jquery-ui-rtl.css") | $raw %]
[% ELSE %]
    [% SET opaclayoutstylesheet = 'opac.css' %]
[% END %]

[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
[% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
    <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet | url %]" />
[% ELSE %]
    [% Asset.css("css/" _ opaclayoutstylesheet) | $raw %]
[% END %]
[% IF ( Koha.Preference('OpacAdditionalStylesheet') ) %]
    [% SET OpacAdditionalStylesheet = Koha.Preference('OpacAdditionalStylesheet') %]
    [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %]
        <link rel="stylesheet" type="text/css" href="[% OpacAdditionalStylesheet | url %]" />
    [% ELSE %]
        <link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | url %]/css/[% OpacAdditionalStylesheet | url %]" />
    [% END %]
[% END %]
[% IF ( opac_css_override ) %]
    <link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | url %]/css/[% opac_css_override | url %]" />
[% END %]
[% Asset.css("css/print.css", { media = "print" }) | $raw %]
[% IF ( Koha.Preference('OPACUserCSS') ) %]
    <style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>
[% END %]
[% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS | $raw %]</style>[% END %]
[% IF SCO_login %]
    [% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %]
    [% IF SCOUserCSS %]
        <style>[% SCOUserCSS | $raw %]</style>
    [% END %]
[% END %]
[% IF ( Koha.Preference('OPACBaseURL') ) %]
    <link rel="unapi-server" type="application/xml" title="unAPI" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/unapi" />
[% END %]
[% PROCESS cssinclude %]
<!-- Respond.js brings responsive layout behavior to IE < v.9 -->
<!--[if lt IE 9]>
- 

Return to bug 23078

Lines 549-555 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-2 lines)
549		549
550	my @search_groups = Koha::Library::Groups->get_search_groups({ interface => 'opac' });	550	my @search_groups = Koha::Library::Groups->get_search_groups({ interface => 'opac' });
551	$template->param(	551	$template->param(
552	OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
553	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),	552	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
554	LibrarySearchGroups => \@search_groups,	553	LibrarySearchGroups => \@search_groups,
555	opac_name => $opac_name,	554	opac_name => $opac_name,
Lines 582-588 sub get_template_and_user { Link Here
582	'Version' => C4::Context->preference('Version'),	581	'Version' => C4::Context->preference('Version'),
583	hidelostitems => C4::Context->preference("hidelostitems"),	582	hidelostitems => C4::Context->preference("hidelostitems"),
584	mylibraryfirst => ( C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv ) ? C4::Context->userenv->{'branch'} : '',	583	mylibraryfirst => ( C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv ) ? C4::Context->userenv->{'branch'} : '',
585	opaclayoutstylesheet => "" . C4::Context->preference("opaclayoutstylesheet"),
586	opacbookbag => "" . C4::Context->preference("opacbookbag"),	584	opacbookbag => "" . C4::Context->preference("opacbookbag"),
587	opaccredits => "" . C4::Context->preference("opaccredits"),	585	opaccredits => "" . C4::Context->preference("opaccredits"),
588	OpacFavicon => C4::Context->preference("OpacFavicon"),	586	OpacFavicon => C4::Context->preference("OpacFavicon"),

Lines 1-50 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (-15 / +17 lines)
1	[% USE raw %]	1	[% USE raw %]
		2	[% USE Koha %]
2	[%- USE KohaPlugins -%]	3	[%- USE KohaPlugins -%]
3	[% USE Asset %]	4	[% USE Asset %]
4	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	5	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5	<meta name="generator" content="Koha [% Version \| html %]" /> <!-- leave this for stats -->	6	<meta name="generator" content="Koha [% Version \| html %]" /> <!-- leave this for stats -->
6	<meta name="viewport" content="width=device-width, initial-scale=1" />	7	<meta name="viewport" content="width=device-width, initial-scale=1" />
7	<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon \| html %][% ELSE %][% interface \| html %]/[% theme \| html %]/images/favicon.ico[% END %]" type="image/x-icon" />	8	<link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon') ) %][% Koha.Preference('OpacFavicon') \| url %][% ELSE %][% interface \| url %]/[% theme \| url %]/images/favicon.ico[% END %]" type="image/x-icon" />
8	[% IF ( bidi ) %]	9	[% IF ( bidi ) %]
9	[% Asset.css("lib/bootstrap/css/bootstrap-rtl.min.css") \| $raw %]	10	[% Asset.css("lib/bootstrap/css/bootstrap-rtl.min.css") \| $raw %]
		11	[% Asset.css("lib/jquery/jquery-ui-rtl.css") \| $raw %]
		12	[% Asset.css("css/right-to-left.css") \| $raw %]
10	[% ELSE %]	13	[% ELSE %]
11	[% Asset.css("lib/bootstrap/css/bootstrap.min.css") \| $raw %]	14	[% Asset.css("lib/bootstrap/css/bootstrap.min.css") \| $raw %]
		15	[% Asset.css("lib/jquery/jquery-ui.css") \| $raw %]
12	[% END %]	16	[% END %]
13		17	[% IF ( Koha.Preference('opaclayoutstylesheet') ) %]
14	[% IF ( bidi ) %]	18	[% SET opaclayoutstylesheet = Koha.Preference('opaclayoutstylesheet') %]
15	[% Asset.css("lib/jquery/jquery-ui-rtl.css") \| $raw %]
16	[% ELSE %]	19	[% ELSE %]
17	[% Asset.css("lib/jquery/jquery-ui.css") \| $raw %]	20	[% SET opaclayoutstylesheet = 'opac.css' %]
18	[% END %]	21	[% END %]
19
20	[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
21	[% IF (opaclayoutstylesheet.match('^https?:\|^\/')) %]	22	[% IF (opaclayoutstylesheet.match('^https?:\|^\/')) %]
22	<link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet \| url %]" />	23	<link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet \| url %]" />
23	[% ELSE %]	24	[% ELSE %]
24	[% Asset.css("css/" _ opaclayoutstylesheet) \| $raw %]	25	[% Asset.css("css/" _ opaclayoutstylesheet) \| $raw %]
25	[% END %]	26	[% END %]
26	[% IF ( OpacAdditionalStylesheet ) %]	27	[% IF ( Koha.Preference('OpacAdditionalStylesheet') ) %]
		28	[% SET OpacAdditionalStylesheet = Koha.Preference('OpacAdditionalStylesheet') %]
27	[% IF (OpacAdditionalStylesheet.match('^https?:\|^\/')) %]	29	[% IF (OpacAdditionalStylesheet.match('^https?:\|^\/')) %]
28	<link rel="stylesheet" type="text/css" href="[% OpacAdditionalStylesheet \| url %]" />	30	<link rel="stylesheet" type="text/css" href="[% OpacAdditionalStylesheet \| url %]" />
29	[% ELSE %]	31	[% ELSE %]
30	<link rel="stylesheet" type="text/css" href="[% interface \| html %]/[% theme \| html %]/css/[% OpacAdditionalStylesheet \| html %]" />	32	<link rel="stylesheet" type="text/css" href="[% interface \| url %]/[% theme \| url %]/css/[% OpacAdditionalStylesheet \| url %]" />
31	[% END %]	33	[% END %]
32	[% END %]	34	[% END %]
33	[% IF ( opac_css_override ) %]	35	[% IF ( opac_css_override ) %]
34	<link rel="stylesheet" type="text/css" href="[% interface \| html %]/[% theme \| html %]/css/[% opac_css_override \| html %]" />	36	<link rel="stylesheet" type="text/css" href="[% interface \| url %]/[% theme \| url %]/css/[% opac_css_override \| url %]" />
35	[% END %]	37	[% END %]
36	[% Asset.css("css/print.css", { media = "print" }) \| $raw %]	38	[% Asset.css("css/print.css", { media = "print" }) \| $raw %]
37	[% IF ( bidi ) %]	39	[% IF ( Koha.Preference('OPACUserCSS') ) %]
38	[% Asset.css("css/right-to-left.css") \| $raw %]	40	<style>[% Koha.Preference('OPACUserCSS') \| $raw %]</style>
39	[% END %]	41	[% END %]
40	[% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS \| $raw %]</style>[% END %]
41	[% IF SCO_login %]	42	[% IF SCO_login %]
42	[% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %]	43	[% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %]
43	[% IF SCOUserCSS %]	44	[% IF SCOUserCSS %]
44	<style>[% SCOUserCSS \| $raw %]</style>	45	<style>[% SCOUserCSS \| $raw %]</style>
45	[% END %]	46	[% END %]
46	[% END %]	47	[% END %]
47	<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL \| url %]/cgi-bin/koha/unapi" />	48	[% IF ( Koha.Preference('OPACBaseURL') ) %]
		49	<link rel="unapi-server" type="application/xml" title="unAPI" href="[% Koha.Preference('OPACBaseURL') \| url %]/cgi-bin/koha/unapi" />
		50	[% END %]
48	[% PROCESS cssinclude %]	51	[% PROCESS cssinclude %]
49	<!-- Respond.js brings responsive layout behavior to IE < v.9 -->	52	<!-- Respond.js brings responsive layout behavior to IE < v.9 -->
50	<!--[if lt IE 9]>	53	<!--[if lt IE 9]>
51	-