projects / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f1cebca)
Backport r12600 from trunk for localized org tree support
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 19 Mar 2009 06:08:02 +0000 (06:08 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 19 Mar 2009 06:08:02 +0000 (06:08 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@12602 dcc99617-32d9-48b4-a31d-7c20da2025e4

18 files changed:
Open-ILS/examples/apache/eg_vhost.conf patch | blob | history
Open-ILS/web/opac/extras/bbags.xml patch | blob | history
Open-ILS/web/reports/oils_rpt_common.xhtml patch | blob | history
Open-ILS/web/reports/xul/template_builder.xul patch | blob | history
Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul patch | blob | history
Open-ILS/xul/staff_client/chrome/content/main/constants.js patch | blob | history
Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul patch | blob | history
Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/admin/printer_settings.html patch | blob | history
Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/main/ws_info.xul patch | blob | history
Open-ILS/xul/staff_client/server/patron/ue.xhtml patch | blob | history
Open-ILS/xul/staff_client/server/patron/user_edit.xhtml patch | blob | history

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 47e7012..6cdc44e 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -91,6 +91,10 @@ RewriteRule - - [E=locale:%1] [L]
 </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} ^$ [OR]
 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 @@ RewriteRule - - [E=locale:en-US] [L]
     XMLEntStripDoctype "yes"
     XMLEntContentType "text/html; charset=utf-8"
     AddOutputFilter INCLUDES;XMLENT .xhtml
+    AddOutputFilter INCLUDES;XMLENT .html
     allow from all
 </LocationMatch>
 
diff --git a/Open-ILS/web/opac/extras/bbags.xml b/Open-ILS/web/opac/extras/bbags.xml
index e701f29..9e7ebe3 100644 (file)
--- a/Open-ILS/web/opac/extras/bbags.xml
+++ b/Open-ILS/web/opac/extras/bbags.xml
@@ -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>
diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index 3f3c825..9666f1f 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -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>
diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 0e771ee..39bcfe2 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -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"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index 168e714..cc4e031 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -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'/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
index 2d12a70..77a0e3b 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -225,7 +225,7 @@ const urls = {
        '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',
diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index b404d3f..382b34c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -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">
diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
index 95345ba..51633b3 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index fb1fa07..7b71133 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
index 72906c9..c6cb676 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
index 540e44d..78f81af 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
index 48fd2d3..3e76c1f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
index c2e07da..15bf4c8 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
index c64694c..e9a2b02 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
index 92461ec..bfa76d6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/main/ws_info.xul b/Open-ILS/xul/staff_client/server/main/ws_info.xul
index 88e31f0..4cffbde 100644 (file)
--- a/Open-ILS/xul/staff_client/server/main/ws_info.xul
+++ b/Open-ILS/xul/staff_client/server/main/ws_info.xul
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index 9c51906..22c29d4 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -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>
diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
index 14de9b8..06975e0 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
@@ -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>
Evergreen ILS