Attachment #5099 for bug #6636

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

Lines 434-439 sub get_template_and_user { Link Here

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

Lines 314-316 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/de-DE/mandatory/sysprefs.sql (+1 lines)
314	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea');	314	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea');
315	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	315	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
316	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	316	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 314-316 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
314	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');	314	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
315	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	315	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
316	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	316	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 315-317 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (+1 lines)
315	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');	315	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
316	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	316	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
317	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	317	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 301-303 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/it-IT/necessari/sysprefs.sql (+1 lines)
301	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea');	301	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea');
302	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	302	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
303	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	303	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		304	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

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

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql (+1 lines)
321	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');	321	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
322	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');	322	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
323	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');	323	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
		324	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 313-315 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql (+1 lines)
313	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');	313	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
314	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	314	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
315	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	315	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		316	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 368-370 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (+1 lines)
368	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');	368	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
369	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	369	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
370	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	370	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		371	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

Lines 393-395 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql (+1 lines)
393	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea');	393	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea');
394	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');	394	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
395	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');	395	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choice');
		396	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);

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

(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
4370	SetVersion($DBversion);	4370	SetVersion($DBversion);
4371	}	4371	}
4372		4372
		4373	$DBversion = "3.05.00.XXX";
		4374	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		4375	$dbh->do(qq\|INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','0',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL)\|);
		4376	print "Upgrade to $DBversion done (Add syspref 'OpacKohaUrl')\n";
		4377	SetVersion($DBversion);
		4378	}
		4379
		4380
4373	=head1 FUNCTIONS	4381	=head1 FUNCTIONS
4374		4382
4375	=head2 DropAllForeignKeys($table)	4383	=head2 DropAllForeignKeys($table)

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




#opac-isbddetail #isbdcontents { margin-top: 2em; }

div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }

div.kohaurl {
    border-top: none !important;
}
span.kohaurl {
    position: absolute;
    right: 0;
}
a.kohaurl {
    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="kohaurl">
        <a class="kohaurl" href="http://koha-community.org">Powered by <strong>Koha</strong></a>&nbsp;&nbsp;
    </span>
[% END %]

</div>
[% END %]

[% IF ( Babeltheque ) %]
- 

Return to bug 6636

Lines 2018-2020 div.ft { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+12 lines)
2018	#opac-isbddetail #isbdcontents { margin-top: 2em; }	2018	#opac-isbddetail #isbdcontents { margin-top: 2em; }
2019		2019
2020	div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }	2020	div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }
		2021
		2022	div.kohaurl {
		2023	border-top: none !important;
		2024	}
		2025	span.kohaurl {
		2026	position: absolute;
		2027	right: 0;
		2028	}
		2029	a.kohaurl {
		2030	text-decoration:none;
		2031	color: #666666;
		2032	}

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="kohaurl">
		47	<a class="kohaurl" 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	-