=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm	2011-01-13 15:44:09 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+    var i18n_must_select_at_least_one_indicator = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_indicator" ), "'")';
+    var i18n_must_select_at_least_one_unit = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_unit" ), "'")';
+    var i18n_must_select_at_least_one_period = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_period" ), "'")';
+</script>
+
 #macro ( getHeader )
 	#if ( $dimension == "period" )
 		$i18n.getString( "create_indicator_by_period_chart" )
@@ -16,7 +22,6 @@
 <input type="hidden" id="dimension" name="dimension" value="$!dimension">
 
 <table>
-    
     <tr>
         <th colspan="2">$i18n.getString( "chart" )</th>
     </tr>
@@ -91,9 +96,3 @@
 </form>
 
 <span id="message"></span>
-
-<script type="text/javascript">
-    var i18n_must_select_at_least_one_indicator = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_indicator" ), "'")';
-    var i18n_must_select_at_least_one_unit = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_unit" ), "'")';
-    var i18n_must_select_at_least_one_period = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_period" ), "'")';
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2011-01-18 18:24:58 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2011-03-18 14:45:12 +0000
@@ -155,4 +155,4 @@
     </td>
 </tr>
 	
-</table>
\ No newline at end of file
+</table>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm	2010-09-16 09:43:15 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm	2011-03-18 14:45:12 +0000
@@ -1,10 +1,13 @@
-<script>
+<script type="text/javascript">
 	jQuery(document).ready(	function(){
 		validation( 'documentForm', function( form ){			
 			form.submit();
 		},function(){
 		});	
+	
 		checkValueIsExist( "name", "validateDocument.action", {id: "$!document.id"} );
+	
+		toggleExternal();
 	});	
 	
 	function checkUploadFile(){
@@ -74,7 +77,3 @@
 </table>
 
 </form>
-
-<script>
-	toggleExternal();
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm	2011-02-28 17:34:25 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,20 @@
+<script type="text/javascript">
+	jQuery(document).ready(function() {
+		#if ( $dimension )
+		document.getElementById( "doIndicators" ).disabled = true;
+	    document.getElementById( "doOrganisationUnits" ).disabled = true;
+	    document.getElementById( "doPeriods" ).disabled = true;
+		#end
+    });
+
+    var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'")';
+    var i18n_must_enter_name = '$encoder.jsEscape( $i18n.getString( "must_enter_name" ), "'")';
+    var i18n_cannot_include_more_organisation_unit_regression = '$encoder.jsEscape( $i18n.getString( "cannot_include_more_organisation_unit_regression" ), "'")';
+    var i18n_must_select_at_least_one_indictor_data_element_data_set = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_indictor_data_element_data_set" ), "'")';
+    var i18n_must_select_at_least_one_unit = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_unit" ), "'")';
+    var i18n_must_select_at_least_one_period = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_period" ), "'")';
+    var i18n_cannot_select_orgunit_and_parent_orgunit_param = '$encoder.jsEscape( $i18n.getString( "cannot_select_orgunit_and_parent_orgunit_param" ), "'")';
+</script>
 
 <h3>$i18n.getString( "create_report_table" )</h3>
 
@@ -443,21 +460,3 @@
 </form>
 
 <span id="message"></span>
-
-<script type="text/javascript">
-    var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'")';
-    var i18n_must_enter_name = '$encoder.jsEscape( $i18n.getString( "must_enter_name" ), "'")';
-    var i18n_cannot_include_more_organisation_unit_regression = '$encoder.jsEscape( $i18n.getString( "cannot_include_more_organisation_unit_regression" ), "'")';
-    var i18n_must_select_at_least_one_indictor_data_element_data_set = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_indictor_data_element_data_set" ), "'")';
-    var i18n_must_select_at_least_one_unit = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_unit" ), "'")';
-    var i18n_must_select_at_least_one_period = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_period" ), "'")';
-    var i18n_cannot_select_orgunit_and_parent_orgunit_param = '$encoder.jsEscape( $i18n.getString( "cannot_select_orgunit_and_parent_orgunit_param" ), "'")';
-</script>
-
-#if ( $dimension )
-<script type="text/javascript">
-	document.getElementById( "doIndicators" ).disabled = true;
-    document.getElementById( "doOrganisationUnits" ).disabled = true;
-    document.getElementById( "doPeriods" ).disabled = true;
-</script>
-#end

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-03-11 12:35:11 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+    var i18n_select_data_set = '$encoder.jsEscape( $i18n.getString( "select_data_set" ), "'")';
+    var i18n_select_period = '$encoder.jsEscape( $i18n.getString( "select_period" ), "'")';
+    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
+    var i18n_generating_report = '$encoder.jsEscape( $i18n.getString( "generating_report" ), "'")';    
+</script>
 
 <h3>$i18n.getString( "dataset_report" )</h3>
 
@@ -76,10 +82,3 @@
 </form>
 
 <span id="message">$!message</span>
-
-<script type="text/javascript">
-    var i18n_select_data_set = '$encoder.jsEscape( $i18n.getString( "select_data_set" ), "'")';
-    var i18n_select_period = '$encoder.jsEscape( $i18n.getString( "select_period" ), "'")';
-    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
-    var i18n_generating_report = '$encoder.jsEscape( $i18n.getString( "generating_report" ), "'")';    
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2011-03-08 01:55:01 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+	jQuery(document).ready(function() {
+		#if( !$!reportParams.isSet() )
+		generateReport( '' );
+		#end
+	});
+
+    var i18n_process_completed = '$encoder.jsEscape( $i18n.getString( "process_completed" ), "'")';
+    var i18n_please_wait = '$encoder.jsEscape( $i18n.getString( "please_wait" ), "'")';
+	var i18n_please_select_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
+</script>
 
 <h3>$i18n.getString( "report_table_parameters" )</h3>
 
@@ -93,15 +104,3 @@
 </table>
 
 <span id="message"></span>
-
-<script type="text/javascript">
-    var i18n_process_completed = '$encoder.jsEscape( $i18n.getString( "process_completed" ), "'")';
-    var i18n_please_wait = '$encoder.jsEscape( $i18n.getString( "please_wait" ), "'")';
-	var i18n_please_select_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
-</script>
-
-#if( !$!reportParams.isSet() )
-<script type="text/javascript">
-generateReport( '' );
-</script>
-#end

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2011-02-03 16:35:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2011-03-18 14:45:12 +0000
@@ -23,4 +23,4 @@
 <h2>$i18n.getString( "scheduling" )&nbsp;</h2>
 <ul>
 	<li><a href="viewScheduledTasks.action">$i18n.getString( "scheduling" )</a></li>
-</ul>
\ No newline at end of file
+</ul>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm	2011-03-16 16:26:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+	function printDateSetReportPreview()
+	{
+		var o = jQuery("div#printDateSetPreviewDiv");
+		o.jqprint(); 
+	}
+</script>
 
 <h3>$i18n.getString('reporting_unit'): $reportingUnit &nbsp; $i18n.getString('reporting_period'): $reportingPeriod</h3>
 <p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
@@ -5,11 +12,3 @@
 <div id="printDateSetPreviewDiv">
 	$customDataEntryFormCode
 </div>
-
-<script>	
-function printDateSetReportPreview()
-{
-	var o = $("div#printDateSetPreviewDiv");
-	o.jqprint(); 
-}
-</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2011-03-16 16:26:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+	function printDateSetReportPreview()
+	{
+		var o = jQuery("div#printDateSetPreviewDiv");
+		o.jqprint(); 
+	}
+</script>
 
 <h3>$i18n.getString('reporting_unit'): $reportingUnit &nbsp; $i18n.getString('reporting_period'): $reportingPeriod</h3>
 <p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
@@ -5,11 +12,3 @@
 <div id="printDateSetPreviewDiv">
 #parse( "dhis-web-commons/ajax/htmlGrid.vm" )
 </div>
-
-<script>	
-function printDateSetReportPreview()
-{
-	var o = $("div#printDateSetPreviewDiv");
-	o.jqprint(); 
-}
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2011-03-16 21:25:24 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,11 @@
+<script type="text/javascript">
+	function printDateSetReportPreview()
+	{
+		var o = jQuery("div#printDateSetPreviewDiv");
+		o.jqprint(); 
+	}
+</script>
+
 <h3>$i18n.getString('reporting_unit'): $reportingUnit &nbsp; $i18n.getString('reporting_period'): $reportingPeriod</h3>
 <p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
 
@@ -33,11 +41,3 @@
 <br>
 #end
 </div>
-
-<script>	
-function printDateSetReportPreview()
-{
-	var o = $("div#printDateSetPreviewDiv");
-	o.jqprint(); 
-}
-</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm	2011-01-18 18:24:58 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm	2011-03-18 14:45:12 +0000
@@ -1,10 +1,13 @@
 <script type="text/javascript">
-
 	jQuery(document).ready( function(){
 		// Override the listener after tree loaded succesfully
 		selectionTreeSelection.setListenerFunction( setSelectedOrganisationUnitIds );
 	});
-	
+
+	var i18n_type_tally_sheet_name = '$encoder.jsEscape( $i18n.getString( "type_tally_sheet_name" ), "'")'; 
+    var i18n_select_data_set = '$encoder.jsEscape( $i18n.getString( "select_data_set" ), "'")';
+    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
+    var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ), "'")';    
 </script>
 
 <h3>$i18n.getString( "tally_sheet_generator" )</h3>
