From 90fc0c08cc819e471670a2b130935cc2bf942149 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 27 Apr 2015 16:06:37 +0200
Subject: [PATCH] Bug 12160: Rename opacuserjs with OpacUserJS

Test plan:
Same as previous patch for opacuserjs
---
 C4/Auth.pm                                                          | 4 ++--
 installer/data/mysql/sysprefs.sql                                   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 5ae6d72..f59c614 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -508,7 +508,7 @@ sub get_template_and_user {
             opacheader                            => "" . C4::Context->preference("opacheader"),
             opaclanguagesdisplay                  => "" . C4::Context->preference("opaclanguagesdisplay"),
             opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
-            opacuserjs                            => C4::Context->preference("opacuserjs"),
+            OpacUserJS                            => C4::Context->preference("OpacUserJS"),
             opacuserlogin                         => "" . C4::Context->preference("opacuserlogin"),
             ShowReviewer                          => C4::Context->preference("ShowReviewer"),
             ShowReviewerPhoto                     => C4::Context->preference("ShowReviewerPhoto"),
@@ -1179,7 +1179,7 @@ sub checkauth {
         OpacFavicon                           => C4::Context->preference("OpacFavicon"),
         opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
         opaclanguagesdisplay                  => C4::Context->preference("opaclanguagesdisplay"),
-        opacuserjs                            => C4::Context->preference("opacuserjs"),
+        OpacUserJS                            => C4::Context->preference("OpacUserJS"),
         opacbookbag                           => "" . C4::Context->preference("opacbookbag"),
         OpacCloud                             => C4::Context->preference("OpacCloud"),
         OpacTopissue                          => C4::Context->preference("OpacTopissue"),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index e288470..384cd31 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -313,7 +313,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OpacTopissue','0',NULL,'If ON, enables the \'most popular items\' link on OPAC. Warning, this is an EXPERIMENTAL feature, turning ON may overload your server','YesNo'),
 ('OPACURLOpenInNewWindow','0',NULL,'If ON, URLs in the OPAC open in a new window','YesNo'),
 ('OPACUserCSS','',NULL,'Add CSS to be included in the OPAC in an embedded <style> tag.','free'),
-('opacuserjs','','70|10','Define custom javascript for inclusion in OPAC','Textarea'),
+('OpacUserJS','','70|10','Define custom javascript for inclusion in OPAC','Textarea'),
 ('opacuserlogin','1',NULL,'Enable or disable display of user login features','YesNo'),
 ('OPACViewOthersSuggestions','0',NULL,'If ON, allows all suggestions to be displayed in the OPAC','YesNo'),
 ('OPACXSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on OPAC','Free'),
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 c26d048..952f632 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
@@ -182,7 +182,7 @@ OPAC:
             - for the OPAC's favicon. (This should be a complete URL, starting with <code>http://</code>.)
         -
             - "Include the following JavaScript on all pages in the OPAC:"
-            - pref: opacuserjs
+            - pref: OpacUserJS
               type: textarea
               class: code
         -
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 59b0464..c18bd8a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -262,10 +262,10 @@ $(document).ready(function() {
 </script>
 [% PROCESS jsinclude %]
 
-[% IF ( opacuserjs ) %]
+[% IF ( OpacUserJS ) %]
     <script type="text/javascript">
         //<![CDATA[
-        [% opacuserjs %]
+        [% OpacUserJS %]
         //]]>
     </script>
 [% END %]
-- 
2.1.0