More i18n prep for reports

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

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 1fb4d63..005033a 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -269,16 +269,16 @@ RewriteRule ^/opac/[^/]+/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redir
 # ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
-<LocationMatch /reports/>
+<LocationMatch /reports>
     Options +Includes
     SetEnvIfNoCase Accept-Language "en" locale=en-US
     SetEnvIfNoCase Accept-Language "fr-CA" locale=fr-CA
     SetEnvIfNoCase Accept-Language "hy-AM" locale=hy-AM
-    AddOutputFilter INCLUDES .xhtml
+    AddOutputFilter INCLUDES;XMLENT .xhtml
 </LocationMatch>
 <LocationMatch /reports/fm_IDL.xml>
     Options +Includes
-    XMLEntStripDoctype "no"
+    XMLEntStripDoctype "yes"
     XMLEntStripComments "no"
     XMLEntContentType "text/xml; charset=utf-8"
     AddOutputFilter INCLUDES;XMLENT .xml

diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index b62a41a..766923a 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -2,8 +2,25 @@
 <?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" ?>
+<?xml-stylesheet href='/js/dojo/dojo/resources/dojo.css' type='text/css'?>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="loadIDL()">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+
+<!-- Load dojo -->
+<script type="text/javascript">
+<![CDATA[
+       var djConfig= {
+               isDebug: false,
+               parseOnLoad: true
+       }
+]]>
+</script>
+<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+<script type="text/javascript">
+<![CDATA[
+       dojo.require('dojo.parser');
+]]>
+</script>
 
 <script src='/opac/common/js/utils.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/config.js' type="application/x-javascript; e4x=1"/>
@@ -28,6 +45,12 @@
 <script src="transforms.js" type="application/x-javascript; e4x=1"/>
 <script src="operators.js" type="application/x-javascript; e4x=1"/>
 
+<script type="text/javascript">
+<![CDATA[
+       dojo.addOnLoad(loadIDL);
+]]>
+</script>
+
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/calendar.js"/>
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/lang/calendar-en.js"/>
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/calendar-setup.js"/>