@@ -64,10 +67,3 @@
 
 </form>
 <span id="message">$!message</span>
-
-<script type="text/javascript">
-	var i18n_type_tally_sheet_name = '$encoder.jsEscape( $i18n.getString( "type_tally_sheet_name" ), "'")'; 
-    var i18n_select_data_set = '$encoder.jsEscape( $i18n.getString( "select_data_set" ), "'")';
-    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
-    var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ), "'")';    
-</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm	2011-01-25 13:49:21 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){		
+		tableSorter( 'listTable' );	
+	});
+
+	var i18n_please_wait = '$encoder.jsEscape( $i18n.getString( "please_wait" ), "'")';
+    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_chart" ), "'")';
+    var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ), "'")';
+    var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ), "'")';
+</script>
+
 <h3>$i18n.getString( "chart" )</h3>
 
 <table class="mainPageTable">
@@ -65,13 +76,3 @@
         </td>       
     </tr>
 </table>
-
-<script type="text/javascript">
-	var i18n_please_wait = '$encoder.jsEscape( $i18n.getString( "please_wait" ), "'")';
-    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_chart" ), "'")';
-    var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ), "'")';
-    var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ), "'")';
-	jQuery(document).ready(function(){		
-		tableSorter( 'listTable' );	
-	});
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-02-18 20:20:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,19 @@
+<script type="text/javascript">
+	jQuery(document).ready(function() {
+		selectionTreeSelection.setListenerFunction( displayCompleteness );
+		selectionTreeSelection.setMultipleSelectionAllowed( false );
+		selectionTree.clearSelectedOrganisationUnits();
+		selectionTree.buildSelectionTree();
+	});
+
+	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
+    var i18n_dataset = '$encoder.jsEscape( $i18n.getString( "dataset" ) , "'")';
+    var i18n_organisation_unit = '$encoder.jsEscape( $i18n.getString( "organisation_unit" ) , "'")';
+    var i18n_actual = '$encoder.jsEscape( $i18n.getString( "actual" ) , "'")';
+    var i18n_target = '$encoder.jsEscape( $i18n.getString( "target" ) , "'")';
+    var i18n_percent = '$encoder.jsEscape( $i18n.getString( "percent" ) , "'")';
+    var i18n_on_time = '$encoder.jsEscape( $i18n.getString( "on_time" ) , "'")';
+</script>
 
 <h3>$i18n.getString( "data_completeness_report" )</h3>
 
