=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-18 04:15:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-21 14:59:13 +0000
@@ -6,7 +6,6 @@
 list_all_patients=List All Persons
 program_summary=Program summary
 data_entry=Data entry
-name_based=Name-based
 reports=Reports
 please_select_a_program=Please select a program
 records_for=Records for
@@ -58,9 +57,7 @@
 registering_unit=Registering Unit
 select=Select
 program_summary_report=Program Summary Report
-name_based_data_entry=Name-based Data Entry
 visit_plan=Visit Plans
-intro_name_based_data_entry=Enter data for persons and their respective programs and program stages.
 intro_program_summary=View the summary report to get an overview of the services provided for a program.
 intro_visit_plan=View the visit plan to get an overview of outstanding, pending and completed visits.
 other_facility=Private facility
@@ -133,7 +130,7 @@
 enroll=Enroll
 date_of_incident=Date of incident
 date_of_enrollment=Date of enrollment
-program_enrollment_management=Program enrollment management
+program_management=Program management
 patient_registered=Person registered
 patient_details=Person details
 enrolled_in_program=Enrolled in programs

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-07-12 10:23:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-07-21 14:59:13 +0000
@@ -18,22 +18,6 @@
 
 		<!-- Data Entry -->
 
-		<action name="dataEntrySelect"
-			class="org.hisp.dhis.caseentry.action.patient.SelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/select.vm</param>
-			<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js
-				,javascript/commons.js
-				,javascript/form.js
-				,javascript/entry.js
-				,../dhis-web-commons/javascripts/date.js
-			</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
-		</action>
-
 		<action name="validateSearch"
 			class="org.hisp.dhis.caseentry.action.caseentry.ValidateSearchAction">
 			<result name="success" type="velocity-xml">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-20 07:57:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-21 14:59:13 +0000
