=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2011-05-19 08:13:38 +0000
@@ -586,15 +586,9 @@
 		<action name="programAttribute"
 			class="org.hisp.dhis.patient.action.program.GetProgramAttributeListAction">
 			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-maintenance-patient/programAttribute.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
-			<param name="javascripts">javascript/commons.js,javascript/programAttribute.js</param>
-		</action>
-		
-		<action name="programAttributeList"
-			class="org.hisp.dhis.patient.action.program.GetProgramAttributeListAction">
-			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programAttributeList.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+			<param name="javascripts">javascript/programAttribute.js</param>
 		</action>
 
 		<action name="getProgramAttribute"
@@ -613,15 +607,15 @@
 
 		<action name="addProgramAttribute"
 			class="org.hisp.dhis.patient.action.program.AddProgramAttributeAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+			<result name="success" type="redirect">programAttribute.action
+			</result>
 			<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="updateProgramAttribute"
 			class="org.hisp.dhis.patient.action.program.UpdateProgramAttributeAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+			<result name="success" type="redirect">programAttribute.action
+			</result>
 			<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_UPDATE</param>
 		</action>
 
@@ -637,18 +631,23 @@
 		</action>
 
 		<action name="showAddProgramAttributeForm" class="org.hisp.dhis.patient.action.NoAction">
-			<result name="success" type="velocity">/content.vm</result>
+			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/addProgramAttributeForm.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+			<param name="javascripts">javascript/programAttribute.js</param>
 			<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="showUpdateProgramAttributeForm"
 			class="org.hisp.dhis.patient.action.program.GetProgramAttributeAction">
-			<result name="success" type="velocity">/content.vm</result>
+			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/updateProgramAttributeForm.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+			<param name="javascripts">javascript/programAttribute.js</param>
 			<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_UPDATE</param>
 		</action>
 
+
 		<action name="validateProgramAttribute"
 			class="org.hisp.dhis.patient.action.program.ValidateProgramAttributeAction">
 			<result name="success" type="velocity-json">
@@ -960,19 +959,16 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/caseAggregation.vm</param>
 			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
-			<param name="javascripts">javascript/commons.js,javascript/caseaggregation.js</param>
-		</action>
-		
-		<action name="caseAggregationList"
-			class="org.hisp.dhis.patient.action.caseaggregation.GetAllCaseAggregationConditionAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-maintenance-patient/caseAggregationList.vm</param>
+			<param name="javascripts">javascript/caseaggregation.js</param>
 		</action>
 
 		<action name="showAddCaseAggregationForm"
 			class="org.hisp.dhis.patient.action.caseaggregation.ShowCaseAggregationConditionFormAction">
-			<result name="success" type="velocity">/content.vm</result>
+			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/addCaseAggregation.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+			<param name="javascripts">javascript/commons.js,
+				javascript/caseaggregation.js</param>
 		</action>
 
 		<action name="showUpdateCaseAggregationForm"
@@ -983,7 +979,7 @@
 
 		<action name="updateCaseAggregationFormChain"
 			class="org.hisp.dhis.patient.action.caseaggregation.GetCaseAggregationConditionAction">
-			<result name="success" type="velocity">/content.vm</result>
+			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/updateCaseAggregation.vm</param>
 			<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
 			<param name="javascripts">javascript/commons.js,

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm	2011-05-18 03:07:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm	2011-05-19 08:13:38 +0000
@@ -34,7 +34,6 @@
 </script>
 				
 <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:onClickBackBtn();" style="width:10em">
-<p></p>
 													
 <h3>$i18n.getString( "add_new_patient_attribute" )</h3>
 <form id="addPatientAttributeForm" name='addPatientAttributeForm' action='addPatientAttribute.action' method="post">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm	2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm	2011-05-19 08:13:38 +0000
@@ -4,30 +4,20 @@
 	var i18n_at_least_2_option = '$encoder.jsEscape( $i18n.getString( "at_least_2_option" ) , "'") ';
 
 	var isSubmit = true;
