=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-03-06 14:31:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-03-06 15:05:04 +0000
@@ -878,7 +878,6 @@
 		jQuery('#tr2_' + programInstanceId).attr("onClick", "");
 		
 		hideById('executionDateTB');
-		hideById('inputCriteriaDiv');
 	}
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-03-06 08:26:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-03-06 15:05:04 +0000
@@ -501,7 +501,6 @@
 					jQuery(".stage-object-selected").css('border-color', COLOR_GREEN);
 					jQuery(".stage-object-selected").css('background-color', COLOR_LIGHT_GREEN);
 
-					disableCompletedButton(true);
 					var irregular = jQuery('#entryFormContainer [name=irregular]').val();
 					var displayGenerateEventBox = jQuery('#entryFormContainer [name=displayGenerateEventBox]').val();
 					var programInstanceId = jQuery('#entryFormContainer [id=programInstanceId]').val();
@@ -518,16 +517,17 @@
 						jQuery('#completedList' ).append('<option value="' +  programInstanceId + '">' + getInnerHTML('infor_' + programInstanceId ) + '</option>');
 					}
 					
+					var blocked = jQuery('#entryFormContainer [id=blockEntryForm]').val();
+					if( blocked=='true' ){
+						blockEntryForm();
+					}
+					
+					disableCompletedButton(true);
+					enable('validationBtn');
 					var eventBox = jQuery('#ps_' + getFieldValue('programStageInstanceId'));
 					eventBox.attr('status',1);
 					resetActiveEvent( eventBox.attr("pi") );
 			
-			
-					var blocked = jQuery('#entryFormContainer [id=blockEntryForm]').val();
-					if( blocked=='true' ){
-						blockEntryForm();
-					}
-					
 					hideLoader();
 					
 					if( isCreateEvent ){
@@ -550,12 +550,11 @@
 			{
 				jQuery(".stage-object-selected").css('border-color', COLOR_LIGHTRED);
 				jQuery(".stage-object-selected").css('background-color', COLOR_LIGHT_LIGHTRED);
+				unblockEntryForm();
 				disableCompletedButton(false);
 				var eventBox = jQuery('#ps_' + getFieldValue('programStageInstanceId'));
 				eventBox.attr('status',2);
 				resetActiveEvent( eventBox.attr("pi") );
-				
-				unblockEntryForm();
 			});
 	}
     

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-03-06 14:31:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-03-06 15:05:04 +0000
@@ -12,7 +12,7 @@
 			<input type="text" id='orgunitName' readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( 'please_select_village' )]" #end >
 		</td>
 		<td rowspan='2' valign='bottom'>
-			<input type="button" class='large-button' id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" disabled >
+			<input type="button" class='large-button' id='listPatientBtn' style='260px;' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" disabled >
 			<input type="button" class='large-button' id='addPatientBtn' name='addPatientBtn' class='large-button' value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();" disabled >
 			<input type="button" style='width:120px' id='advancedSearchBtn' value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();" disabled>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2013-03-06 03:50:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2013-03-06 15:05:04 +0000
@@ -104,7 +104,7 @@
 .text-column 
 {
     padding-left: 5px;
-    padding-right: 10px;
+    padding-right: 6px;
     text-align: left;
 }
 
@@ -164,7 +164,7 @@
 .entryScreen
 {
 	margin-bottom: 20px;
-	width: 90%;
+	width: 100%;
 	font-size: 13px; 
 	line-height: 18px;
 }