[fusion-commits] r2024 - in trunk: text widgets widgets/Print

[svn_fusion at osgeo.org]

Author: hubu
Date: 2009-12-21 02:14:10 -0500 (Mon, 21 Dec 2009)
New Revision: 2024

Removed:
   trunk/widgets/Print/Print.html
Modified:
   trunk/text/en.json
   trunk/widgets/Print.js
Log:
This submission fix the ticket #351:Print widget doesn't work with IIS7

Modified: trunk/text/en.json
===================================================================
--- trunk/text/en.json	2009-12-18 21:01:07 UTC (rev 2023)
+++ trunk/text/en.json	2009-12-21 07:14:10 UTC (rev 2024)
@@ -53,5 +53,12 @@
 'zoomRect': 'Zoom Rectangle',
 'maptipLinkText': 'Click for more information',
 
+#Print UI
+'PRINTSHOWTITLE':'Show Title?'
+'PRINTOPTIONS'	:'Options'
+'PRINTTITLE':'Title'
+'PRINTSHOWLEGEND':'Show Legend?'
+'PRINTSHOWNORTHARROW':'Show North Arrow?'
+
 'end': ''
 };

Deleted: trunk/widgets/Print/Print.html
===================================================================
--- trunk/widgets/Print/Print.html	2009-12-18 21:01:07 UTC (rev 2023)
+++ trunk/widgets/Print/Print.html	2009-12-21 07:14:10 UTC (rev 2024)
@@ -1,13 +0,0 @@
-<div class="PrintDialogForm">
-  <fieldset class="PrintDialogOptions">
-	  <legend>Options</legend>
-	  	<label class="block" for="dialogPrintShowtitle"><input name="dialogPrintShowtitle" id="dialogPrintShowtitle" type="checkbox" value="showtitle" checked>
-			Show Title?</label>
-		<label class="block" for="dialogPrintTitle">Title</label>
-		<input name="dialogPrintTitle" id="dialogPrintTitle" type="text" class="inputText" />
-		<label class="block" for="dialogPrintShowlegend"><input name="dialogPrintShowlegend" id="dialogPrintShowlegend" type="checkbox" value="showlegend" checked>
-			Show Legend?</label>
-		<label class="block" for="dialogPrintShowNorthArrow"><input name="dialogPrintShowNorthArrow" id="dialogPrintShowNorthArrow" type="checkbox" value="shownortharrow" checked>
-			Show North Arrow?</label>
-  </fieldset>
-</div>
\ No newline at end of file

Modified: trunk/widgets/Print.js
===================================================================
--- trunk/widgets/Print.js	2009-12-18 21:01:07 UTC (rev 2023)
+++ trunk/widgets/Print.js	2009-12-21 07:14:10 UTC (rev 2024)
@@ -82,14 +82,26 @@
             var o = {
                 label: OpenLayers.i18n('printTitle'),
                 id: 'printablePage',
-                contentURL : this.dialogContentURL,
-                onContentLoaded: OpenLayers.Function.bind(this.contentLoaded, this),
+                content : '<div class="PrintDialogForm">' +
+                              '<fieldset class="PrintDialogOptions">' +
+                                  '<legend>' + OpenLayers.i18n("PRINTOPTIONS") +'</legend>' +
+                                    '<label class="block" for="dialogPrintShowtitle"><input name="dialogPrintShowtitle" id="dialogPrintShowtitle" type="checkbox" value="showtitle" checked>' +
+                                         OpenLayers.i18n("PRINTSHOWTITLE") +'</label>' +
+                                    '<label class="block" for="dialogPrintTitle">' + OpenLayers.i18n("PRINTTITLE") + '</label>' +
+                                    '<input name="dialogPrintTitle" id="dialogPrintTitle" type="text" class="inputText" />' +
+                                    '<label class="block" for="dialogPrintShowlegend"><input name="dialogPrintShowlegend" id="dialogPrintShowlegend" type="checkbox" value="showlegend" checked>' +
+                                         OpenLayers.i18n("PRINTSHOWLEGEND") + '</label>' +
+                                    '<label class="block" for="dialogPrintShowNorthArrow"><input name="dialogPrintShowNorthArrow" id="dialogPrintShowNorthArrow" type="checkbox" value="shownortharrow" checked>' +
+                                         OpenLayers.i18n("PRINTSHOWNORTHARROW") + '</label>' +
+                              '</fieldset>' +
+                            '</div>',
                 width: 350,
                 height: 250,
                 resize: true,
                 toolbars: [toolbar]
             };
             var d = new Jx.Dialog(o);
+			d.addEvent("contentLoaded", this.contentLoaded.bind(this));
             toolbar.add(
                 new Jx.Button({
                     label: OpenLayers.i18n('printGenerate'),