-	jQuery('#addProgramAttributeForm').ready(	function(){
-
-		validation( 'addProgramAttributeForm', function(form){
-				if( isSubmit )
-				{
-					addProgramAttribute();
+	jQuery(document).ready(	function(){
+			
+			validation( 'addProgramAttributeForm', function(form){
+				if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) {
+					form.submit();
 				}
 			}, function(){
-				isSubmit = ATTRIBUTE_OPTION.checkOnSubmit();
-				
-				if( isSubmit )
-				{
-					var fields = $("#addProgramAttributeForm").serializeArray();
-					jQuery.each(fields, function(i, field) {
-						if(  field.name.match("^attrOption")=='attrOption' && field.value == ""){
-							setInnerHTML( "attrMessage", i18n_field_is_required );
-							isSubmit = false;
-						}
-					});
-					
-				}else
-				{
-					setInnerHTML( "attrMessage", i18n_at_least_2_option );
-				}
+				isSubmit = true;
+				jQuery.each($('#addProgramAttributeForm').serializeArray(), function(i, field) {
+					if( field.value == ""){
+						setInnerHTML("attrMessage", i18n_field_is_required);
+						isSubmit = false;
+					}
+				});
 			});
 		
 		jQuery("#attributeComboRow").hide();
@@ -35,9 +25,7 @@
 		checkValueIsExist( "name", "validateProgramAttribute.action");
 	});		
 </script>
-				
-<input type="button" value="$i18n.getString( 'back' )" onclick="javascript:onClickBackBtn();" style="width:10em">
-<p></p>
+
 																		
 <h3>$i18n.getString( "add_new_program_attribute" )</h3>
 <form id="addProgramAttributeForm" action="addProgramAttribute.action" method="post" >

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js	2011-05-18 03:07:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js	2011-05-19 08:13:38 +0000
@@ -27,7 +27,6 @@
 // -----------------------------------------------------------------------------
 // Remove Program Attribute
 // -----------------------------------------------------------------------------
-
 function removeProgramAttribute( programAttributeId, name )
 {
 	removeItem( programAttributeId, name, i18n_confirm_delete, 'removeProgramAttribute.action' );	
@@ -62,6 +61,7 @@
 			});
 			if( $("input","#attrOptionContainer").length < 2)
 			{
+				alert(i18n_at_least_2_option);
 				return false;
 			}else return true;
 		}
@@ -99,92 +99,6 @@
 	},
 	createInput : function ()
 	{
-		return "<tr><td><input type='text' name='attrOptions' id='attrOptions' style='width:28em'/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='"+i18n_remove_option+"'  onClick='ATTRIBUTE_OPTION.remove(this,null)'>[ - ]</a></td></tr>";
+		return "<tr><td><input type='text' name='attrOptions' style='width:28em'/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='"+i18n_remove_option+"'  onClick='ATTRIBUTE_OPTION.remove(this,null)'>[ - ]</a></td></tr>";
 	}
-}
-
-// -----------------------------------------------------------------------------
-// Add Program Attribute
-// -----------------------------------------------------------------------------
-
-function showAddProgramAttributeForm()
-{
-	hideById('programAttributeList');
-	jQuery('#loaderDiv').show();
-	jQuery('#editProgramAttributeForm').load('showAddProgramAttributeForm.action',
-	{
-	}, function()
-	{
-		showById('editProgramAttributeForm');
-		jQuery('#loaderDiv').hide();
-	});
-}
-
-function addProgramAttribute()
-{	
-	$.ajax({
-		type: "POST",
-		url: 'addProgramAttribute.action',
-		data: getParamsForDiv('addProgramAttributeForm'),
-		success: function( json ) {
-			if( json.response == 'success')
-			{
-				onClickBackBtn();
-			}
-		}
-	});
-	
-    return false;
-}
-
-// -----------------------------------------------------------------------------
-// Update Program Attribute
-// -----------------------------------------------------------------------------
-
-function showUpdateProgramAttributeForm( programAttributeId )
-{
-	hideById('programAttributeList');
-	jQuery('#loaderDiv').show();
-	jQuery('#editProgramAttributeForm').load('showUpdateProgramAttributeForm.action',
-	{
-		id:programAttributeId
-	}, function()
-	{
-		showById('editProgramAttributeForm');
-		jQuery('#loaderDiv').hide();
-	});
-}
-
-function updateProgramAttribute()
-{	
-	$.ajax({
-		type: "POST",
-		url: 'updateProgramAttribute.action',
-		data: getParamsForDiv('updateProgramAttributeForm'),
-		success: function( json ) {
-			if( json.response == 'success')
-			{
-				onClickBackBtn();
-			}
-		}
-	});
-	
-    return false;
-}
-
-// ------------------------------------------------------------------
-// Click Back button
-// ------------------------------------------------------------------
-
-function onClickBackBtn()
-{
-	hideById('editProgramAttributeForm');	
-	jQuery('#loaderDiv').show();
-	jQuery('#programAttributeList').load('programAttributeList.action',
-	{
-	}, function()
-	{
-		showById('programAttributeList');
-		jQuery('#loaderDiv').hide();
-	});
-}	
+}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttribute.vm	2011-05-18 03:07:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttribute.vm	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<div id='programAttributeList'>
-	#parse( "/dhis-web-maintenance-patient/programAttributeList.vm" )
-</div>
-
-#parse( "/dhis-web-commons/loader/loader.vm" )
-
-<div id='editProgramAttributeForm'></div>
-<p></p>
-
-<span id='message'></span>
-
-
-<script type="text/javascript">
-	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
-	var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
-	var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';	
-	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';	
-    var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
-    var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
-    var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
-    var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
-    var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
-    var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
-    var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
-	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
-	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
-	var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-	var i18n_field_is_required = '$encoder.jsEscape( $i18n.getString( "field_is_required" ) , "'") ';
-	var i18n_at_least_2_option = '$encoder.jsEscape( $i18n.getString( "at_least_2_option" ) , "'") ';
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm	2011-05-18 03:07:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm	2011-05-19 08:13:38 +0000
@@ -9,7 +9,7 @@
 			  <col width="20">     
 			  <tr>
 				<td></td>
