[open-ils-commits] r7527 - in trunk/Open-ILS: examples/apache
web/opac/skin/default/xml web/opac/skin/default/xml/advanced
web/opac/skin/default/xml/common web/opac/skin/default/xml/home
web/opac/skin/default/xml/myopac web/opac/skin/default/xml/rdetail
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Jul 5 23:06:32 EDT 2007
Author: erickson
Date: 2007-07-05 23:02:35 -0400 (Thu, 05 Jul 2007)
New Revision: 7527
Modified:
trunk/Open-ILS/examples/apache/eg_vhost.conf
trunk/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
trunk/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
trunk/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
trunk/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
trunk/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
trunk/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
trunk/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
trunk/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
trunk/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
trunk/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
trunk/Open-ILS/web/opac/skin/default/xml/setenv.xml
Log:
added support fetching javascript and css from an alternate host. updated apache config example
Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf 2007-07-06 03:02:35 UTC (rev 7527)
@@ -68,7 +68,9 @@
# 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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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;'>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/common/libselect.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/common/libselect.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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 = {};
Modified: trunk/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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 = {};
Modified: trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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;
Modified: trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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'>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_advanced.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_advanced.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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; }
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_mresult.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_mresult.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_myopac.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_myopac.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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 = {};
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_rresult.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_rresult.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -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'>
Modified: trunk/Open-ILS/web/opac/skin/default/xml/setenv.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/setenv.xml 2007-07-06 00:12:56 UTC (rev 7526)
+++ trunk/Open-ILS/web/opac/skin/default/xml/setenv.xml 2007-07-06 03:02:35 UTC (rev 7527)
@@ -30,13 +30,30 @@
<!--#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"-->
<!--#endif-->
More information about the open-ils-commits
mailing list