@@ -625,6 +625,7 @@
 					if( TR.store.programStage.data.items.length > 1 )
 					{
 						Ext.getCmp('programStageCombobox').setVisible(true);
+						Ext.getCmp('programStageCombobox').setValue( "" );
 					}
 					else
 					{

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2012-07-21 14:59:13 +0000
@@ -2,7 +2,6 @@
 <a href="index.action"><h2>$i18n.getString( "data_entry" )&nbsp;</h2></a>
 
 <ul>
-	<li><a href="dataEntrySelect.action">$i18n.getString( "name_based" )&nbsp;</a></li>
 	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_name_based" )&nbsp;</a></li>
 	<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
 	<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-07-21 14:59:13 +0000
@@ -3,7 +3,6 @@
 
 <ul class="introList">
 	#introListImgItem( "patient.action" "patient" "patient" )
-    #introListImgItem( "dataEntrySelect.action" "name_based_data_entry" "dataentry" )
 	#introListImgItem( "multipledataEntrySelect.action" "multiple_name_based_data_entry" "dataentry" )
 	#introListImgItem( "anonymousRegistration.action" "anonymous_events" "dataentry" )
 	#introListImgItem( "singleEventSelect.action" "single_event_with_registration" "dataentry" )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-07-21 14:59:13 +0000
@@ -6,7 +6,6 @@
 
 <h2>$i18n.getString( "data_entry" )&nbsp;</h2>
 <ul>
-	<li><a href="dataEntrySelect.action">$i18n.getString( "name_based" )&nbsp;</a></li>
 	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_name_based" )&nbsp;</a></li>
 	<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
 	<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-07-11 04:18:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-07-21 14:59:13 +0000
@@ -42,13 +42,13 @@
 <tr>
 	<td class='text-column' ><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 	<td class="input-column">	
-		<select id='dobType' name="dobType" style='width:100px' onchange='dobTypeOnChange("patientForm")' >
+		<select id='dobType' name="dobType" style='width:120px' onchange='dobTypeOnChange("patientForm")' >
 			<option value="A" selected >$i18n.getString( "approximated" )</option>
 			<option value="D" >$i18n.getString( "declared" )</option>
 			<option value="V" >$i18n.getString( "verified" )</option>
 		</select>
-		<input type="text" id="age" name="age" class="{validate:{number:true}}" style="width:156px" />
-		<input type="text" id="birthDate" name="birthDate" style='width:156px;display:none;' />
+		<input type="text" id="age" name="age" class="{validate:{number:true}}" style="width:136px" />
+		<input type="text" id="birthDate" name="birthDate" style='width:136px;display:none;' />
 		<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 	</td>
 </tr>
@@ -60,13 +60,6 @@
 	</td>
 </tr>
 
-<tr><td>&nbsp;</td></tr>	
-<tr>
-	<td></td>
-	<td><input type="button" class='button' id='checkDuplicateBtn' name='checkDuplicateBtn' value="$i18n.getString('check_duplicate')" /></td>
-</tr>
-<tr><td colspan="2">&nbsp;</td></tr>	
-
 <!-- UNDERAGE -->
 <tr id='underAgeDiv'>
 	<td class='text-column'>$i18n.getString("has_guardian")</td>
@@ -75,6 +68,11 @@
 	</td>
 </tr>
 
+<tr>
+	<td></td>
+	<td><input type="button" class='button' id='checkDuplicateBtn' name='checkDuplicateBtn' value="$i18n.getString('check_duplicate')" /></td>
+</tr>
+
 <!--IDENTIFIERS -->
 #if( $identifierTypes.size() > 0)
 	<tr><td colspan="2">&nbsp;</td></tr>	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-07-18 04:15:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-07-21 14:59:13 +0000
@@ -95,7 +95,7 @@
 				#end
 				
 				<td>
-				  <a href="javascript:showProgramEnrollmentSelectForm( '$patient.id' )" title='$i18n.getString( "program_enrollment_management" )'><img src="../images/enroll.png" alt='$i18n.getString( "program_enrollment" )'></a> 
+				  <a href="javascript:showProgramEnrollmentSelectForm( '$patient.id' )" title='$i18n.getString( "program_management" )'><img src="../images/enroll.png" alt='$i18n.getString( "program_enrollment" )'></a> 
 				  <a href="javascript:showUpdatePatientForm( '$patient.id' )" title='$i18n.getString( "edit_profile" )'><img src="../images/edit.png" alt='$i18n.getString( "edit_profile" )'></a>
 				  <a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList('$patient.id')" title='$i18n.getString( "manage_relationship" )'><img src="../images/relationship.png" alt='$i18n.getString( "manage_relationship" )'></a>
                   <a href="javascript:getPatientLocation( '$patient.id' ); " title='$i18n.getString( "change_patient_location" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "change_patient_location" )' style='width:25px; height:25px'></a><a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getFullName() )' )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-07-05 09:07:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-07-21 14:59:13 +0000
@@ -2,13 +2,19 @@
 <input type='hidden' id='programInstanceId' name='programInstanceId' value='$programInstance.id' />
 <div id="tabs">
 	<ul>
-		<li><a href="#tab-1">$i18n.getString("identifier_and_attribute")</a></li>
-		<li><a href="#tab-2">$i18n.getString("modify_due_date_or_visit_date")</a></li>
-		<li><a href="#tab-3">$i18n.getString("data_entry_screen")</a></li>
+		<li><a href="#tab-1">$i18n.getString("data_entry_screen")</a></li>
+		<li><a href="#tab-2">$i18n.getString("identifier_and_attribute")</a></li>
+		<li><a href="#tab-3">$i18n.getString("modify_due_date_or_visit_date")</a></li>
 	</ul>
 	
+	
+	<div id="tab-1">
+		<div id='dataRecordingSelectDiv' class='hidden'></div>
+		<div id='dataEntryFormDiv' class='hidden'></div>
+	</div>
+	
 	<!-- Enroll program TAB -->
