=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/UpdateReportExcelItemAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/UpdateReportExcelItemAction.java	2010-08-31 08:12:53 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/UpdateReportExcelItemAction.java	2010-12-06 05:46:01 +0000
@@ -125,7 +125,6 @@
     public String execute()
         throws Exception
     {
-
         ReportExcelItem reportItem = reportService.getReportExcelItem( id );
         reportItem.setName( name );
         reportItem.setItemType( itemType );

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml	2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml	2010-12-06 05:46:01 +0000
@@ -1044,11 +1044,11 @@
 			class="org.hisp.dhis.reportexcel.filemanager.action.ValidateUploadExcelTemplate">
 			<interceptor-ref name="fileUploadStack" />
 			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
+				/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm</result>
+				/dhis-web-commons/ajax/jsonResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
+				/dhis-web-commons/ajax/jsonResponseInput.vm</result>
 		</action>
 
 		<action name="uploadExcelImport"

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js	2010-09-06 09:12:16 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js	2010-12-06 05:46:01 +0000
@@ -333,49 +333,52 @@
 
 function validateUploadExcelImport(){
 
-		$.ajaxFileUpload
-        (
+	$.ajaxFileUpload
+	(
+		{
+			url:'validateUploadExcelImport.action',
+			secureuri:false,
+			fileElementId:'upload',
+			dataType: 'json',
+			success: function (data, status)
 			{
-				url:'validateUploadExcelImport.action',
-				secureuri:false,
-				fileElementId:'upload',
-				dataType: 'xml',
-				success: function (data, status)
+				if ( typeof( data.response ) != 'undefined' )
 				{
-					data = data.getElementsByTagName('message')[0];
-					var type = data.getAttribute("type");
-					if(type=='error'){                    
-						setMessage(data.firstChild.nodeValue);
-					}else{
-						//document.forms['importingParam'].submit();
+					if( data.response != 'success' )
+					{
+						setMessage( data.message );
+					}
+					else
+					{
 						uploadExcelImport();
 					}
-				},
-				error: function (data, status, e)
-				{
-				
 				}
+			},
+			error: function (data, status, e)
+			{
+				alert(e);
 			}
-        );
-	}
+		}
+	);
+}
 	
-	function uploadExcelImport(){
+function uploadExcelImport(){
 
-		$.ajaxFileUpload
-        (
-			{
-				url:'uploadExcelImport.action',
-				secureuri:false,
-				fileElementId:'upload',
-				dataType: 'xml',
-				success: function (data, status)
-				{
-					window.location.reload();
-				},
-				error: function (data, status, e)
-				{
-				
-				}
+	$.ajaxFileUpload
+	(
+		{
+			url:'uploadExcelImport.action',
+			secureuri:false,
+			fileElementId:'upload',
+			dataType: 'json',
+			success: function (data, status)
+			{
+				window.location.reload();
+			},
+			error: function (data, status, e)
+			{
+				alert(e);
 			}
-        );
-	}
\ No newline at end of file
+		}
+	);
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm	2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm	2010-12-06 05:46:01 +0000
@@ -1,7 +1,7 @@
 <script>
 	
 	jQuery(document).ready(	function(){
-		validation( 'addDataElementForm', function( form ){			
+		validation( 'addDataElementForm', function( form ){
 			form.submit();
 		},function(){
 			getDataElementIdsForValidate();
@@ -152,7 +152,7 @@
     </tr>    
     <tr>
         <th>$i18n.getString( "selected_dataelements" )</th>
-		<td><select id="selectedDEValidator" multiple="multiple"  name="selectedDEValidator" style="display:none"></select></td>
+		<td><select id="selectedDEValidator" multiple="multiple" name="selectedDEValidator" style="display:none"></select></td>
     </tr>
     <tr>
 		<td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2010-11-25 21:34:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2010-12-06 05:46:01 +0000
@@ -173,13 +173,13 @@
  */
 function addCDEDataElements()
 {
-	var alvailableList = jQuery("#availableDataElements option");
+	var availableList = jQuery("#availableDataElements option");
 	
 	jQuery("#selectedDataElements tr.placeholder").remove();
 	
 	var selectedList = jQuery("#selectedDataElements")
 	
-	jQuery.each( alvailableList, function(i, item){
+	jQuery.each( availableList, function(i, item){
 		if( item.selected ){
 			var id = item.value;
 			var name = item.firstChild.nodeValue;
@@ -254,7 +254,7 @@
 {
 	var inputs = jQuery("#selectedDataElements input[name|=factors]");
 	
-	jQuery.each(inputs, function(i, item ){				
+	jQuery.each(inputs, function(i, item ){
 		removeValidatorRules( item );
 		addValidatorRules( item, {required:true, number:true});			
 	});
@@ -296,8 +296,7 @@
 		hideById( id );
 		removeValidatorRulesById("selectedDEValidator");
 		removeValidatorRulesForFactors();
-    } 
-   
+    }
 }
 
 function getFactors()