[open-ils-commits] r11085 - trunk/Open-ILS/web/reports

svn at svn.open-ils.org svn at svn.open-ils.org
Thu Nov 6 16:39:00 EST 2008


Author: dbs
Date: 2008-11-06 16:38:55 -0500 (Thu, 06 Nov 2008)
New Revision: 11085

Modified:
   trunk/Open-ILS/web/reports/oils_rpt.xhtml
   trunk/Open-ILS/web/reports/oils_rpt_builder.xhtml
   trunk/Open-ILS/web/reports/oils_rpt_common.xhtml
Log:
Lay the groundwork for Dojo i18n of dynamic strings

Modified: trunk/Open-ILS/web/reports/oils_rpt.xhtml
===================================================================
--- trunk/Open-ILS/web/reports/oils_rpt.xhtml	2008-11-06 20:20:52 UTC (rev 11084)
+++ trunk/Open-ILS/web/reports/oils_rpt.xhtml	2008-11-06 21:38:55 UTC (rev 11085)
@@ -11,9 +11,20 @@
 	<head>
 		<title>Evergreen: Reports</title>
 		<!--#include virtual="oils_rpt_common.xhtml"-->
+		<script type="text/javascript">
+		<![CDATA[
+			var rptInit = function() {
+				if (oilsInitReports()) {
+					oilsRtpInitFolders();
+				}
+			}
+			dojo.addOnLoad(rptInit);
+			dojo.addOnUnload(oilsCleanupReports);
+		]]>
+		</script>
 	</head>
 
-	<body onload='if(oilsInitReports())oilsRtpInitFolders();' onunload='oilsCleanupReports();'>
+	<body>
 		<div class='welcome_box'>
 			<span>You are logged in as </span><b><span id='oils_rpt_user'/></b>
 		</div>

Modified: trunk/Open-ILS/web/reports/oils_rpt_builder.xhtml
===================================================================
--- trunk/Open-ILS/web/reports/oils_rpt_builder.xhtml	2008-11-06 20:20:52 UTC (rev 11084)
+++ trunk/Open-ILS/web/reports/oils_rpt_builder.xhtml	2008-11-06 21:38:55 UTC (rev 11085)
@@ -11,9 +11,16 @@
 	<head>
 		<title>Evergreen: Report Builder</title>
 		<!--#include virtual="oils_rpt_common.xhtml"-->
+		<script type="text/javascript">
+		<![CDATA[
+			dojo.addOnLoad(oilsInitReportBuilder);
+			dojo.addOnUnload(oilsCleanupReports);
+		]]>
+		</script>
+
 	</head>
 
-	<body onload='oilsInitReportBuilder();' onunload='oilsCleanupReports();'>
+	<body>
 
 		<div class='welcome_box'>
 			<span>You are logged in as </span><b><span id='oils_rpt_user'/></b>

Modified: trunk/Open-ILS/web/reports/oils_rpt_common.xhtml
===================================================================
--- trunk/Open-ILS/web/reports/oils_rpt_common.xhtml	2008-11-06 20:20:52 UTC (rev 11084)
+++ trunk/Open-ILS/web/reports/oils_rpt_common.xhtml	2008-11-06 21:38:55 UTC (rev 11085)
@@ -1,22 +1,43 @@
-<script language='javascript' src='/opac/common/js/utils.js'> </script>
-<script language='javascript' src='/opac/common/js//config.js'> </script> 
-<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-<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/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/org_utils.js'> </script>
-<script language='javascript' src='/opac/common/js/init.js'> </script>
-<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-<script language='javascript' src='/opac/common/js/slimtree.js'> </script>
-<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-<script language='javascript' src='/opac/common/js/fm_table.js'> </script>
-<script language='javascript' src='/opac/common/js/fm_table_conf.js'> </script>
-<script language='javascript' src='/opac/common/js/md5.js'> </script>
-<script>
+<!-- Load dojo -->
+<style type="text/css">
+	@import url('/js/dojo/dojo/resources/dojo.css');
+	@import url('/js/dojo/dijit/themes/tundra/tundra.css');
+	@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+</style>
+<script type="text/javascript">
+	var djConfig= {
+		isDebug: false,
+		parseOnLoad: true
+	}
+</script>
+<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+<script type="text/javascript">
+	dojo.require('dojo.parser');
+
+	function status_update (markup) {
+		dojo.byId('status_text').innerHTML = markup;
+	}
+</script>
+
+<script type='text/javascript' src='/opac/common/js/utils.js'> </script>
+<script type='text/javascript' src='/opac/common/js//config.js'> </script> 
+<script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
+<script type='text/javascript' src='/opac/common/js/Cookie.js'> </script>
+<script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
+<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/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/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>
+<script type='text/javascript' src='/opac/common/js/slimtree.js'> </script>
+<script type='text/javascript' src='/opac/common/js/sorttable.js'> </script>
+<script type='text/javascript' src='/opac/common/js/fm_table.js'> </script>
+<script type='text/javascript' src='/opac/common/js/fm_table_conf.js'> </script>
+<script type='text/javascript' src='/opac/common/js/md5.js'> </script>
+<script type="text/javascript">
 	stpicopen  = '../opac/images/slimtree/folder2.gif';
 	stpicclose = '../opac/images/slimtree/folderopen2.gif';
 	stpicblank = '../opac/images/slimtree/page.gif';
@@ -50,7 +71,7 @@
 <link type='text/css' rel='stylesheet' href="/opac/common/css/fm_table.css"/>
 <link rel="stylesheet" type="text/css" href="oils_rpt.css"> </link>
 
-<script>function _l(l) { location.href = l + location.search; }</script>
+<script type="text/javascript">function _l(l) { location.href = l + location.search; }</script>
 
 
 



More information about the open-ils-commits mailing list