-	<div id="tab-1">
+	<div id="tab-2">
 		<form id='programEnrollmentInforForm' name='programEnrollmentInforForm' action='#' method="POST" >
 			#if( $identifierTypes.size() > 0 || $noGroupAttributes.size() > 0 || $attributeGroups.size() > 0 )
 				<input type='hidden' id='programId' name='programId' value='$programInstance.program.id'>
@@ -125,7 +131,7 @@
 	</div>
 
 	<!-- Program-stage-instance TAB -->
-	<div id="tab-2">
+	<div id="tab-3">
 		#if( $programStageInstances.size() > 0 )
 			<table class='mainPageTable' id='progarmStageListDiv' name='progarmStageListDiv' >
 				<col id="noCol">
@@ -166,11 +172,6 @@
 		#end
 	</div>
 
-	<div id="tab-3">
-		<div id='dataRecordingSelectDiv' class='hidden'></div>
-		<div id='dataEntryFormDiv' class='hidden'></div>
-	</div>
-	
 </div>	
 
 #end
@@ -190,21 +191,22 @@
 	#if( $programInstance || $hasDataEntry == 'true')
 		$('#tabs').tabs();
 		
+		#if( $programInstance.program.type!='1' )
+			$("#tabs").tabs("remove", 2);
+		#end
+		
+		#if( $identifierTypes.size() > 0 || $noGroupAttributes.size() > 0 || $attributeGroups.size() > 0 )
+			$( "#tabs" ).tabs( "option", "selected", 1 );
+		#else
+			$( "#tabs" ).tabs( "option", "selected", 2 );
+			$("#tabs").tabs("remove", 1);
+		#end
+		
 		#if( $hasDataEntry == 'true' )
 			showSelectedDataRecoding( getFieldValue('patientId') );
-		#else
-			$( "#tabs" ).tabs( "option", "disabled", [2] );
-			$("#tabs").tabs("remove", 2);
-		#end
-		
-		#if( $programInstance.program.type!='1' )
-			$("#tabs").tabs("remove", 1);
-		#end
-		
-		#if( $identifierTypes.size() > 0 || $noGroupAttributes.size() > 0 || $attributeGroups.size() > 0 )
 			$( "#tabs" ).tabs( "option", "selected", 0 );
 		#else
