=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm	2010-05-25 04:08:37 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm	2011-03-18 13:02:09 +0000
@@ -1,3 +1,13 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){	
+		datePickerInRange( 'startDate' , 'endDate' );	
+	});
+
+    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
+    var i18n_select_startdate = '$encoder.jsEscape( $i18n.getString( "select_startdate" ), "'")';
+    var i18n_select_enddate = '$encoder.jsEscape( $i18n.getString( "select_enddate" ), "'")';
+    var i18n_select_datasets = '$encoder.jsEscape( $i18n.getString( "select_datasets" ), "'")';
+</script>
 
 <h3>$i18n.getString( "$exportFormat" ) $i18n.getString( "data_export" ) #openHelp( "export" )</h3>
 
@@ -97,13 +107,7 @@
   	<tr>
 		<td colspan="3" height="15"></td>
 	</tr>
-  
-	<script type="text/javascript">
-    	$(document).ready(function(){	
-			datePickerInRange( 'startDate' , 'endDate' );	
-		});
-	</script>
-	  
+  	  
 	<!-- DataSets -->
 	
 	<tr>
@@ -143,10 +147,3 @@
 </form>
 
 <span id="message"></span>
-
-<script type="text/javascript">
-    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
-    var i18n_select_startdate = '$encoder.jsEscape( $i18n.getString( "select_startdate" ), "'")';
-    var i18n_select_enddate = '$encoder.jsEscape( $i18n.getString( "select_enddate" ), "'")';
-    var i18n_select_datasets = '$encoder.jsEscape( $i18n.getString( "select_datasets" ), "'")';
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm	2010-07-30 12:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm	2011-03-18 13:02:09 +0000
@@ -1,3 +1,6 @@
+<script type="text/javascript">
+    var i18n_select_one_or_more_object_types = '$encoder.jsEscape( $i18n.getString( "select_one_or_more_object_types" ), "'")';
+</script>
 
 <h3>$i18n.getString( "$exportFormat" ) $i18n.getString( "metadata_export" ) #openHelp( "export" )</h3>
 
@@ -101,7 +104,3 @@
 </form>
 
 <span id="message"></span>
-
-<script type="text/javascript">
-    var i18n_select_one_or_more_object_types = '$encoder.jsEscape( $i18n.getString( "select_one_or_more_object_types" ), "'")';
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm	2010-11-19 09:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm	2011-03-18 13:02:09 +0000
@@ -1,6 +1,12 @@
-
 <script type="text/javascript">
 	getImportStatus();
+
+	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'" )';
+	var i18n_importing = '$encoder.jsEscape( $i18n.getString( "importing" ), "'" )';
+	var i18n_show_advanced_options = '$encoder.jsEscape( $i18n.getString( "show_advanced_options" ), "'" )';
+	var i18n_hide_advanced_options = '$encoder.jsEscape( $i18n.getString( "hide_advanced_options" ), "'" )';
+	var i18n_completed = '$encoder.jsEscape( $i18n.getString( "completed" ), "'" )';
+	var i18n_current_import_file = '$encoder.jsEscape( $i18n.getString( "current_import_file" ), "'" )';
 </script>
 
 <h3>$i18n.getString( "$importFormat" ) $i18n.getString( "import" ) #openHelp( "import" )</h3>
@@ -127,14 +133,4 @@
 </form>
 
 <span id="message"></span>
-
 <span id="info"></span>
-
-<script type="text/javascript">
-	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'" )';
-	var i18n_importing = '$encoder.jsEscape( $i18n.getString( "importing" ), "'" )';
-	var i18n_show_advanced_options = '$encoder.jsEscape( $i18n.getString( "show_advanced_options" ), "'" )';
-	var i18n_hide_advanced_options = '$encoder.jsEscape( $i18n.getString( "hide_advanced_options" ), "'" )';
-	var i18n_completed = '$encoder.jsEscape( $i18n.getString( "completed" ), "'" )';
-	var i18n_current_import_file = '$encoder.jsEscape( $i18n.getString( "current_import_file" ), "'" )';
-</script>