Attachment #5754 for bug #6636

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

Lines 435-440 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (+1 lines)
435	opac_limit_override => $opac_limit_override,	435	opac_limit_override => $opac_limit_override,
436	OpacBrowser => C4::Context->preference("OpacBrowser"),	436	OpacBrowser => C4::Context->preference("OpacBrowser"),
437	OpacCloud => C4::Context->preference("OpacCloud"),	437	OpacCloud => C4::Context->preference("OpacCloud"),
		438	OpacKohaUrl => C4::Context->preference("OpacKohaUrl"),
438	OpacMainUserBlock => "" . C4::Context->preference("OpacMainUserBlock"),	439	OpacMainUserBlock => "" . C4::Context->preference("OpacMainUserBlock"),
439	OpacNav => "" . C4::Context->preference("OpacNav"),	440	OpacNav => "" . C4::Context->preference("OpacNav"),
440	OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),	441	OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),

Lines 318-320 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
319	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	319	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
320	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');	320	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
		321	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 4446-4451 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
4446	SetVersion($DBversion);	4446	SetVersion($DBversion);
4447	}	4447	}
4448		4448
		4449	$DBversion = "3.05.00.XXX";
		4450	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		4451	$dbh->do(qq\|INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','0',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL)\|);
		4452	print "Upgrade to $DBversion done (Add syspref 'OpacKohaUrl')\n";
		4453	SetVersion($DBversion);
		4454	}
		4455
4449		4456
4450	=head1 FUNCTIONS	4457	=head1 FUNCTIONS
4451		4458

Lines 86-91 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+7 lines)
86	no: "Don't show"	86	no: "Don't show"
87	- the name of the patron that has an item checked out on item detail pages on the OPAC.	87	- the name of the patron that has an item checked out on item detail pages on the OPAC.
88	-	88	-
		89	- pref: OpacKohaUrl
		90	default: 0
		91	choices:
		92	yes: Show
		93	no: "Don't show"
		94	- "'Powered by Koha' text on OPAC footer."
		95	-
89	- pref: OpacHighlightedWords	96	- pref: OpacHighlightedWords
90	choices:	97	choices:
91	yes: Highlight	98	yes: Highlight




#renewall_link {
	background-image : url(../../images/checks.png);
}

div.koha_url {
    border-top: none !important;
}
span.koha_url {
    position: absolute;
    right: 0;
}
a.koha_url {
    text-decoration:none;
    color: #666666;
}





[% IF ( opaccredits ) %]
	<div class="ft">
        [% opaccredits %]
    </div>
[% END %]
</div>

[% IF  opaclanguagesdisplay || OpacKohaUrl  %]
<div id="changelanguage" class="ft">
[% IF  languages_loop && opaclanguagesdisplay  %]
    [% UNLESS ( one_language_enabled ) %]
        <strong>Languages: </strong>
        [% FOREACH languages_loo IN languages_loop %]
            [% IF ( languages_loo.group_enabled ) %]
            [% IF ( languages_loo.plural ) %]

                [% ELSE %]
                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
                [% END %]
               [% END %]
            [% END %]
            </ul>
			</div>
			</div>

            [% ELSE %]
		      [% IF ( languages_loo.group_enabled ) %]
                [% IF ( languages_loo.current ) %]
                    [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
                [% ELSE %]

            [% END %]
            [% END %][% UNLESS ( loop.last ) %] | [% END %]
        [% END %]
        </div>
    [% END %]
[% END %]

[% IF ( OpacKohaUrl ) %]
    <span class="koha_url">
        <a class="koha_url" href="http://koha-community.org">Powered by <strong>Koha</strong></a>&nbsp;&nbsp;
    </span>
[% END %]

</div>
[% END %]

[% IF ( Babeltheque ) %]
- 

Return to bug 6636

Lines 2047-2049 div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+12 lines)
2047	#renewall_link {	2047	#renewall_link {
2048	background-image : url(../../images/checks.png);	2048	background-image : url(../../images/checks.png);
2049	}	2049	}
		2050
		2051	div.koha_url {
		2052	border-top: none !important;
		2053	}
		2054	span.koha_url {
		2055	position: absolute;
		2056	right: 0;
		2057	}
		2058	a.koha_url {
		2059	text-decoration:none;
		2060	color: #666666;
		2061	}

Lines 1-14 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc (-9 / +15 lines)
1
2	[% IF ( opaccredits ) %]	1	[% IF ( opaccredits ) %]
3	<div class="ft">	2	<div class="ft">
4	[% opaccredits %]	3	[% opaccredits %]
5	</div>	4	</div>
6	[% END %]	5	[% END %]
7	</div>	6	</div>
8	[% IF ( opaclanguagesdisplay ) %]	7
9	[% IF ( languages_loop ) %]	8	[% IF opaclanguagesdisplay \|\| OpacKohaUrl %]
		9	<div id="changelanguage" class="ft">
		10	[% IF languages_loop && opaclanguagesdisplay %]
10	[% UNLESS ( one_language_enabled ) %]	11	[% UNLESS ( one_language_enabled ) %]
11	<div id="changelanguage" class="ft"><strong>Languages: </strong>	12	<strong>Languages: </strong>
12	[% FOREACH languages_loo IN languages_loop %]	13	[% FOREACH languages_loo IN languages_loop %]
13	[% IF ( languages_loo.group_enabled ) %]	14	[% IF ( languages_loo.group_enabled ) %]
14	[% IF ( languages_loo.plural ) %]	15	[% IF ( languages_loo.plural ) %]
Lines 22-35 Link Here
22	[% ELSE %]	23	[% ELSE %]
23	<li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>	24	<li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
24	[% END %]	25	[% END %]
25	[% END %]	26	[% END %]
26	[% END %]	27	[% END %]
27	</ul>	28	</ul>
28	</div>	29	</div>
29	</div>	30	</div>
30
31	[% ELSE %]	31	[% ELSE %]
32	[% IF ( languages_loo.group_enabled ) %]	32	[% IF ( languages_loo.group_enabled ) %]
33	[% IF ( languages_loo.current ) %]	33	[% IF ( languages_loo.current ) %]
34	[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]	34	[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
35	[% ELSE %]	35	[% ELSE %]
Lines 39-47 Link Here
39	[% END %]	39	[% END %]
40	[% END %][% UNLESS ( loop.last ) %] \| [% END %]	40	[% END %][% UNLESS ( loop.last ) %] \| [% END %]
41	[% END %]	41	[% END %]
42	</div>
43	[% END %]	42	[% END %]
44	[% END %]	43	[% END %]
		44
		45	[% IF ( OpacKohaUrl ) %]
		46	<span class="koha_url">
		47	<a class="koha_url" href="http://koha-community.org">Powered by <strong>Koha</strong></a>
		48	</span>
		49	[% END %]
		50
		51	</div>
45	[% END %]	52	[% END %]
46		53
47	[% IF ( Babeltheque ) %]	54	[% IF ( Babeltheque ) %]
48	-