@@ -59,20 +75,3 @@
 #parse( "dhis-web-commons/loader/loader.vm" )
 
 <div id="contentDiv"></div>
-
-<script type="text/javascript">
-	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
-    var i18n_dataset = '$encoder.jsEscape( $i18n.getString( "dataset" ) , "'")';
-    var i18n_organisation_unit = '$encoder.jsEscape( $i18n.getString( "organisation_unit" ) , "'")';
-    var i18n_actual = '$encoder.jsEscape( $i18n.getString( "actual" ) , "'")';
-    var i18n_target = '$encoder.jsEscape( $i18n.getString( "target" ) , "'")';
-    var i18n_percent = '$encoder.jsEscape( $i18n.getString( "percent" ) , "'")';
-    var i18n_on_time = '$encoder.jsEscape( $i18n.getString( "on_time" ) , "'")';
-</script>
-
-<script type="text/javascript">
-	selectionTreeSelection.setListenerFunction( displayCompleteness );
-	selectionTreeSelection.setMultipleSelectionAllowed( false );
-	selectionTree.clearSelectedOrganisationUnits();
-	selectionTree.buildSelectionTree();
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm	2011-01-25 13:49:21 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,11 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){		
+		tableSorter( 'listTable' );	
+	});
+
+    var i18n_confirm_remove_report = '$encoder.jsEscape( $i18n.getString( "confirm_remove_report" ) , "'")';
+    var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
+</script>
 
 <h3>$i18n.getString( "static_report" )</h3>
 