-			$( "#tabs" ).tabs( "option", "selected", 1 );
+			$( "#tabs" ).tabs( "option", "disabled", [0] );
 			$("#tabs").tabs("remove", 0);
 		#end
 	#end

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-07-18 03:52:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<script type="text/javascript">
-   jQuery(document).ready(	function(){
-		hideById('addPatientBtn');
-});		
-</script>
-
-<h3>$i18n.getString( "name_based_data_entry" ) #openHelp('name_based_data_entry')</h3>
-<input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
-<input type='hidden' id='listAll' name= 'listAll' >
-
-<div id='searchDiv'>
-	#parse( "dhis-web-caseentry/searchPatientCriteria.vm" )	
-</div>
-
-<span id='message'></span>
-<div id='contentDiv'></div>
-<div id='dataRecordingSelectDiv'></div>
-<div id='dataEntryFormDiv'></div>
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<script type="text/javascript">
-	var i18n_id = '$encoder.jsEscape( $i18n.getString( "id" ), "'")';
-	var i18n_full_name = '$encoder.jsEscape( $i18n.getString( "full_name" ), "'")';
-	var i18n_gender = '$encoder.jsEscape( $i18n.getString( "gender" ), "'")';
-	var i18n_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
-	var i18n_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ), "'")';
-	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
-	var i18n_select = '[' + '$encoder.jsEscape( $i18n.getString( "select" ), "'")' + ']';
-	var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';	
-	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
-	var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
-	var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';
-	var i18n_value_must_negative_integer = '$encoder.jsEscape( $i18n.getString( "value_must_negative_integer" ) , "'")';
-    var i18n_invalid_date = '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n " + '$encoder.jsEscape( $i18n.getString( "format_date" ) , "'")' + " '" + dateFormat.replace('yy', 'yyyy') + " '" ; 
-    var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
-    var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
-    var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
-    var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
-    var i18n_incomplete_confirm_message = '$encoder.jsEscape( $i18n.getString( "incomplete_confirm_message" ) , "'")';
-	var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
-	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
-	var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';	
-	var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
-    var i18n_scheduled_for = '$encoder.jsEscape( $i18n.getString( "scheduled_for" ) , "'")';
-	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
-	var i18n_create_new_event = '$encoder.jsEscape( $i18n.getString( "create_new_event" ) , "'")';
-	var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
-	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
-	var i18n_events = '$encoder.jsEscape( $i18n.getString( "events" ) , "'")';
-	var i18n_male = '$encoder.jsEscape( $i18n.getString( "male" ) , "'")';
-	var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")';
-	var i18n_transgender = '$encoder.jsEscape( $i18n.getString( "transgender" ) , "'")';
-	var i18n_specify_search_criteria = '$encoder.jsEscape( $i18n.getString( "specify_search_criteria" ) , "'")';
-	var i18n_color_quick_help = '$encoder.jsEscape( $i18n.getString( "color_quick_help" ) , "'")';
-	
-	selection.setListenerFunction( organisationUnitSelected );
-	
-	var searchTextBox = '<input type="text" id="searchText" name="searchText" onkeyup="searchPatientsOnKeyUp( event );">';
-	var programComboBox = '<select id="searchText" name="searchText">';
-	#foreach ( $program in $programs ) 
-		programComboBox += '<option value="$program.id">$program.name</option>';
-	#end
-	programComboBox += '</select>';
-	
-</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-07-18 03:52:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-07-21 14:59:13 +0000
@@ -1,4 +1,6 @@
 <h3>$i18n.getString( "patient_management" ) #openHelp( "patient" )</h3>
+<h4>$i18n.getString( "program_management" )</h4>
+
 <input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
 <input type='hidden' id='isShowPatientList' name= 'isShowPatientList' >
 <input type='hidden' id='listAll' name= 'listAll' >

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-07-11 04:18:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-07-21 14:59:13 +0000
@@ -94,13 +94,13 @@
 	<tr>
 		<td class='text-column' ><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td class="input-column">
-			<select id='dobType' name="dobType" style='width:100px' onchange='dobTypeOnChange("patientForm")' >
+			<select id='dobType' name="dobType" style='width:120px' onchange='dobTypeOnChange("patientForm")' >
 				<option value="A" #if($patient.dobType=='A') selected #end >$i18n.getString( "approximated" )</option>
 				<option value="D" #if($patient.dobType=='D') selected #end >$i18n.getString( "declared" )</option>
 				<option value="V" #if($patient.dobType=='V') selected #end >$i18n.getString( "verified" )</option>
 			</select>
-			<input type="text" id="birthDate" name="birthDate" value='$format.formatDate($!patient.birthDate)' style='width:156px;' />
-			<input type="text" id="age" name="age" value='$!patient.getIntegerValueOfAge()' class="{validate:{number:true}}" style='width:156px;' />
+			<input type="text" id="birthDate" name="birthDate" value='$format.formatDate($!patient.birthDate)' style='width:136px;' />
+			<input type="text" id="age" name="age" value='$!patient.getIntegerValueOfAge()' class="{validate:{number:true}}" style='width:136px;' />
 		</td>
 	</tr>
 
@@ -118,8 +118,6 @@
 		</td>
 	</tr>
 	
-	<tr><td>&nbsp;</td></tr>	
-
 	<!-- UNDERAGE -->
 
 	<tr>
@@ -171,7 +169,6 @@
 				</tr>
 			#end
 		#end
-		<tr><td>&nbsp;</td></tr>
 	#end
 	<!-- ATTRIBUTES IN GROUPS -->