[open-ils-commits] r12602 - in branches/rel_1_4/Open-ILS: examples/apache web/opac/extras web/reports web/reports/xul xul/staff_client/chrome/content/OpenILS xul/staff_client/chrome/content/main xul/staff_client/server/OpenILS xul/staff_client/server/admin xul/staff_client/server/main xul/staff_client/server/patron (dbs)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Mar 19 02:08:06 EDT 2009
Author: dbs
Date: 2009-03-19 02:08:02 -0400 (Thu, 19 Mar 2009)
New Revision: 12602
Modified:
branches/rel_1_4/Open-ILS/examples/apache/eg_vhost.conf
branches/rel_1_4/Open-ILS/web/opac/extras/bbags.xml
branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml
branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul
branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/main/constants.js
branches/rel_1_4/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/printer_settings.html
branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul
branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/ue.xhtml
branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
Log:
Backport r12600 from trunk for localized org tree support
Modified: branches/rel_1_4/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- branches/rel_1_4/Open-ILS/examples/apache/eg_vhost.conf 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/examples/apache/eg_vhost.conf 2009-03-19 06:08:02 UTC (rev 12602)
@@ -91,6 +91,10 @@
</LocationMatch>
<LocationMatch /opac/extras/>
+ # Force to en-US for now to satisfy bbags.xml
+ SetEnv locale en-US
+ Options +Includes
+ AddOutputFilter INCLUDES .xml
AddType application/xhtml+xml .xml
</LocationMatch>
@@ -121,7 +125,7 @@
RewriteCond %{ENV:locale} ^en$
RewriteRule - - [E=locale:en-US] [L]
-<LocationMatch /xul/.*\.xhtml$>
+<LocationMatch /xul/.*\.x?html$>
Options +Includes
XMLEntEscapeScript "no"
XMLEntStripComments "yes"
@@ -129,6 +133,7 @@
XMLEntStripDoctype "yes"
XMLEntContentType "text/html; charset=utf-8"
AddOutputFilter INCLUDES;XMLENT .xhtml
+ AddOutputFilter INCLUDES;XMLENT .html
allow from all
</LocationMatch>
Modified: branches/rel_1_4/Open-ILS/web/opac/extras/bbags.xml
===================================================================
--- branches/rel_1_4/Open-ILS/web/opac/extras/bbags.xml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/web/opac/extras/bbags.xml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -18,7 +18,7 @@
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -29,7 +29,7 @@
<script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
<script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
<script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
-<script type='text/javascript' src='/opac/common/js/OrgTree.js'> </script>
+<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
<script type='text/javascript' src='/opac/common/js/init.js'> </script>
<script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul
===================================================================
--- branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul 2009-03-19 06:08:02 UTC (rev 12602)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="reporter.css" type="text/css"?>
<?xml-stylesheet href="/opac/common/js/jscalendar/calendar-brown.css" type="text/css" ?>
@@ -38,7 +38,7 @@
<script src='/opac/common/js/fmgen.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/Cookies.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/opac_utils.js' type="application/x-javascript; e4x=1"/>
-<script src='/opac/common/js/OrgTree.js' type="application/x-javascript; e4x=1"/>
+<script src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/org_utils.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/RemoteRequest.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/md5.js' type="application/x-javascript; e4x=1"/>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul 2009-03-19 06:08:02 UTC (rev 12602)
@@ -12,7 +12,7 @@
<script type="text/javascript" src="util/fmall.js" />
<script type="text/javascript" src="util/fmgen.js" />
<script type="text/javascript" src="util/RemoteRequest.js" />
- <script type="text/javascript" src="util/OrgTree.js" />
+ <script type='text/javascript' src='util/en-US/OrgTree.js' />
<script type="text/javascript" src="util/org_utils.js" />
<script type="text/javascript" src="global_util.js" />
<messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/main/constants.js
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/main/constants.js 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/chrome/content/main/constants.js 2009-03-19 06:08:02 UTC (rev 12602)
@@ -225,7 +225,7 @@
'opac' : '/opac/en-US/skin/default/xml/advanced.xml?nps=1',
'opac_rdetail' : '/opac/en-US/skin/default/xml/rdetail.xml',
'opac_rresult' : '/opac/en-US/skin/default/xml/rresult.xml',
- 'org_tree' : '/opac/common/js/OrgTree.js',
+ 'org_tree' : '/opac/common/js/en-US/OrgTree.js',
'browser' : '/opac/en-US/skin/default/xml/advanced.xml?nps=1',
'fieldmapper' : '/opac/common/js/fmall.js',
'isodate_lib_remote' : '/opac/common/js/DP_DateExtensions.js',
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul 2009-03-19 06:08:02 UTC (rev 12602)
@@ -16,7 +16,7 @@
<script type="text/javascript" src="/opac/common/js/fmall.js" />
<script type="text/javascript" src="/opac/common/js/fmgen.js" />
<script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
- <script type="text/javascript" src="/opac/common/js/OrgTree.js" />
+ <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
<script type="text/javascript" src="/opac/common/js/org_utils.js" />
<script type="text/javascript" src="global_util.js" />
<menupopup id="clipboard">
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -22,7 +22,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -21,7 +21,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/printer_settings.html
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/printer_settings.html 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/printer_settings.html 2009-03-19 06:08:02 UTC (rev 12602)
@@ -7,7 +7,7 @@
<script type="text/javascript" src="/opac/common/js/fmall.js"></script>
<script type="text/javascript" src="/opac/common/js/fmgen.js"></script>
<script type="text/javascript" src="/opac/common/js/RemoteRequest.js"></script>
- <script type="text/javascript" src="/opac/common/js/OrgTree.js"></script>
+ <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'></script>
<script type="text/javascript" src="/opac/common/js/org_utils.js"></script>
<script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul 2009-03-19 06:08:02 UTC (rev 12602)
@@ -34,7 +34,7 @@
<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
<scripts id="openils_util_scripts"/>
- <script type="text/javascript" src="/opac/common/js/OrgTree.js"/>
+ <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'/>
<script type="text/javascript" src="/opac/common/js/org_utils.js"/>
<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
<script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/ue.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/ue.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/ue.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml 2009-03-19 06:06:42 UTC (rev 12601)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml 2009-03-19 06:08:02 UTC (rev 12602)
@@ -20,7 +20,7 @@
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
- <script language='javascript' src='/opac/common/js/OrgTree.js'> </script>
+ <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
<script language='javascript' src='/opac/common/js/init.js'> </script>
<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
More information about the open-ils-commits
mailing list