@@ -66,11 +74,3 @@
         </td>
     </tr>
 </table>
-
-<script type="text/javascript">
-    var i18n_confirm_remove_report = '$encoder.jsEscape( $i18n.getString( "confirm_remove_report" ) , "'")';
-    var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
-	jQuery(document).ready(function(){		
-		tableSorter( 'listTable' );	
-	});
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm	2011-02-28 02:42:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+	jQuery(document).ready(function() {
+		selectionTreeSelection.setMultipleSelectionAllowed( false );
+		selectionTreeSelection.setListenerFunction( organisationUnitSelected );
+		selectionTree.clearSelectedOrganisationUnits();
+		selectionTree.buildSelectionTree();
+	});
+
+	var i18n_select_group_set = '$encoder.jsEscape( $i18n.getString( "please_select_group_set" ) , "'")';
+	var i18n_select_org_unit = '$encoder.jsEscape( $i18n.getString( "please_select_org_unit" ) , "'")';
+</script>
 
 <h3>$i18n.getString( "orgunit_distribution" )</h3>
 
@@ -36,16 +47,6 @@
 
 </table>
 
-<script type="text/javascript">
-selectionTreeSelection.setMultipleSelectionAllowed( false );
-selectionTreeSelection.setListenerFunction( organisationUnitSelected );
-selectionTree.clearSelectedOrganisationUnits();
-selectionTree.buildSelectionTree();
-
-var i18n_select_group_set = '$encoder.jsEscape( $i18n.getString( "please_select_group_set" ) , "'")';
-var i18n_select_org_unit = '$encoder.jsEscape( $i18n.getString( "please_select_org_unit" ) , "'")';
-</script>
-
 #parse( "dhis-web-commons/loader/loader.vm" )
 
 <!-- Table -->

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-03-15 23:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-03-18 14:45:12 +0000
@@ -1,6 +1,26 @@
+<script type="text/javascript">
+   jQuery(document).ready(function(){
+		<!-- Init page -->
+		loadListeners();
+
+		selectionTreeSelection.setMultipleSelectionAllowed( false );
+		selectionTreeSelection.setListenerFunction( organisationUnitSelected );
+		selectionTree.clearSelectedOrganisationUnits();
+		selectionTree.buildSelectionTree();
+
+		<!-- Calendar setup -->
+		datePickerInRange( 'startDate' , 'endDate' );	
+		
+		<!-- I18n variables -->
+		var i18n_indicator_group = '$encoder.jsEscape( $i18n.getString( "indicator_group" ) , "'")';
+		var i18n_start_date = '$encoder.jsEscape( $i18n.getString( "start_date" ) , "'")';
+		var i18n_end_date = '$encoder.jsEscape( $i18n.getString( "end_date" ) , "'")';
+		var i18n_period_type = '$encoder.jsEscape( $i18n.getString( "period_type" ) , "'")';
+		var i18n_organisation_unit_level = '$encoder.jsEscape( $i18n.getString( "organisation_unit_level" ) , "'")';
+	});
+</script>
 
 <style type="text/css">
