[open-ils-commits] r11086 - in trunk/Open-ILS: examples/apache web/reports/xul

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-11-06 17:31:46 -0500 (Thu, 06 Nov 2008)
New Revision: 11086

Modified:
   trunk/Open-ILS/examples/apache/eg_vhost.conf
   trunk/Open-ILS/web/reports/xul/template_builder.xul
Log:
More i18n prep for reports

Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-11-06 21:38:55 UTC (rev 11085)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-11-06 22:31:46 UTC (rev 11086)
@@ -269,16 +269,16 @@
 # ----------------------------------------------------------------------------------
 # 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

Modified: trunk/Open-ILS/web/reports/xul/template_builder.xul
===================================================================
--- trunk/Open-ILS/web/reports/xul/template_builder.xul	2008-11-06 21:38:55 UTC (rev 11085)
+++ trunk/Open-ILS/web/reports/xul/template_builder.xul	2008-11-06 22:31:46 UTC (rev 11086)
@@ -2,9 +2,26 @@
 <?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"/>
 <script src='/opac/common/js/CGI.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"/>