gave the OPAC the ability to use an alternate host for images. will likely add the...

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

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 105a0c0..b8c9259 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -64,6 +64,12 @@ RewriteRule /opac/extras/jacket/large/(.*) \
     SetEnvIf Request_URI "/en-US/" locale=en-US
     SetEnvIf Request_URI "/fr/" locale=fr
     SetEnvIf Request_URI ".*" OILS_OPAC_BASE=/opac/
+    
+    # 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=images.example.org/opac/extras/jacket/
+
 </LocationMatch>
 
 

diff --git a/Open-ILS/web/opac/common/js/added_content.js b/Open-ILS/web/opac/common/js/added_content.js
index 97a66bb..f7be084 100644 (file)
--- a/Open-ILS/web/opac/common/js/added_content.js
+++ b/Open-ILS/web/opac/common/js/added_content.js
@@ -5,9 +5,9 @@
 */
 
 function buildISBNSrc(isbn, size) {
-       //return "http://images.amazon.com/images/P/" + isbn + ".01._SCMZZZZZZZ_.jpg";
-       //return '../../../../jackets/'+isbn;
        size = (size) ? size : 'small';
+    if(OILS_OPAC_IMAGES_HOST)
+        return location.protocol + '//' + OILS_OPAC_IMAGES_HOST + size + '/' + isbn;
        return '../../../../extras/jacket/'+size+'/'+isbn;
 }      
 

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 fe8eb1b..1cc9642 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
@@ -4,9 +4,6 @@
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'> </script>
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'> </script>
-       <!--
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookie.js'> </script>
-       -->
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'> </script>
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'> </script>
 
@@ -24,10 +21,20 @@
 
        <!-- Some global js -->
        <script language='javascript'>
+
                config.css.color_1 = "color_1";
                config.css.color_2 = "color_2";
                config.css.color_3 = "color_3";
+
+
+               <!-- set up some global JS config variables, read from the Apache config -->
+               var OILS_OPAC_IMAGES_HOST = null;
+               <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
+                       OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->';
+               <!--#endif -->
+
        </script>
+
 </div>