=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm	2010-08-31 11:27:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm	2010-09-20 12:49:15 +0000
@@ -99,7 +99,7 @@
         </tr>
         <tr>
             <td>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+                
                 <input type="button" name="ViewSummary" value="View DataSummary" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('SummaryStatus')"/>
                 <input type="button" name="ViewStatus" value="View DataStatus" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('DataStatus')"/>
             </td>
@@ -108,7 +108,7 @@
                 <input type="button" name="LastUpdatedStatus" value="   User Details   " style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('LastUpdatedStatus')"/>
             </td>
             <td>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+                
                 <input type="button" name="ViewGroupWise" value="View By Data Element Group" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('GroupWiseStatus')"/>
                 <input type="button" name="ValidationStatus" value="Validation Status" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('ValidationStatus')"/>
             </td>

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js	2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js	2010-09-20 12:49:15 +0000
@@ -121,6 +121,11 @@
 function formValidations()
 {
 		
+	//var selriRadioButton = document.ChartGenerationForm.riRadio.value;
+	var selriRadioButton = $( "input[name='riRadio']:checked" ).val();
+	//alert(selriRadioButton);
+	//alert(criteria);
+	//alert(document.ChartGenerationForm.riRadio.value);
 	var selOUListLength = document.ChartGenerationForm.orgUnitListCB.options.length;
 	var selDEListSize  = document.ChartGenerationForm.selectedDataElements.options.length;
 	var selIndListSize  = document.ChartGenerationForm.selectedIndicators.options.length;
@@ -135,15 +140,15 @@
         
     if(selOUListLength <= 0 && document.getElementById( 'ougSetCB' ).checked ) {alert("Please Select OrganisationUnitGroup");return false;}
     else if(selOUListLength <= 0 ) {alert("Please Select OrganisationUnit");return false;}
-    else if(selriRadioButton == "dataElementsRadio" && selDEListSize <= 0)	 {alert("Please Select DataElement(s)");return false;}
-    else if(selriRadioButton == "indicatorsRadio" && selIndListSize <= 0) {alert("Please Select Indicator(s)");return false;}
+    else if(selriRadioButton == 'dataElementsRadio' && selDEListSize <= 0)	 {alert("Please Select DataElement(s)");return false;}
+    else if(selriRadioButton == 'indicatorsRadio' && selIndListSize <= 0) {alert("Please Select Indicator(s)");return false;}
     else if(sDateIndex < 0) {alert("Please Select Starting Period");return false;}
     else if(eDateIndex < 0) {alert("Please Select Ending Period");return false;}
     else if(category < 0) {alert("Please Select Category");return false;}
     else if(sDate > eDate) {alert("Starting Date is Greater");return false;}
 
 	var k=0;
-	if(selriRadioButton == "dataElementsRadio")
+	if(selriRadioButton == 'dataElementsRadio')
 	{
 		for(k=0;k<document.ChartGenerationForm.selectedDataElements.options.length;k++)
     	{

=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportAssociations.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportAssociations.vm	2010-08-19 10:40:50 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportAssociations.vm	2010-09-20 12:49:15 +0000
@@ -10,61 +10,15 @@
   <table id="selectionTable">
     <tr>
       <td>
-        <input type="button" value="$i18n.getString( "remove_all" )" onclick="window.location.href='unselectAll.action?reportId=$reportId'" style="width:12em">
-        <input type="button" value="$i18n.getString( "select_all_at_level" )" onclick="selectAllAtLevel( $reportId )" style="width:12em">
-        <select id="levelList" name="levelList" style="width:12em">
-            #foreach( $level in $levels )
-                <option value="$level.level" #if ( $selectLevel == $level.level )selected="selcted"#end>$encoder.htmlEncode( $level.name )</option>
-            #end
-        </select>
-        <input type="button" value="$i18n.getString( "unselect_all_at_level" )" onclick="unselectAllAtLevel( $reportId )" style="width:12em">
-      </td>
-    </tr>
-    <tr>
-      <td>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  
-        <!--<input type="button" value="$i18n.getString( "remove_all" )" onclick="window.location.href='unselectAll.action?reportId=$reportId'" style="width:12em">-->
-        <input type="button" value="$i18n.getString( "select_all_at_group" )" onclick="selectAllAtGroup( $reportId )" style="width:12em">
-        <select id="groupList" name="groupList" style="width:12em">
-            #foreach( $group in $orgUnitGroups )
-                <option value="$group.id" #if ( $selectgroup == $group.id )selected="selcted"#end>$encoder.htmlEncode( $group.name )</option>
-            #end
-        </select>
-        <input type="button" value="$i18n.getString( "unselect_all_at_group" )" onclick="unselectAllAtGroup( $reportId )" style="width:12em">
-      </td>
-    </tr>       
-    <tr>
-      <td>
-        <div id="selectionTree" style="width:50em;height:30em;overflow:auto;border:1px solid #cccccc"></div>
-
-        <script type="text/javascript">
-
-          selectionTreeSelection.setMultipleSelectionAllowed( true );
-          selectionTreeSelection.setOnSelectFunction( treeClicked );
-          selectionTreeSelection.setListenerFunction( selectCompleted );
-          selectionTree.buildSelectionTree();
-
-        </script>
-        
-      </td>
-    </tr>
-
-    <tr>
-      <td>
-        <input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em"><input type="button"
-            onclick="window.location.href='reportManagement.action'" value="$i18n.getString( "cancel" )" style="width:10em">
+        #organisationUnitSelectionTree( false, true, false )
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em">
+        <input type="button" onclick="window.location.href='reportManagement.action'" value="$i18n.getString( "cancel" )" style="width:10em">
       </td>
     </tr>
   </table>
 
 </form>
-
-<span id="message"></span>
-
-<script type="text/javascript">
-
-  var levelMustBeInt = '$encoder.jsEncode( $i18n.getString( "level_must_be_int" ) )';
-  var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';
-
-</script>