rolling back changeset 7744. added content cannot use an alternate servers since...

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

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 3cc5372..e90a311 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -73,13 +73,11 @@ OSRFGatewayConfig /openils/conf/opensrf_core.xml
     SetEnvIf Request_URI "/fr-CA/" locale=fr-CA
     SetEnvIf Request_URI ".*" OILS_OPAC_BASE=/opac/
     
-    # The following environment variables are optional.  They specify
-    # alternate servers for various static data
-    # Added Content server
-    #SetEnvIf Request_URI ".*" OILS_OPAC_AC_HOST=static.example.org/opac/
-    # Static CSS files server
+    # This gives you the option to configure a different host to serve OPAC images from
+    # Specify the hostname (withouth protocol) and path to the images.  Protocol will
+    # be determined at runtime
+    #SetEnvIf Request_URI ".*" OILS_OPAC_IMAGES_HOST=static.example.org/opac/
     #SetEnvIf Request_URI ".*" OILS_OPAC_CSS_HOST=static.example.org/opac/
-    # Static JavaScript files server
     #SetEnvIf Request_URI ".*" OILS_OPAC_JS_HOST=static.example.org/opac/
 
 </LocationMatch>

diff --git a/Open-ILS/web/opac/common/js/added_content.js b/Open-ILS/web/opac/common/js/added_content.js
index b575168..f7be084 100644 (file)
--- a/Open-ILS/web/opac/common/js/added_content.js
+++ b/Open-ILS/web/opac/common/js/added_content.js
@@ -6,16 +6,14 @@
 
 function buildISBNSrc(isbn, size) {
        size = (size) ? size : 'small';
-    if(OILS_OPAC_AC_HOST)
-        return location.protocol + '//' + OILS_OPAC_AC_HOST + 'jacket/' + size + '/' + isbn;
-       return '../../../../extras/ac/jacket/'+size+'/'+isbn;
+    if(OILS_OPAC_IMAGES_HOST)
+        return location.protocol + '//' + OILS_OPAC_IMAGES_HOST + size + '/' + isbn;
+       return '../../../../extras/jacket/'+size+'/'+isbn;
 }      
 
 
 
 function acMakeURL(type, key) {
-    if(OILS_OPAC_AC_HOST)
-        return location.protocol + '//' + OILS_OPAC_AC_HOST + type + '/html/' + key;
        return '../../../../extras/ac/' + type + '/html/' + key;
 }
 

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index 7e99539..8385e45 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -28,9 +28,9 @@
 
 
                <!-- set up some global JS config variables, read from the Apache config -->
-               var OILS_OPAC_AC_HOST = null;
-               <!--#if expr="$OILS_OPAC_AC_HOST"-->
-                       OILS_OPAC_AC_HOST = '<!--#echo var="OILS_OPAC_AC_HOST"-->extras/ac/';
+               var OILS_OPAC_IMAGES_HOST = null;
+               <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
+                       OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/jacket/';
                <!--#endif -->
 
        </script>