=== 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-10-03 06:04:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-10-03 07:06:54 +0000
@@ -467,4 +467,5 @@
 export_xls = Export XLS
 stage_skipped = Stage is skipped
 location = Location
-some_data_element_not_exist = Some data elements not exist 
\ No newline at end of file
+some_data_element_not_exist = Some data elements not exist 
+guardian=Guardian/caretaker
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-09-23 09:30:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-10-03 07:06:54 +0000
@@ -27,7 +27,7 @@
 		jQuery('#patientForm [id=healthWorkerId]').val("");
 		jQuery('#patientForm [id^="iden"]').val("");
 		hideById('patientForm [id=age]');
-		hideById('patientForm [id=underAgeDiv]');
+
 		datePickerValid( 'patientForm [id=birthDate]' );
 		addEventForPatientForm('patientForm');
 	});		

=== 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-10-02 06:59:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-10-03 07:06:54 +0000
@@ -78,12 +78,22 @@
 
 <!-- UNDERAGE -->
 
-<tr id="underAgeDiv" name="underAgeDiv">
-	<td class='text-column'>$i18n.getString("has_guardian")</td>
-	<td>
-		<input type="checkbox" name="underAge" id="underAge" onclick="toggleUnderAge(this);" value="true" #if($!patient.underAge == "true") checked="checked" #end/>
-	</td>
-</tr>
+#if($!patient.underAge)
+	#set( $representative = $!patient.representative ) 
+	<tr>
+		<td class='text-column'>$i18n.getString("guardian")</td>
+		<td> 
+			$!patient.representative.getFullName() <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='img-button'>
+		</td>
+	</tr>
+#else
+	<tr id="underAgeDiv" name="underAgeDiv">
+		<td class='text-column'>$i18n.getString("has_guardian")</td>
+		<td>
+			<input type="checkbox" name="underAge" id="underAge" onclick="toggleUnderAge(this);" value="true" #if($!patient.underAge == "true") checked="checked" #end/>
+		</td>
+	</tr>
+#end
 
 <!-- DEAD -->
 
@@ -108,16 +118,6 @@
 
 <tr><td>&nbsp;</td></tr>
 
-#if($!patient.underAge)
-	#set( $representative = $!patient.representative ) 
-	<tr>
-		<td class='text-column'>$i18n.getString("representative")</td>
-		<td> 
-			$!patient.representative.getFullName() <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='img-button'>
-		</td>
-	</tr>
-#end
-
 #if( $identifierTypes.size() > 0)
 	<!--IDENTIFIERS -->
 	<tr><th colspan="2" class="heading-column">$i18n.getString("patient_identifiers")</th></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-10-02 06:59:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-10-03 07:06:54 +0000
@@ -109,7 +109,7 @@
 				#if($value=="")
 					#set($value=$patient.getFullName())
 				#end
-				<td onclick="javascript:showPatientDashboardForm( '$patient.id' )">
+				<td style="cursor:pointer;" onclick="javascript:showPatientDashboardForm( '$patient.id' )">
 					$value
 				</td>
 				

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-09-22 15:52:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-10-03 07:06:54 +0000
@@ -9,12 +9,12 @@
 					<tr id='programStageIdTR_$!programInstance.id'>
 						#foreach( $programStageInstance in $programInstance.programStageInstances )
 						<td id='arrow_$programStageInstance.id' style='font-size:25px;'>&rarr;</td>
-						<td>
+						<td >
 							#set($valueDate=$format.formatDate( $programStageInstance.dueDate ))
 							#if($!programStageInstance.executionDate)
 								#set($valueDate=$format.formatDate( $programStageInstance.executionDate ))
 							#end
-							<span id="org_$!programStageInstance.id">&nbsp;$!programStageInstance.organisationUnit.name</span><br>
+							<span class="orgunit-object" id="org_$!programStageInstance.id">&nbsp;$!programStageInstance.organisationUnit.name</span><br>
 							<input type="button" name="programStageBtn"
 								id="ps_$!programStageInstance.id"
 								psid="$programStageInstance.programStage.id"

=== 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	2012-09-26 05:19:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-10-03 07:06:54 +0000
@@ -366,6 +366,15 @@
 	cursor:pointer;
 }
 
+span.orgunit-object
+{
+	width: 120px;
+	border-left:1px solid #d0d0d0; 
+	border-top:1px solid #d0d0d0; 
+	border-right:1px solid #d0d0d0; 
+	border-bottom:1px solid #d0d0d0;
+}
+
 input.stage-object[type="button"]
 {
 	width: 120px;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-09-25 10:10:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-10-03 07:06:54 +0000
@@ -1,8 +1,5 @@
 <script type="text/javascript">
 	jQuery("#representativeDiv").ready(function() {
-		
-		jQuery("#tabs").tabs();
-		hideById('addRepresentativeForm [id=underAgeDiv]');
 		hideById('addRepresentativeForm [id=age]');
 		addEventForPatientForm('addRepresentativeForm');
 		$('#addRepresentativeForm [id=dobType]').removeAttr('onchange');
@@ -44,10 +41,12 @@
 		});
 		datePickerValid( 'addRepresentativeForm [id=birthDate]' );
 	}); 
+	
+	jQuery("#addRepresentativeTabs").tabs();
 </script>
 
 <!-- TAB Header -->
-<div id="tabs">
+<div id="addRepresentativeTabs">
 	<ul>
 		<li><a href="#tab-1">$i18n.getString("search_existing_person")</a></li>
 		<li><a href="#tab-2">$i18n.getString("add_new_person")</a></li>
@@ -123,7 +122,7 @@
 		<form id="addRepresentativeForm" name="addRepresentativeForm" action="addRepresentative.action" method="post">
 			<table id="formContainer">
 				<tr>
-					<td style='width:12.2em'><label for="relationship_type">$i18n.getString("relationship_type")<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+					<td><label for="relationship_type">$i18n.getString("relationship_type")<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 					<td >
 						<select name="relationshipTypeId" id="relationshipTypeId" class="{validate:{required:true}}">
 							<option value="">[$i18n.getString( "please_select" )]</option>        
@@ -150,3 +149,7 @@
 	</div>
 </div>
 
+<script>
+	
+</script>
+

=== 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-09-24 05:02:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-10-03 07:06:54 +0000
@@ -10,10 +10,6 @@
 
 <script>
 	jQuery(document).ready(	function(){
-
-		datePickerValid( 'patientForm [id=deathDate]' );
-		addEventForPatientForm('patientForm');
-		
 		jQuery("#patientForm").validate({
 			 meta:"validate"
 			,errorElement:"span"
@@ -38,6 +34,8 @@
 		});
 		
 		checkedDuplicate = false;
+		datePickerValid( 'patientForm [id=deathDate]' );
+		addEventForPatientForm('patientForm');
 		if("$!patient.dobType" == 'A'){ 
 			var i18n_please_select_relationshipType = '$encoder.jsEscape( $i18n.getString( "please_verify_birthday" ) , "'")';
 			jQuery('#patientForm [id=birthDate]').css("display","none");