---
 C4/Auth.pm                                         |    1 +
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    2 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 +-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    2 +-
 .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql   |    1 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    1 +
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 ...m_preferences_full_optimal_for_install_only.sql |    2 +-
 installer/data/mysql/updatedatabase.pl             |    8 +++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    7 ++++++
 .../opac-tmpl/prog/en/includes/opac-bottom.inc     |   21 ++++++++++++++++---
 12 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 495f04c..4fe9ecd 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -435,6 +435,7 @@ sub get_template_and_user {
             opac_limit_override       => $opac_limit_override,
             OpacBrowser               => 
C4::Context->preference("OpacBrowser"),
             OpacCloud                 => C4::Context->preference("OpacCloud"),
+            OpacKohaUrl               => 
C4::Context->preference("OpacKohaUrl"),
             OpacMainUserBlock         => "" . 
C4::Context->preference("OpacMainUserBlock"),
             OpacNav                   => "" . 
C4::Context->preference("OpacNav"),
             OpacPasswordChange        => 
C4::Context->preference("OpacPasswordChange"),
diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql 
b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
index 6df6a9f..f49c8d2 100755
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@@ -317,4 +317,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
-
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql 
b/installer/data/mysql/en/mandatory/sysprefs.sql
index 8407505..fca63d1 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -317,3 +317,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git 
a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql 
b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index d46502c..c0fe8cf 100755
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -318,4 +318,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
-
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql 
b/installer/data/mysql/it-IT/necessari/sysprefs.sql
index 3448738..52cd507 100755
--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@@ -304,4 +304,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
-
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql 
b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
index ac4c3e2..290c8c8 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
@@ -324,3 +324,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql 
b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
index 3087f3c..b1a010f 100755
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@@ -316,3 +316,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git 
a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
 
b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
index c0912ba..6b1d95d 100755
--- 
a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ 
b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
@@ -371,3 +371,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git 
a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
 
b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
index d334469..bf598fb 100755
--- 
a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ 
b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
@@ -396,4 +396,4 @@ INSERT INTO systempreferences 
(variable,value,explanation,options,type) VALUES (
 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');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', 
NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) 
VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be 
show',NULL,'YesNo');
-
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) 
VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC 
footer.",NULL,NULL);
diff --git a/installer/data/mysql/updatedatabase.pl 
b/installer/data/mysql/updatedatabase.pl
index 720bd8c..61bbbd8 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4399,6 +4399,14 @@ if (C4::Context->preference("Version") < 
TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do(qq|INSERT INTO `systempreferences` 
(variable,value,explanation,options,type) VALUES ('OpacKohaUrl','0',"Show 
'Powered by Koha' text on OPAC footer.",NULL,NULL)|);
+    print "Upgrade to $DBversion done (Add syspref 'OpacKohaUrl')\n";
+    SetVersion($DBversion);
+}
+
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git 
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref 
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 56f479e..5211443 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -86,6 +86,13 @@ OPAC:
                   no: "Don't show"
             - the name of the patron that has an item checked out on item 
detail pages on the OPAC.
         -
+            - pref: OpacKohaUrl
+              default: 0
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - "'Powered by Koha' text on OPAC footer."
+        -
             - pref: OpacHighlightedWords
               choices:
                   yes: Highlight
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc 
b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
index c76d85c..ad584fa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -1,10 +1,10 @@
-
 [% IF ( opaccredits ) %]
        <div class="ft">
         [% opaccredits %]
     </div>
 [% END %]
 </div>
+
 [% IF ( opaclanguagesdisplay ) %]
 [% IF ( languages_loop ) %]
     [% UNLESS ( one_language_enabled ) %]
@@ -22,14 +22,13 @@
                 [% 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 %]
             [% END %]
             </ul>
                        </div>
                        </div>
-
             [% ELSE %]
-               [% IF ( languages_loo.group_enabled ) %]
+                     [% 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 %]
@@ -39,11 +38,25 @@
             [% END %]
             [% END %][% UNLESS ( loop.last ) %] | [% END %]
         [% END %]
+[% IF ( OpacKohaUrl ) %]
+<span id="kohaurl" style="position: absolute; right: 0;">
+<a STYLE="text-decoration:none; color: #666666;" 
href="http://www.koha-community.org";>Powered by 
<strong>Koha</strong></a>&nbsp;&nbsp;</span>
+        [% END %]
         </div>
+[% END %]
+    [% END %]
     [% END %]
+
+[% IF ( OpacKohaUrl ) %]
+[% UNLESS  ( opaclanguagesdisplay ) %]
+        <div id="changelanguage" class="ft" style="border-top: none 
!important">
+<span id="kohaurl" style="position: absolute; right: 0;">
+<a STYLE="text-decoration:none; color: #666666;" 
href="http://www.koha-community.org";>Powered by 
<strong>Koha</strong></a>&nbsp;&nbsp;</span>
+        </div>
 [% END %]
 [% END %]
 
+
 [% IF ( Babeltheque ) %]
 <script type="text/javascript" 
src="http://www.babeltheque.com/bw_30.js";></script>
 [% END %]
-- 
1.7.1

_______________________________________________
Koha-patches mailing list
Koha-patches@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to