added support fetching javascript and css from an alternate host. updated apache...

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

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index b8c9259..7b21a4a 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -68,7 +68,9 @@ RewriteRule /opac/extras/jacket/large/(.*) \
     # 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/
+    #SetEnvIf Request_URI ".*" OILS_OPAC_IMAGES_HOST=static.example.org/opac/
+    #SetEnvIf Request_URI ".*" OILS_OPAC_CSS_HOST=static.example.org/opac/
+    #SetEnvIf Request_URI ".*" OILS_OPAC_JS_HOST=static.example.org/opac/
 
 </LocationMatch>
 

diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
index b1aed85..8566cc2 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
@@ -6,7 +6,7 @@
                .adv_adv_link { font-size: 8pt; color: red; }
        </style>
 
-       <script src='../js/adv_global.js'> </script>
+       <script src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js'> </script>
 
        <tr style='border-bottom: none;'>
 

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 1cc9642..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
@@ -30,7 +30,7 @@
                <!-- 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"-->';
+                       OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/jacket/';
                <!--#endif -->
 
        </script>

diff --git a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
index 8859f2b..8935d32 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
@@ -1,5 +1,5 @@
 <span>
-       <script language='javascript' src='../js/depth_selector.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js'> </script>
        <span class='hide_me' id='depth_selector_span'>
                <!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
                <span>&library.select; </span>

diff --git a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
index db5b3d6..beb8321 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
@@ -54,7 +54,7 @@
                        </tr>
                </tbody>
        </table>
-       <script language='javascript' src='../js/search_bar.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js'> </script>
 </div>
 
 

diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
index 8902d7c..6e39a17 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
@@ -168,7 +168,7 @@
 
        <!-- ============================================================================= -->
        <!-- Our javascript -->
-       <script language='javascript' src='../js/sidebar.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'> </script>
 
        <script language='javascript'>
                config.ids.sidebar = {};

diff --git a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
index c87fadb..ff5cb91 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
@@ -5,9 +5,9 @@
 
        <!-- load my js -->
        <script language='javascript' 
-               src="<!--#echo var='OILS_SKIN_BASE'-->/default/js/depth_selector.js"> </script>
+               src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js"> </script>
        <script language='javascript' 
-               src="<!--#echo var='OILS_SKIN_BASE'-->/default/js/search_bar.js"> </script>
+               src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js"> </script>
 
        <script language='javascript'>
                config.ids.searchbar = {};

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
index a5aa150..6b1acae 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
@@ -1,7 +1,7 @@
 
 <div id='myopac_bookbag_div' class='hide_me' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-       <script language='javascript' src='../js/container.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
 
        <div id='myopac_delete_bookbag_warn' class='hide_me'>
                &myopac.delete.bookbag;

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index df0189d..5a2c14a 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -1,7 +1,7 @@
 
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-       <script language='javascript' src='../js/holds.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
 
        <table width='100%' class='light_border data_grid data_grid_center'>
 

diff --git a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
index e2583af..2bcefed 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
@@ -1,6 +1,6 @@
 <div id='canvas_main' class='canvas' style='margin-top: 20px;'>
 
-       <script language='javascript' src='../js/advanced.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js'> </script>
 
        <style type='text/css'>
                .advanced_div { text-align: center; margin: 8px; margin-left: 2px; width: 95%; padding: 5px; }

diff --git a/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml b/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
index c81598e..e046709 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
@@ -1,5 +1,5 @@
 <div id='canvas_main' class='canvas' style='margin-top: 20px;'>
-       <script language='javascript' src='../js/cn_browse.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'> </script>
        <!--#include virtual="common/cn_browse.xml"-->
 </div>
 

diff --git a/Open-ILS/web/opac/skin/default/xml/page_mresult.xml b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
index 1447bdb..335c101 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
@@ -1,9 +1,9 @@
 <div>
-       <script language='javascript' src='../js/sidebar_extras.js'> </script>
-       <script language='javascript' src='../js/mresult.js'> </script>
-       <script language='javascript' src='../js/result_common.js'> </script>
-       <script language='javascript' src='../js/tips.js'> </script>
-       <script language='javascript' src='../js/holds.js'> </script>   
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/mresult.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>   
        <!--#include virtual="result/result_common.xml"-->
 </div>
 

diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
index f973255..b004f32 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
@@ -1,7 +1,7 @@
 <div id='canvas_main' class='canvas hide_me'>
 
-       <script language='javascript' src='../js/myopac.js'> </script>
-    <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js'/>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js'> </script>
+    <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'/>
 
        <script> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
        <div id='myopac_reloading' class='hide_me canvas'> &common.loading; </div>

diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
index 7690623..f4dc87c 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
@@ -1,12 +1,12 @@
 <div id='canvas_main' class='canvas'>
 
-       <script language='javascript' src='../js/sidebar_extras.js'> </script>
-       <script language='javascript' src='../js/result_common.js'> </script>
-       <script language='javascript' src='../js/rresult.js'> </script>
-       <script language='javascript' src='../js/rdetail.js'> </script>
-       <script language='javascript' src='../js/holds.js'> </script>
-       <script language='javascript' src='../js/cn_browse.js'> </script>
-       <script language='javascript' src='../js/container.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
 
        <script language='javascript'>
                config.ids.rdetail = {};

diff --git a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
index 2f1aac5..85b475f 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
@@ -1,9 +1,9 @@
 <div>
-       <script language='javascript' src='../js/sidebar_extras.js'> </script>
-       <script language='javascript' src='../js/rresult.js'> </script>
-       <script language='javascript' src='../js/result_common.js'> </script>
-       <script language='javascript' src='../js/tips.js'> </script>
-       <script language='javascript' src='../js/holds.js'> </script>   
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>   
        <!--#include virtual="result/result_common.xml"-->
 </div>
 

diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
index cb21120..c34411d 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
@@ -1,6 +1,6 @@
 <table class='hide_me'>
-       <script language='javascript' src='../js/copy_details.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Date.W3CDTF.js'>  </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'>  </script>
        <tbody>
                <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
                        <td colspan='10'>

diff --git a/Open-ILS/web/opac/skin/default/xml/setenv.xml b/Open-ILS/web/opac/skin/default/xml/setenv.xml
index 26c5cb8..d95a6ad 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/setenv.xml
+++ b/Open-ILS/web/opac/skin/default/xml/setenv.xml
@@ -30,12 +30,29 @@
 
 <!--#endif-->
 
+
 <!--#set var="OILS_BASE" value="http://${SERVER_NAME}/${OILS_OPAC_BASE}"-->
-<!--#set var="OILS_JS_BASE" value="${OILS_BASE}/common/js"-->
-<!--#set var="OILS_CSS_BASE" value="${OILS_BASE}/common/css"--> 
 <!--#set var="OILS_XML_BASE" value="${OILS_BASE}/common/xml"--> 
-<!--#set var="OILS_THEME_BASE" value="${OILS_BASE}/theme"--> 
-<!--#set var="OILS_SKIN_BASE" value="${OILS_BASE}/skin"--> 
+
+
+<!-- Javascript host -->
+<!--#if expr="$OILS_OPAC_JS_HOST"-->
+    <!--#set var="OILS_OPAC_JS_HOST" value="http://${OILS_OPAC_JS_HOST}"-->
+<!--#else -->
+    <!--#set var="OILS_OPAC_JS_HOST" value="$OILS_BASE"-->
+<!--#endif -->
+<!--#set var="OILS_JS_BASE" value="${OILS_OPAC_JS_HOST}/common/js"-->
+
+
+<!--#if expr="$OILS_OPAC_CSS_HOST"-->
+    <!--#set var="OILS_OPAC_CSS_HOST" value="http://${OILS_OPAC_CSS_HOST}"-->
+<!--#else -->
+    <!--#set var="OILS_OPAC_CSS_HOST" value="$OILS_BASE"-->
+<!--#endif -->
+<!--#set var="OILS_THEME_BASE" value="${OILS_OPAC_CSS_HOST}/theme"--> 
+<!--#set var="OILS_SKIN_BASE" value="${OILS_OPAC_CSS_HOST}/skin"--> 
+<!--#set var="OILS_CSS_BASE" value="${OILS_OPAC_CSS_HOST}/common/css"--> 
+
 
 <!--#if expr="!$locale || $locale=''"-->
        <!--#set var="locale" value="en-US"-->