-
 .pivot td
 {
   border: 1px solid #d0d0d0;
@@ -182,32 +202,3 @@
 <table id="pivotTable" class="pivot"></table>
 
 </div>
-
-<!-- I18n variables -->
-
-<script type="text/javascript">
-    var i18n_indicator_group = '$encoder.jsEscape( $i18n.getString( "indicator_group" ) , "'")';
-    var i18n_start_date = '$encoder.jsEscape( $i18n.getString( "start_date" ) , "'")';
-    var i18n_end_date = '$encoder.jsEscape( $i18n.getString( "end_date" ) , "'")';
-    var i18n_period_type = '$encoder.jsEscape( $i18n.getString( "period_type" ) , "'")';
-    var i18n_organisation_unit_level = '$encoder.jsEscape( $i18n.getString( "organisation_unit_level" ) , "'")';
-</script>
-
-<!-- Init page -->
-
-<script type="text/javascript">
-  loadListeners();
-  
-  selectionTreeSelection.setMultipleSelectionAllowed( false );
-  selectionTreeSelection.setListenerFunction( organisationUnitSelected );
-  selectionTree.clearSelectedOrganisationUnits();
-  selectionTree.buildSelectionTree();
-</script>
-
-<!-- Calendar setup -->
-
-<script type="text/javascript">
-   jQuery(document).ready(function(){
-		datePickerInRange( 'startDate' , 'endDate' );	
-	});
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm	2011-02-22 23:05:45 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,11 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){		
+		tableSorter( 'listTable' );	
+	});
+
+    var i18n_confirm_remove_report = '$encoder.jsEscape( $i18n.getString( "confirm_remove_report" ) , "'")';
+    var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
+</script>
 
 <h3>$i18n.getString( "standard_report" )</h3>
 
@@ -57,11 +65,3 @@
         </td>
     </tr>
 </table>
-
-<script type="text/javascript">
-    var i18n_confirm_remove_report = '$encoder.jsEscape( $i18n.getString( "confirm_remove_report" ) , "'")';
-    var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
-	jQuery(document).ready(function(){		
-		tableSorter( 'listTable' );	
-	});
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm	2011-02-03 16:35:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm	2011-03-18 14:45:12 +0000
@@ -12,4 +12,4 @@
 #end
 >
 <input type="button" style="width:140px" onclick="window.location.href='viewScheduledTasks.action'" value="$i18n.getString( 'refresh' )">
-</p>
\ No newline at end of file
+</p>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2011-02-27 22:34:30 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2011-03-18 14:45:12 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){		
+		tableSorter( 'listTable' );	
+	});
+
+	var i18n_generate_before_export = '$encoder.jsEscape( $i18n.getString( "generate_before_export" ) , "'")';
+	var i18n_confirm_add_report_table_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_report_table_to_dashboard" ) , "'")';
+    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_table" ) , "'")';
+    var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
+    var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
+</script>
 
 <h3>$i18n.getString( "report_table" ) #openHelp( "reportTable" )</h3>
 
@@ -69,14 +80,3 @@
 		</td>		
 	</tr>
 </table>
-
-<script type="text/javascript">
-	var i18n_generate_before_export = '$encoder.jsEscape( $i18n.getString( "generate_before_export" ) , "'")';
-	var i18n_confirm_add_report_table_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_report_table_to_dashboard" ) , "'")';
-    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_table" ) , "'")';
-    var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
-    var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
-	jQuery(document).ready(function(){		
-		tableSorter( 'listTable' );	
-	});
-</script>