[open-ils-commits] r16776 - in trunk/Open-ILS: examples/apache web/opac/skin/default/xml web/opac/skin/default/xml/rdetail web/opac/skin/default/xml/result (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-06-22 11:34:16 -0400 (Tue, 22 Jun 2010)
New Revision: 16776

Removed:
   trunk/Open-ILS/web/opac/skin/default/xml/chilifresh.xml
Modified:
   trunk/Open-ILS/examples/apache/eg_vhost.conf
   trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
   trunk/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
Log:
better way of setting these environment variables

Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf	2010-06-22 14:51:27 UTC (rev 16775)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf	2010-06-22 15:34:16 UTC (rev 16776)
@@ -98,6 +98,10 @@
     # 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>
 
 

Deleted: trunk/Open-ILS/web/opac/skin/default/xml/chilifresh.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/chilifresh.xml	2010-06-22 14:51:27 UTC (rev 16775)
+++ trunk/Open-ILS/web/opac/skin/default/xml/chilifresh.xml	2010-06-22 15:34:16 UTC (rev 16776)
@@ -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"-->
-

Modified: trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml	2010-06-22 14:51:27 UTC (rev 16775)
+++ trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml	2010-06-22 15:34:16 UTC (rev 16776)
@@ -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>

Modified: trunk/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/result/result_table.xml	2010-06-22 14:51:27 UTC (rev 16775)
+++ trunk/Open-ILS/web/opac/skin/default/xml/result/result_table.xml	2010-06-22 15:34:16 UTC (rev 16776)
@@ -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>