-				<td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:showAddProgramAttributeForm();" style="width:70px"></td>
+				<td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddProgramAttributeForm.action'" style="width:70px"></td>
 			  </tr>
 			  <tr>            
 				<th>$i18n.getString( "name" )</th>
@@ -17,14 +17,13 @@
 			  </tr>
 
 			  <tbody id="list">
-				#set( $mark = false )
 				#foreach( $programAttribute in $programAttributes )
-				  <tr id="tr${programAttribute.id}" #alternate( $mark )>
+				  <tr id="tr${programAttribute.id}">
 				  
 					<td>$programAttribute.name</td>                
 					
 					<td style="text-align:center">
-					  <a href="javascript:showUpdateProgramAttributeForm('$programAttribute.id')" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+					  <a href="showUpdateProgramAttributeForm.action?id=$programAttribute.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
 					</td>
 					
 					<td style="text-align:center">
@@ -32,14 +31,14 @@
 					</td>            
 					
 					<td style="text-align:center">
-					  <a href="javascript:showProgramAttributeDetails( '$programAttribute.id' )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+					  <a href="javascript:showProgramAttributeDetails( $programAttribute.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
 					</td>
 					
 				  </tr>
-				  #set( $mark = !$mark)
 				#end
+
 			  </tbody>
-			  
+
 			</table>
 		</td>
 		<td style="width:20em; padding-left:2em; vertical-align:top">
@@ -57,3 +56,21 @@
 		</td>
   </tr>
 </table>
+
+
+<script type="text/javascript">
+	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
+	var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
+	var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';	
+	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';	
+    var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
+    var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
+    var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
+    var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
+    var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
+    var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
+    var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
+	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
+	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
+</script>
+</script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm	2011-05-18 03:07:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm	2011-05-19 08:13:38 +0000
@@ -13,7 +13,7 @@
 				
 				if( isSubmit )
 				{
-					var fields = $("#updatePatientAttributeForm").serializeArray();
+					var fields = $("#addPatientAttributeForm").serializeArray();
 					jQuery.each(fields, function(i, field) {
 						if(  field.name.match("^attrOption")=='attrOption' && field.value == ""){
 							setInnerHTML( "attrMessage", i18n_field_is_required );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm	2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm	2011-05-19 08:13:38 +0000
@@ -1,38 +1,28 @@
 <script>
+	var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
+	var i18n_field_is_required = '$encoder.jsEscape( $i18n.getString( "field_is_required" ) , "'") ';
+	var i18n_at_least_2_option = '$encoder.jsEscape( $i18n.getString( "at_least_2_option" ) , "'") ';
 	var isSubmit = true;
-	
-	jQuery('#updateProgramAttributeForm').ready(	function(){
-
+	jQuery(document).ready(	function(){
+			
 			validation( 'updateProgramAttributeForm', function(form){
-				if( isSubmit )
-				{
-					updateProgramAttribute();
+				if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) {
+					form.submit();
 				}
 			}, function(){
-				isSubmit = ATTRIBUTE_OPTION.checkOnSubmit();
-				
-				if( isSubmit )
-				{
-					var fields = $("#updateProgramAttributeForm").serializeArray();
-					jQuery.each(fields, function(i, field) {
-						if(  field.name.match("^attrOption")=='attrOption' && field.value == ""){
-							setInnerHTML( "attrMessage", i18n_field_is_required );
-							isSubmit = false;
-						}
-					});
-					
-				}else
-				{
-					setInnerHTML( "attrMessage", i18n_at_least_2_option );
-				}
-			});
+				isSubmit = true;
+				jQuery.each($('#updateProgramAttributeForm').serializeArray(), function(i, field) {
+					if( field.value == ""){
+						setInnerHTML("attrMessage", i18n_field_is_required);
+						isSubmit = false;
+					}
+				});
+			}); 
 			
 		checkValueIsExist( "name", "validateProgramAttribute.action", {id:getFieldValue('id')});
 	});		
 </script>
-				
-<input type="button" value="$i18n.getString( 'back' )" onclick="javascript:onClickBackBtn();" style="width:10em">
-<p></p>
+
 																		
 <h3>$i18n.getString( "update_new_program_attribute" )</h3>
 <form id="updateProgramAttributeForm" action="updateProgramAttribute.action" method="post" >