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

(-)a/C4/Auth.pm (+1 lines)
Lines 435-440 sub get_template_and_user { Link Here
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"),
(-)a/installer/data/mysql/de-DE/mandatory/sysprefs.sql (-1 / +1 lines)
Lines 317-320 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
317
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');
317
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 ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
318
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('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
319
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
320
320
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 317-319 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
317
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');
317
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 ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
318
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('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
319
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 ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (-1 / +1 lines)
Lines 318-321 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
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
321
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/it-IT/necessari/sysprefs.sql (-1 / +1 lines)
Lines 304-307 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
304
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');
304
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');
305
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
305
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
306
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
306
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
307
307
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql (+1 lines)
Lines 324-326 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
324
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');
324
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');
325
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
325
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
326
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
326
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
327
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql (+1 lines)
Lines 316-318 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
316
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');
316
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');
317
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
317
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
318
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
318
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
319
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (+1 lines)
Lines 371-373 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
371
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');
371
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');
372
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
372
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
373
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
373
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
374
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 / +1 lines)
Lines 396-399 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
396
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');
396
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');
397
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
397
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
398
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
398
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
399
399
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 4399-4404 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4399
    SetVersion($DBversion);
4399
    SetVersion($DBversion);
4400
}
4400
}
4401
4401
4402
$DBversion = "3.05.00.XXX";
4403
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4404
    $dbh->do(qq|INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','0',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL)|);
4405
    print "Upgrade to $DBversion done (Add syspref 'OpacKohaUrl')\n";
4406
    SetVersion($DBversion);
4407
}
4408
4409
4402
=head1 FUNCTIONS
4410
=head1 FUNCTIONS
4403
4411
4404
=head2 DropAllForeignKeys($table)
4412
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+7 lines)
Lines 86-91 OPAC: Link Here
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
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc (-5 / +17 lines)
Lines 1-10 Link Here
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>
7
8
[% IF ( opaclanguagesdisplay ) %]
8
[% IF ( opaclanguagesdisplay ) %]
9
[% IF ( languages_loop ) %]
9
[% IF ( languages_loop ) %]
10
    [% UNLESS ( one_language_enabled ) %]
10
    [% UNLESS ( one_language_enabled ) %]
Lines 22-35 Link Here
22
                [% ELSE %]
22
                [% 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>
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
                [% END %]
24
                [% END %]
25
		[% END %]
25
               [% END %]
26
            [% END %]
26
            [% END %]
27
            </ul>
27
            </ul>
28
			</div>
28
			</div>
29
			</div>
29
			</div>
30
31
            [% ELSE %]
30
            [% ELSE %]
32
	    	[% IF ( languages_loo.group_enabled ) %]
31
		      [% IF ( languages_loo.group_enabled ) %]
33
                [% IF ( languages_loo.current ) %]
32
                [% IF ( languages_loo.current ) %]
34
                    [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
33
                    [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
35
                [% ELSE %]
34
                [% ELSE %]
Lines 39-49 Link Here
39
            [% END %]
38
            [% END %]
40
            [% END %][% UNLESS ( loop.last ) %] | [% END %]
39
            [% END %][% UNLESS ( loop.last ) %] | [% END %]
41
        [% END %]
40
        [% END %]
41
[% IF ( OpacKohaUrl ) %]
42
<span id="kohaurl" style="position: absolute; right: 0;">
43
<a STYLE="text-decoration:none; color: #666666;" href="http://www.koha-community.org">Powered by <strong>Koha</strong></a>&nbsp;&nbsp;</span>
44
        [% END %]
42
        </div>
45
        </div>
46
[% END %]
47
    [% END %]
43
    [% END %]
48
    [% END %]
49
50
[% IF ( OpacKohaUrl ) %]
51
[% UNLESS  ( opaclanguagesdisplay ) %]
52
        <div id="changelanguage" class="ft" style="border-top: none !important">
53
<span id="kohaurl" style="position: absolute; right: 0;">
54
<a STYLE="text-decoration:none; color: #666666;" href="http://www.koha-community.org">Powered by <strong>Koha</strong></a>&nbsp;&nbsp;</span>
55
        </div>
44
[% END %]
56
[% END %]
45
[% END %]
57
[% END %]
46
58
59
47
[% IF ( Babeltheque ) %]
60
[% IF ( Babeltheque ) %]
48
<script type="text/javascript" src="http://www.babeltheque.com/bw_30.js"></script>
61
<script type="text/javascript" src="http://www.babeltheque.com/bw_30.js"></script>
49
[% END %]
62
[% END %]
50
- 

Return to bug 6636