better way of setting these environment variables

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16776 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 6f825d1..b8b7bc1 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -98,6 +98,10 @@ RewriteRule - - [E=locale:%1] [L]
     # and are willing to accept some increased server load, set this:
     #SetEnvIf Request_URI ".*" OILS_OPAC_BYPASS_STATIC_FOR_HTTPS=yes
 
+    # Specify a ChiliFresh account to integrate their services with the OPAC
+    #SetEnv OILS_CHILIFRESH_ACCOUNT
+    #SetEnv OILS_CHILIFRESH_PROFILE
+    #SetEnv OILS_CHILIFRESH_URL http://chilifresh.com/on-site/js/evergreen.js
 </LocationMatch>
 
 

diff --git a/Open-ILS/web/opac/skin/default/xml/chilifresh.xml b/Open-ILS/web/opac/skin/default/xml/chilifresh.xml
deleted file mode 100644 (file)
index 7cbc40c..0000000
--- a/Open-ILS/web/opac/skin/default/xml/chilifresh.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Specify your ChiliFresh account # below to enable ChiliFresh integration with the OPAC -->
-
-<!--#set var='OILS_CHILIFRESH_ACCOUNT' value=""-->
-<!--#set var='OILS_CHILIFRESH_PROFILE' value=""-->
-<!--#set var='OILS_CHILIFRESH_URL' value="http://chilifresh.com/on-site/js/evergreen.js"-->
-

diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
index 06a27b5..9842985 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
@@ -120,7 +120,6 @@
        <div id='rdetail_preview_badge' class='hide_me'>&rdetail.extras.preview.badge;</div>
 
     <!-- ChiliFresh setup -->
-    <!--#include virtual="../chilifresh.xml"-->
     <script language='javascript' type='text/javascript'>
         var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
     </script>

diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
index 5e6d596..c307f36 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
@@ -222,7 +222,6 @@
        </script>
 
     <!-- ChiliFresh setup -->
-    <!--#include virtual="../chilifresh.xml"-->
     <script language='javascript' type='text/javascript'>
         var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
     </script>