=== 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-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-06-07 09:55:49 +0000
@@ -260,6 +260,7 @@
 false = No
 data = Data
 get_report_as_xls=Download as Excel 
+get_report_as_pdf=Download as PDF 
 set_complete_status = Set complete status
 orgunit_provided_service = Organisation unit provided service
 how_to_search_tabular_report = Quotes (") match phrases. Text values support %%, %=, =% and =. Numeric values support >=, >, <=, <, = and != operators.

=== 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-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-06-07 09:55:49 +0000
@@ -30,7 +30,7 @@
 				,javascript/entry.js
 				,../dhis-web-commons/javascripts/date.js
 			</param>
-			<param name="stylesheets">style/dataEntry.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
 		</action>
 
@@ -62,7 +62,7 @@
 			class="org.hisp.dhis.caseentry.action.caseentry.DataRecordingSelectAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/dataRecordingSelect.vm</param>
-			<param name="stylesheets">style/patient.css</param>
+			<param name="stylesheets">style/style.css</param>
 		</action>
 
 		<action name="loadProgramStageInstances"
@@ -76,7 +76,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
 			<param name="javascripts">javascript/customcheckbox/prettyCheckboxes.js</param>
-			<param name="stylesheets">style/dataEntry.css,javascript/customcheckbox/prettyCheckboxes.css</param>
+			<param name="stylesheets">style/style.css,javascript/customcheckbox/prettyCheckboxes.css</param>
 		</action>
 
 		<action name="completeDataEntry"
@@ -114,7 +114,7 @@
 				,javascript/anonymousRegistration.js
 				,javascript/entry.js
 				,../dhis-web-commons/javascripts/date.js</param>
-			<param name="stylesheets">style/dataEntry.css,style/patient.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
 		</action>
 		
@@ -177,7 +177,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-caseentry/multiDataEntrySelect.vm</param>
 			<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
-			<param name="stylesheets">style/patient.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/commons.js,
 				javascript/form.js,javascript/multiDataEntry.js</param>			
 			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
@@ -194,7 +194,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
 			<param name="javascripts">javascript/customcheckbox/prettyCheckboxes.js</param>
-			<param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css</param>
+			<param name="stylesheets">style/style.css,javascript/customcheckbox/prettyCheckboxes.css</param>
 		</action>
 
 		<action name="viewProgramStageRecords"
@@ -202,7 +202,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
 			<param name="javascripts">javascript/form.js,javascript/entry.js,../dhis-web-commons/javascripts/date.js</param>
-			<param name="stylesheets">style/dataEntry.css</param>
+			<param name="stylesheets">style/style.css</param>
 		</action>
 
 		<action name="loadProgramStageRecords"
@@ -248,7 +248,7 @@
 			<param name="page">/dhis-web-caseentry/reportSelect.vm</param>
 			<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
 			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/report.js</param>
-			<param name="stylesheets">style/report.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_GENERATE_PROGRAM_SUMMARY_REPORT</param>
 		</action>
 
@@ -280,7 +280,7 @@
 			<param name="page">/dhis-web-caseentry/caseAggregationForm.vm</param>
 			<param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
 			<param name="javascripts">javascript/caseagg.js,javascript/caseAggregationForm.js</param>
-			<param name="stylesheets">style/dataEntry.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
 		</action>
 
@@ -348,7 +348,7 @@
 				,javascript/entry.js
 				,javascript/relationshipPatient.js
 			</param>
-			<param name="stylesheets">style/patient.css, style/dataEntry.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_PATIENT_MANAGEMENT</param>
 		</action>
 
@@ -417,7 +417,7 @@
 			<param name="page">/dhis-web-caseentry/underAgeForm.vm</param>
 			<param name="javascripts">javascript/underage.js,
 				../dhis-web-commons/javascripts/date.js</param>
-			<param name="stylesheets">style/patient.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_PATIENT_ADD</param>
 		</action>
 
@@ -639,7 +639,7 @@
 			<param name="page">/dhis-web-caseentry/tabularReportSelect.vm</param>
 			<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
 			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/commons.js</param>
-			<param name="stylesheets">style/report.css</param>
+			<param name="stylesheets">style/style.css</param>
 			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
 		</action>
 		

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm	2012-05-26 17:38:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm	2012-06-07 09:55:49 +0000
@@ -43,13 +43,16 @@
 
 <table>
 	#parse( "/dhis-web-caseentry/patientForm.vm" )
+	<tr><td><td><p></p></td></tr>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" class="button" value="$i18n.getString( 'add' )"/>
+			<input type="button" class="button" value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();"/>
+		</td>
+	</tr>
 </table>
 
-<p>
-	<input type="submit" class="button" value="$i18n.getString( 'add' )"/>
-	<input type="button" class="button" value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();"/>
-</p>
-
 </form>
 
 <script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2012-02-23 09:58:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2012-06-07 09:55:49 +0000
@@ -16,7 +16,7 @@
 <input type="hidden" id="patientId" name="patientId" value="$patient.id"/>
 <table>
 <tr>
-    <td class='infor'>
+    <td class='information'>
         <table>
 			<tr>
 				<th colspan='2'>$i18n.getString('patient_profile')</th>
@@ -50,7 +50,7 @@
             </tr>
         </table>
     </td>    
-    <td class='infor'>
+    <td class='information'>
         <table>  
 			<tr>
 				<th colspan='2'>$i18n.getString('relationship_for') $patient.getFullName()</th>
@@ -73,15 +73,15 @@
                                     
             <tr>           
                 <td>
-                    <select id="searchingAttributeId" name="searchingAttributeId" #if( $patientAttributes.size() == 0 ) disabled="disabled" #end>
+                    <select id="searchingAttributeId" name="searchingAttributeId" #if( $patientAttributes.size() == 0 ) disabled="disabled" #end style='width:119px'>
                         <option value="">$i18n.getString( "search_by_name_identifier" )</option>
                         #foreach( $attribute in $patientAttributes )
                             <option value="$attribute.id" #if( $searchingAttributeId && $attribute.id == $searchingAttributeId ) selected="selected" #end>$encoder.htmlEncode( $attribute.name )</option>
                         #end
                     </select> 
                     <em title="$i18n.getString( 'required' )" class="required">*</em>
-                    <input type="text" id="searchText" name="searchText" maxlength="30" onchange="validateSearchPartner();"/>        
-                    <input type="button" value="$i18n.getString( 'search' )" onclick="validateSearchPartner()"/>
+                    <input type="text" id="searchText" name="searchText" maxlength="30" onchange="validateSearchPartner();" style='width:119px'/>        
+                    <input type="button" value="$i18n.getString( 'search' )" onclick="validateSearchPartner();" class='large-button' />
                 </td> 
             </tr>                  
             <tr>  
@@ -94,7 +94,7 @@
             </tr>  
             <tr>
                 <td colspan='2'>
-                    <select size="30" id="availablePartnersList" name="availablePartnersList" style="width:37em;height:20em" class="{validate:{required:true}}">                        
+                    <select size="15" id="availablePartnersList" name="availablePartnersList" class="{validate:{required:true}}">                        
                         #foreach ( $partner in $patients )
                             <option value="$partner.id"> $encoder.htmlEncode( $partner.getFullName() )</option>
                         #end                
@@ -103,8 +103,8 @@
             </tr>
             <tr>
             	<td>
-					<input type="button" value="$i18n.getString( 'assign_relationship' )" onclick="javascript:addRelationship()" style="width:10em"/>
-					<input type="button" value="$i18n.getString( 'back_to_relationship' )" onclick="showRelationshipList($patient.id)" style="width:10em"/>
+					<input type="button" value="$i18n.getString( 'assign_relationship' )" onclick="javascript:addRelationship()" />
+					<input type="button" value="$i18n.getString( 'back_to_relationship' )" onclick="showRelationshipList($patient.id)" />
 				</td>
             </tr>            
         </table>

=== 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-02-01 09:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-06-07 09:55:49 +0000
@@ -46,12 +46,18 @@
 	
 	#parse( "/dhis-web-caseentry/patientForm.vm" )
 
+	<tr><td><p></p></td></tr>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" class='button' value="$i18n.getString( 'add' )" />
+			<input type="button" class='button' id='backbtn' value="$i18n.getString( 'back_to_registration' )" onclick="showRelationshipList($patient.id);">
+		</td>
+	</tr>
 	</table>
 
 <p>
-	<input type="submit" class='button' value="$i18n.getString( 'add' )" />
-    <input type="button" class='button' id='backbtn' value="$i18n.getString( 'back_to_registration' )" onclick="showRelationshipList($patient.id);">
-</p>
+	
 
 </form> 	
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-05-23 15:02:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-06-07 09:55:49 +0000
@@ -7,13 +7,13 @@
 </div>	
 			
 <div id="dataRecordingSelectDiv" class="inputCriteria" style="width:480px;height:75px;">
-	<input type='hidden' id="programStageId">
+	<input type='hidden' id="programStageInstanceId">
 	<input type='hidden' id='selectedProgramId'>
 	<table>
 		<tr>
 			<td class='text-column'>$i18n.getString('program')</td>
 			<td>
-				<select id='programId' name='programId' class='criteria' onchange='loadEventForm();'>
+				<select id='programId' name='programId' onchange='loadEventForm();'>
 					<option value="">[ $i18n.getString('please_select') ]</option>
 					#foreach( $programInstance in $programInstances)
 						<option value="$programInstance.program.id" type='$programInstance.program.type' programInstanceId='$programInstance.id'>$programInstance.program.name</option>
@@ -23,7 +23,7 @@
 		</tr>
 		<tr>
 			<td class='text-column'><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
-			<td><input type="text" id="executionDate" name="executionDate" class="criteria" style="width:320px" value="$!format.formatDate( $programStageInstance.executionDate )" >
+			<td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" >
 				<script type="text/javascript">
 				   datePickerValid( 'executionDate', false );
 				   disable( 'executionDate' );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-06-07 09:55:49 +0000
@@ -67,11 +67,11 @@
 					<span id="value[$programStageDataElement.dataElement.id].type" class="hidden">$encoder.htmlEncode( $programStageDataElement.dataElement.type )</span></td>       
 				</td>        
 				##entry        
-				<td>   
+				<td class='input-column'>   
 					#set( $id = $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val' )
 					#if( $!programStageDataElement.dataElement.optionSet )
 						#set( $optionId = $id + '-options')
-						<input class='optionset' name="entryselect" options='$programStageDataElement.dataElement.optionSet.options' id='$id' value='$!patientDataValue.value' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" id="$id-options" dataElementId="$programStageDataElement.dataElement.id" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
+						<input type='text' class='optionset' name="entryselect" options='$programStageDataElement.dataElement.optionSet.options' id='$id' value='$!patientDataValue.value' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" id="$id-options" dataElementId="$programStageDataElement.dataElement.id" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
 					#elseif( $programStageDataElement.dataElement.type == "bool" )
 						<select name="entryselect" data="{compulsory: $programStageDataElement.compulsory }" id="$id" onchange="saveOpt( $programStageDataElement.dataElement.id )" tabindex="$tabIndex"> 
 							<option value="">[$i18n.getString( "select_value" )]</option>
@@ -88,7 +88,7 @@
 					#end
 				</td> 
 				
-				<td>
+				<td style='width: 50px;' align='center'>
 					#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
 					#if( $programStageDataElement.allowProvidedElsewhere == 'true')
 						<input name="$id" id="$id" type="checkbox" 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-06-07 09:55:49 +0000
@@ -60,7 +60,7 @@
 	
 	<br>
 	
-	<table>
+	<table id='executionDateTB'>
 		<tr>
 			<th class='text-column'><label for="executionDate">$i18n.getString( "report_date" ) </label></th>
 			<th><input type="text" id="executionDate" name="executionDate" class='criteria' value="$!format.formatDate( $programStageInstance.executionDate )" >

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-05-23 15:02:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-06-07 09:55:49 +0000
@@ -55,13 +55,13 @@
 	
 	showLoader();
 	
-	jQuery.getJSON( "loadProgramStages.action",
+	jQuery.getJSON( "loadProgramStageInstances.action",
 		{
 			programId: programId
 		}, 
 		function( json ) 
 		{    
-			setFieldValue( 'programStageId', json.programStages[0].id );
+			setFieldValue( 'programStageInstanceId', json.programStageInstances[0].id );
 			setFieldValue( 'selectedProgramId', programId );
 			$('#executionDate').bind('change');
 			
@@ -85,7 +85,7 @@
 {
 	$( '#dataEntryFormDiv' ).load( "dataentryform.action", 
 		{ 
-			programStageId:getFieldValue('programStageId')
+			programStageInstanceId:getFieldValue('programStageInstanceId')
 		},function( )
 		{
 			hideById('loaderDiv');

=== 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	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-06-07 09:55:49 +0000
@@ -61,7 +61,7 @@
 	var rowId = 'advSearchBox' + jQuery('#advancedSearchTB select[name=searchingAttributeId]').length + 1;
 	var contend  = '<td>' + getInnerHTML('searchingAttributeIdTD') + '</td>';
 		contend += '<td>' + searchTextBox ;
-		contend += '<input type="button" value="-" onclick="removeAttributeOption(' + "'" + rowId + "'" + ');"></td>';
+		contend += '<input type="button" class="small-button" value="-" onclick="removeAttributeOption(' + "'" + rowId + "'" + ');"></td>';
 		contend = '<tr id="' + rowId + '">' + contend + '</tr>';
 
 	jQuery('#advancedSearchTB > tbody:last').append( contend );

=== 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	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-06-07 09:55:49 +0000
@@ -41,7 +41,8 @@
 		function( json ) 
 		{    
 			showById('programInstanceDiv');
-			
+			hideById('executionDateTB');
+				
 			var type = jQuery('#dataRecordingSelectDiv [name=programId] option:selected').attr('type');
 			if( type == 1 && json.programStageInstances.length > 1 )
 			{
@@ -97,6 +98,7 @@
 function loadDataEntry( programStageInstanceId )
 {
 	setInnerHTML('dataEntryFormDiv', '');
+	showById('executionDateTB');
 	showById('dataEntryFormDiv');
 	setFieldValue( 'dueDate', '' );
 	setFieldValue( 'executionDate', '' );
@@ -860,7 +862,7 @@
 			},
 			text: false
 		})
-		.addClass( "small-button" )
+		.addClass( "optionset-small-button" )
 		.click(function() {
 			// close if already visible
 			if ( input.autocomplete( "widget" ).is( ":visible" ) ) {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-04 10:03:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-07 09:55:49 +0000
@@ -808,7 +808,7 @@
 			
 			var programId = jQuery('#programEnrollmentSelectDiv [id=programId] option:selected').val();
 			$('#dataRecordingSelectDiv [id=programId]').val( programId );
-			$('#dataRecordingSelectDiv [id=programIdTR]').hide();
+			$('#dataRecordingSelectDiv [id=inputCriteria]').hide();
 			
 			loadProgramStages();
 			hideLoader();

=== 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-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-06-07 09:55:49 +0000
@@ -18,19 +18,19 @@
 </tr>
 
 <tr>
-	<th colspan="3" class="heading-column">$i18n.getString( "demographics" )</th>
+	<th colspan="2" class="heading-column">$i18n.getString( "demographics" )</th>
 </tr>
 <tr>
 	<td class='text-column'><label for="fullName">$i18n.getString( "full_name" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-	<td class="input-column" colspan='2'>
+	<td class="input-column">
 		<input type="text" id="fullName" name="fullName" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}"/>
-		<img src='../images/search.png' id="searchPatientByNameBtn" name="searchPatientByNameBtn" class="imgButton"/>
+		<img src='../images/search.png' id="searchPatientByNameBtn" name="searchPatientByNameBtn"/>
 	</td>
 </tr>
 	
 <tr>
 	<td class='text-column'><label for="gender">$i18n.getString( "gender" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-	<td class="input-column" colspan='2'>
+	<td class="input-column">
 		<select id="gender" name="gender" class="{validate:{required:true}}">
 			<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
 			<option value="M" >$i18n.getString( "male" )</option>
@@ -42,22 +42,20 @@
 
 <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" style='width:100px'>	
+	<td class="input-column">	
 		<select id='dobType' name="dobType" style='width:100px' 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>
-	</td>
-	<td style='width:240px'>
-		<input type="text" id="birthDate" name="birthDate" style='width:250px;display:none'/>
-		<input type="text" id="age" name="age" class="{validate:{required:true, number:true}}" style="width:250px" />
+		<input type="text" id="age" name="age" class="{validate:{required:true, number:true}}" style="width:145px" />
+		<input type="text" id="birthDate" name="birthDate" style='width:145px;display:none;' />
 	</td>
 </tr>
 
 <tr>
 	<td></td>
-	<td class="input-column" colspan='2'>
+	<td class="input-column">
 		<span id='validateBirthdate' class="hidden" style='color:red'><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
 		<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 	</td>
@@ -65,7 +63,7 @@
 
 <tr>
 	<td class='text-column'><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
-	<td class="input-column" colspan='2'>
+	<td class="input-column">
 		<input type="text" id="phoneNumber" name="phoneNumber" />
 	</td>
 </tr>
@@ -73,9 +71,9 @@
 <tr><td>&nbsp;</td></tr>	
 <tr>
 	<td></td>
-	<td colspan='2'><input type="button" class='button' id='checkDuplicateBtn' name='checkDuplicateBtn' value="$i18n.getString('check_duplicate')" /></td>
+	<td><input type="button" class='button' id='checkDuplicateBtn' name='checkDuplicateBtn' value="$i18n.getString('check_duplicate')" /></td>
 </tr>
-<tr><td colspan="3">&nbsp;</td></tr>	
+<tr><td colspan="2">&nbsp;</td></tr>	
 
 <!-- UNDERAGE -->
 <tr id='underAgeDiv'>
@@ -87,14 +85,14 @@
 
 <!--IDENTIFIERS -->
 #if( $identifierTypes.size() > 0)
-	<tr><td colspan="3">&nbsp;</td></tr>	
-	<tr><th colspan="3" class="heading-column">$i18n.getString( "patient_identifiers" )</th></tr>
+	<tr><td colspan="2">&nbsp;</td></tr>	
+	<tr><th colspan="2" class="heading-column">$i18n.getString( "patient_identifiers" )</th></tr>
 	#foreach ($identifierType in $identifierTypes)
 		#if( $identifierType && $identifierType.program )
 		#else
 		<tr>
 			<td class='text-column'><label>$identifierType.name #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
-			<td class="input-column" colspan='2'>
+			<td class="input-column">
 				<input type="text" id="iden$identifierType.id" name="iden$identifierType.id" data="{related:$identifierType.related}" class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" />
 			</td>
 		</tr>
@@ -105,13 +103,13 @@
 <!-- ATTRIBUTES IN GROUPS -->
 #foreach ($attributeGroup in $attributeGroups )
 	<tr><td>&nbsp;</td></tr>
-	<tr><th colspan="3" class="heading-column">$attributeGroup.name</th></tr>
+	<tr><th colspan="2" class="heading-column">$attributeGroup.name</th></tr>
 	#foreach($attribute in $attributeGroup.attributes )
 		#if( $!attribute && $attribute.program )
 		#else
 		<tr>
 			<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
-			<td class="input-column" colspan='2'>
+			<td class="input-column">
 				#if( $attribute.valueType == "YES/NO" )
 					<select id="attr$attribute.id" name="attr$attribute.id"> 
 						<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -143,13 +141,13 @@
 
 <tr><td>&nbsp;</td></tr>
 #if ( $noGroupAttributes && $noGroupAttributes.size() > 0) 	
-	<tr><th colspan="3" class="heading-column">$i18n.getString( "other_details" )</th></tr>
+	<tr><th colspan="2" class="heading-column">$i18n.getString( "other_details" )</th></tr>
 	#foreach($attribute in $noGroupAttributes )
 		#if( $!attribute && $attribute.program )
 		#else
 		<tr>
 			<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
-			<td class="input-column" colspan='2'>
+			<td class="input-column" >
 				#if( $attribute.valueType == "YES/NO" )
 					<select id="attr$attribute.id"  name="attr$attribute.id" colspan='2' >
 						<option value="" >[$i18n.getString( "please_select" )]</option>             

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm	2012-03-26 06:36:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm	2012-06-07 09:55:49 +0000
@@ -1,7 +1,7 @@
 <p></p>
 <div style="margin-bottom:15px">
-<input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportPatientHistory( '$patient.id', 'xls' )" style="width:140px">
-<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportPatientHistory( '$patient.id', 'pdf' )" style="width:140px">
+<input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportPatientHistory( '$patient.id', 'xls' )" >
+<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportPatientHistory( '$patient.id', 'pdf' )" >
 </div>
 <div>
 #foreach( $grid in $grids )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-05-24 05:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-06-07 09:55:49 +0000
@@ -10,7 +10,7 @@
 		</tr>
 		<tr>
 			<td>
-				<input type="button" class='button' value="$i18n.getString('save')" style="width:10em" onclick='registerPatientLocation( "$patientId" )'>
+				<input type="button" class='button' value="$i18n.getString('save')" onclick='registerPatientLocation( "$patientId" )'>
 				<input type="button" class='button' value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();" >
 			</td>
 			<td></td>

=== 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-05-29 09:23:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-06-07 09:55:49 +0000
@@ -16,9 +16,9 @@
 				<input type='hidden' id='programId' name='programId' value='$programInstance.program.id'>
 				<input type='hidden' id='patientId' name='patientId' value='$programInstance.patient.id'>
 				<!-- IDENTIFIERS -->
-				<table class='mainPageTable' id='enrollmentInforDiv' name='enrollmentInforDiv' >
-					<col id="stageCol">    
-					<col id="entryCol">    
+				<table id='enrollmentInforDiv' name='enrollmentInforDiv' style='width:100%' >
+					<col>    
+					<col>    
 					#if( $identifierTypes.size() > 0 )
 					<tr>
 						<th colspan='2'>$i18n.getString( "identifier" )</th> 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-05-26 17:38:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-06-07 09:55:49 +0000
@@ -82,12 +82,12 @@
                 </tr>
 			</table>
 		</form>
-		
-		<p></p>
-	
-		<div id='programEnrollmentDiv' class='hidden'></div>
 	</fieldset>
 	
+	<p></p>
+		
+	<div id='programEnrollmentDiv' class='hidden'></div>
+
 </div>
 
 <script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-12-22 05:33:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2012-06-07 09:55:49 +0000
@@ -53,7 +53,7 @@
 	        </td>        
 	           
 	        ##value        
-	        <td style="text-align:center">        
+	        <td>        
 	            #if( $patientDataValue.dataElement.type == "bool" )
 	                #if( $patientDataValue.value == "true" )
 	                    $i18n.getString( "yes" ) 
@@ -71,9 +71,9 @@
 	        </td> 
 	      
 	        ##providedByAnotherFacility                
-	        <td style="text-align:center">            
+	        <td>            
 	            #if( !$patientDataValue.providedByAnotherFacility )
-					$patientDataValue.organisationUnit.name
+					$!patientDataValue.programStageInstance.organisationUnit.name
 				#else
 					$i18n.getString("other_facility")
 	            #end                         

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2012-02-16 08:49:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2012-06-07 09:55:49 +0000
@@ -1,7 +1,7 @@
 <h3>$i18n.getString( "relationship_management" )</h3>
 
 <input type="hidden" id="id" name="id" value="$patient.id">
-<table class="list-table infor">                           
+<table class="mainPageTable information">                           
 	<tr>              
 		<td>
 			<table>
@@ -47,7 +47,7 @@
 	
 </table>
 
-<div class='buttons'>
+<div class='button-list'>
 	<input type="button" class='button' value="$i18n.getString( 'add_new' )" onclick="javascript:showAddRelationship('$patient.id')" >
 	<input type="button" class='button' value="$i18n.getString( 'add_new_patient' )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )" >
 	<input type="button" class='button' value="$i18n.getString( 'back_to_registration' )" onclick="onClickBackBtn();" >

=== modified 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-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-06-07 09:55:49 +0000
@@ -10,7 +10,7 @@
 				<input type="text" id='orgunitName' readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "please_select_village" )]" #end style="min-width:350px">
 			</td>
 			<td>
-				<input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" #if($organisationUnit) #else disabled #end>
+				<input type="button" class='large-button' id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" #if($organisationUnit) #else disabled #end>
 			</td>        
 		</tr> 
 	</table>
@@ -39,13 +39,13 @@
 						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 					</td>	
 					<td></td>
-					<td><input type="button" value='+' onclick='addAttributeOption();'>
+					<td><input type="button" class='small-button' value='+' onclick='addAttributeOption();'>
 						<td>
 							$i18n.getString('search_by_selected_unit')
 							<input type='checkbox' id='searchBySelectedOrgunit' name='searchBySelectedOrgunit' value='true' />
 						</td>
 						<td>
-							<input type="button" value='$i18n.getString( "search" )' onclick='searchAdvancedPatients();'>
+							<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='searchAdvancedPatients();'>
 						</td>
 					</td>
 				</tr>

=== 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-05-30 07:10:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-06-07 09:55:49 +0000
@@ -7,9 +7,9 @@
 			<td><label>$i18n.getString( "registering_unit" )</label></td>
 			<td style="padding-right:5px"><input type="text" id='selectedOrgunitText' readonly style="min-width:16em"></td>
 			<td style="padding-right:5px">
-				<input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'>
+				<input type="button" class='large-button' id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'>
 			</td>
-			<td><input type="button" value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();"></td>
+			<td><input type="button" class='large-button' value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();"></td>
 		</tr>
 	</table>
 </div>
@@ -37,13 +37,13 @@
 					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				</td>	
 				<td></td>
-				<td><input type="button" value='+' onclick='addAttributeOption();'> </td>
+				<td><input type="button" class='small-button' value='+' onclick='addAttributeOption();'> </td>
 				<td>
 					$i18n.getString('search_by_selected_unit')
 					<input type='checkbox' id='searchBySelectedOrgunit' name='searchBySelectedOrgunit' value='true' />
 				</td>
 				<td>
-					<input type="button" value='$i18n.getString( "search" )' onclick='searchAdvancedPatients();'>
+					<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='searchAdvancedPatients();'>
 				</td>
 				<td>&nbsp;</td>
 			</tr>

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* For data entry form                                                        */
-/*----------------------------------------------------------------------------*/
-
-.entryScreen
-{
- margin-bottom:20px; 
- width:60%;
- font-size: 13px; 
- line-height:18px;
-}
-
-input.inputText
-{
-	width:220px; 
-	text-align:center;
-}
-
-select.inputText
-{
-	width:225px; 
-	text-align:center;
-}
-
-input.optionset
-{
-	width:195px; 
-	text-align:center;
-}
-
-.text-column
-{
-	text-align:left;
-	padding-right:20px; 
-	padding-left:5px; 
-}
-
-.hidden 
-{
-	display: none;
-}
-
-.visible
-{
-	display: block;
-}
-
-/*----------------------------------------------------------------------------*/
-/* For Program Stages History/Plan                                            */
-/*----------------------------------------------------------------------------*/
-
-td.row
-{
-	border-bottom-style:dotted;
-}
-
-table.history
-{
-	width:350px; 
-	margin-left:10px;
-	margin-top:10px;
-	margin-right:10px;
-	margin-bottom:10px;
-}
-
-div#currentSelection
-{
-	float:right;
-	color: black;  
-	font-size: 12px; 
-}
-
-/*----------------------------------------------------------------------------*/
-/* Action fiels in entry form                                                 */
-/*----------------------------------------------------------------------------*/
-
-input.button
-{
-	width: 150px;
-	padding-left:5px;
-	padding-right:5px;
-}
-
-select.criteria
-{
-	width:350px;
-	margin-right: 5px
-}
-
-input.criteria
-{
-	width:150px;
-	margin-right: 5px;
-}
-.inputWidth
-{
-	width:350px;
-}
-
-div.actions
-{
-  float: right;
-  width: 170px;
-  text-align: right;
-}
-
-.small-button {
-	font-size: .7.5em !important;
-}
-
-.ui-autocomplete { height: 100px; overflow-y: scroll; overflow-x: hidden;}

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-table
-{
- margin-bottom:10px; 
- font-size: 13px; 
- line-height:18px;
-}
-
-input.button
-{
-	width: 150px;
-	padding-left:5px;
-	padding-right:5px;
-}
-
-input.imgButton
-{
-	width:20px;
-	height:20px;
-	cursor: pointer;
-}
-
-.hidden
-{
-	display:none;
-}
-
-.text-column
-{
-	text-align:left;
-	padding-right:20px; 
-	padding-left:5px; 
-}
-
-.infor
-{
-	border:1px solid #808080; 
-	vertical-align:top;
-	padding:10px;
-}
-
-.buttons
-{
-	text-align:right;
-	padding-bottom:10px;
-	width:100%;
-}
-
-.list-table
-{
-	width:100%;
-}
-
-.heading-column { width : 450px;}
-td.input-column { width : 390px;}
-td.input-column input[type="text"]{ width: 360px;}
-td.input-column select { width: 367px;}
-td.error {padding-left:1em}
-
-.infor td{vertical-align: top;}
-
-.focusCell{background-color: #AFCCFF}
-.errorCell{background-color: #FFCFCF}
-.sectionOpen {display: true}
-.sectionClose{ display: none}
-.togglePanel.open {height:25px;padding-left:25px; background-image:  url(../images/open.gif) ; background-repeat: no-repeat; background-position: top left}
-.togglePanel.close {height:25px;padding-left:25px;  background-image:  url(../images/close.gif) ; background-repeat: no-repeat; background-position: top left}
-
-#facilityCol
-{
-	width: 130px;
-}
-
-fieldset
-{
-	border: 1px solid #3f5d8e;
-}
-
-.stage-object
-{
-	width: 100px;
-	height: 40px;
-    white-space: normal;
-	border:2px solid; 
-	cursor:pointer;
-	opacity: 0.75;
-}
-
-.stage-object:hover
-{
-	opacity: 1.0;
-}
-
-.stage-object-selected 
-{
-	width: 120px;
-	height: 50px;
-    opacity: 1.0;
-}
-
-.patient-object
-{
-	width: 100px;
-	height: 40px;
-    white-space: normal;
-	border:2px solid; 
-	border-color:#bbbbbb;
-	background-color:#cccccc
-	cursor:pointer;
-}

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.css	2012-06-07 04:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.css	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* For GRID form                                                              */
-/*----------------------------------------------------------------------------*/
-
-input.button
-{
-	width:60px; 
-}
-
-select[multiple='true']
-{
-	min-width:250px;
-	min-height:250px;
-}
-
-input[type="button"], input[type="submit"]
-{
-	width:150px;
-}
-
-.inputCriteria input[type="text"]
-{
-	width:350px; 
-}
-
-.inputCriteria select
-{
-	width:355px; 
-}
-
-.grid input[type="text"] {
-  width:75%;
-}
-  
-.filter { background: #cccccc; } 
-  
-.rowGrid{ background-color:#eee; }
-  
-.grid th, .grid td
-{
-  text-align: center;
-  width: 150px;
-  line-height: 170%;
-  border:1px solid #fff;
-}
-
-.small-button { font-size: .8em !important; }
-
-.ui-autocomplete { height: 100px; overflow-y: scroll; overflow-x: hidden;}
-
-.hidden 
-{
-	display: none;
-}
-
-.visible
-{
-	display: block;
-}
-
-.stage-object
-{
-	width: 100px;
-	height: 40px;
-    white-space: normal;
-	border:4px solid; 
-	background-color:#ffffff;
-	cursor:pointer;
-}
-
-.stage-object:hover
-{
-	background-color:#6699FF;
-}
-
-.patient-object
-{
-	width: 100px;
-	height: 40px;
-    white-space: normal;
-	border:4px solid; 
-	border-color:#bbbbbb;
-	background-color:#cccccc
-	cursor:pointer;
-}
\ No newline at end of file

=== added 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	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-06-07 09:55:49 +0000
@@ -0,0 +1,152 @@
+/*----------------------------------------------------------------------------*/
+/* Form
+/*----------------------------------------------------------------------------*/
+
+input[type="button"], input[type="submit"] {
+    width: 128px;
+}
+
+input.small-button[type="button"] {
+    width: 30px;
+}
+
+input.large-button[type="button"] {
+    width: 105px;
+}
+
+input[type="text"] {
+    width: 250px;
+}
+
+select {
+    width: 253px;
+}
+
+
+.button-list
+{
+	text-align:right;
+	padding-bottom:10px;
+	width:100%;
+}
+
+/*----------------------------------------------------------------------------*/
+/* Table
+/*----------------------------------------------------------------------------*/
+
+table {
+    font-size: 13px;
+    line-height: 18px;
+    margin-bottom: 10px;
+}
+
+.heading-column {
+    width: 400px;
+}
+
+td.input-column {
+    width: 280px;
+	padding-left: 5px; 
+	padding-right: 1px; 
+}
+
+td.error {
+    padding-left: 1em;
+}
+
+table.information, td.information
+{
+	border:1px solid #808080; 
+	vertical-align:top;
+	padding:10px;
+}
+
+.text-column {
+    padding-left: 5px;
+    padding-right: 20px;
+    text-align: left;
+}
+
+/*----------------------------------------------------------------------------*/
+/* button list
+/*----------------------------------------------------------------------------*/
+
+.buttons
+{
+	text-align:right;
+	padding-bottom:10px;
+	width:100%;
+}
+
+
+div.actions
+{
+  float: right;
+  width: 170px;
+  text-align: right;
+}
+
+/*----------------------------------------------------------------------------*/
+/* For data entry form                                                        */
+/*----------------------------------------------------------------------------*/
+
+.entryScreen
+{
+ margin-bottom:20px; 
+ width:70%;
+ font-size: 13px; 
+ line-height:18px;
+}
+
+input.criteria
+{
+	width:150px;
+	margin-right: 5px;
+}
+
+input.stage-object[type="button"]
+{
+	width: 100px;
+	height: 40px;
+    white-space: normal;
+	border:2px solid; 
+	cursor:pointer;
+	opacity: 0.75;
+}
+
+input.stage-object[type="button"]:hover
+{
+	opacity: 1.0;
+}
+
+input.stage-object-selected[type="button"]
+{
+	width: 120px;
+	height: 50px;
+    opacity: 1.0;
+}
+
+input.patient-object[type="button"]
+{
+	width: 100px;
+	height: 40px;
+    white-space: normal;
+	border:2px solid; 
+	border-color:#bbbbbb;
+	background-color:#cccccc
+	cursor:pointer;
+}
+
+input.optionset[type="text"]
+{
+	width:222px; 
+}
+
+.optionset-small-button{
+	font-size: .8em !important;
+}
+
+
+.hidden {
+    display: none;
+}

=== 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-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-06-07 09:55:49 +0000
@@ -65,7 +65,7 @@
 <table>
 		
 	<tr>
-		<th colspan="3" class="heading-column">$i18n.getString( "system_identifier" )</th>
+		<th colspan="2" class="heading-column">$i18n.getString( "system_identifier" )</th>
 	</tr>	
 	<tr>
 		<td></td>
@@ -76,15 +76,15 @@
 	</tr>	
 
 	<tr>
-		<th colspan="3" class="heading-column">$i18n.getString( "demographics" )</th>
+		<th colspan="2" class="heading-column">$i18n.getString( "demographics" )</th>
 	</tr>
 	<tr>
 		<td class='text-column'><label for="fullName">$i18n.getString( "full_name" )</label></td>
-		<td class="input-column" colspan='2'><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}"></td>
+		<td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}"></td>
 	</tr>
 	<tr>
 		<td class='text-column'><label for="gender">$i18n.getString( "gender" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td class="input-column" colspan='2' >
+		<td class="input-column">
 			<select id="gender" name="gender">
 				<option value="M" #if( $!patient.gender == 'M' ) selected="selected" #end>$i18n.getString( "male" )</option>
 				<option value="F" #if( $!patient.gender == 'F' ) selected="selected" #end>$i18n.getString( "female" )</option>
@@ -95,22 +95,20 @@
 	
 	<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" style='width:100px'>	
+		<td class="input-column">	
 			<select id='dobType' name="dobType" style='width:100px' onchange='dobTypeOnChange("patientForm")' >
 				<option value="A" #if($patient.dobType=='A') checked #end >$i18n.getString( "approximated" )</option>
 				<option value="D" #if($patient.dobType=='D') checked #end >$i18n.getString( "declared" )</option>
 				<option value="V" #if($patient.dobType=='V') checked #end >$i18n.getString( "verified" )</option>
 			</select>
-		</td>
-		<td style='width:240px'>
-			<input type="text" id="birthDate" name="birthDate" value='$format.formatDate($!patient.birthDate)' style='width:242px;' />
-			<input type="text" id="age" name="age" value='$!patient.getAge()' class="{validate:{required:true, number:true}}" style='width:250px' />
+			<input type="text" id="birthDate" name="birthDate" value='$format.formatDate($!patient.birthDate)' style='width:145px;' />
+			<input type="text" id="age" name="age" value='$!patient.getAge()' class="{validate:{required:true, number:true}}" style='width:145px' />
 		</td>
 	</tr>
 
 	<tr>
 		<td></td>
-		<td class="input-column" colspan='2'>
+		<td class="input-column">
 			<span id='validateBirthdate' class="hidden" style='color:red'><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
 			<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 		</td>
@@ -118,7 +116,7 @@
 	
 	<tr>
 		<td class='text-column'><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
-		<td class="input-column" colspan='2'>
+		<td class="input-column">
 			<input type="text" id="phoneNumber" name="phoneNumber" value="$!patient.phoneNumber" />
 		</td>
 	</tr>
@@ -145,7 +143,7 @@
 
 	<tr id='deathDateTR' class="hidden" >
 		<td class='text-column'><label for="deathDate">$i18n.getString("death_date")</label></td>
-		<td class="input-column" colspan='2'>
+		<td class="input-column">
 			<input type="text" name="deathDate" id="deathDate" #if($!patient.deathDate) value="$format.formatDate( $!patient.deathDate )" #end>
 		</td>
 	</tr>
@@ -156,15 +154,15 @@
 		#set( $representative = $!patient.representative ) 
 		<tr>
 			<td class='text-column'>$i18n.getString("representative")</td>
-			<td colspan='2'> 
-				$!patient.representative.getFullName() <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='imgButton'>
+			<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="3" class="heading-column">$i18n.getString("patient_identifiers")</th></tr>
+		<tr><th colspan="2" class="heading-column">$i18n.getString("patient_identifiers")</th></tr>
 		#foreach ($identifierType in $identifierTypes)
 			#if( $identifierType.program )
 			#else
@@ -172,7 +170,7 @@
 				#set( $identifier = $identiferMap.get( $identifierType.id ) )
 				<tr>
 					<td class='text-column'><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
-					<td class="input-column" colspan='2'><input type="text" id="iden$identifierType.id" name="iden$identifierType.id" value="$!identifier" data="{related:$identifierType.related}" #if($identifierType.related && $!patient.underAge) disabled="disabled" #end class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>	
+					<td class="input-column"><input type="text" id="iden$identifierType.id" name="iden$identifierType.id" value="$!identifier" data="{related:$identifierType.related}" #if($identifierType.related && $!patient.underAge) disabled="disabled" #end class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>	
 				</tr>
 			#end
 		#end
@@ -182,14 +180,14 @@
 
 	#foreach ($attributeGroup in $attributeGroups )
 		<tr><td>&nbsp;</td></tr>	
-		<tr><th colspan="3" class="heading-column">$attributeGroup.name</th></tr>
+		<tr><th colspan="2" class="heading-column">$attributeGroup.name</th></tr>
 		#foreach($attribute in $attributeGroup.attributes)
 			#if( $attribute.program )
 			#else
 				#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
 				<tr>
 					<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
-					<td class="input-column" colspan='2' >
+					<td class="input-column">
 						#if( $attribute.valueType == "YES/NO" )
 							<select id="attr$attribute.id"  name="attr$attribute.id" >              
 								<option value="">[$i18n.getString( "please_select" )]</option>
@@ -221,13 +219,13 @@
 	<!-- ATTRIBUTES NOT IN GROUPS -->
 
 	#if ( $noGroupAttributes && $noGroupAttributes.size() > 0) 	
-		<tr><th colspan="3" class="heading-column">$i18n.getString( "Other details" )</th></tr>
+		<tr><th colspan="2" class="heading-column">$i18n.getString( "Other details" )</th></tr>
 		#foreach($attribute in $noGroupAttributes )
 		#set( $attributeValue = "" )
 		#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
 			<tr>
 				<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
-				<td class="input-column" colspan='2' >
+				<td class="input-column">
 					#if( $attribute.valueType == "YES/NO" )
 						<select id="attr$attribute.id"  name="attr$attribute.id" >              
 							<option value="">[$i18n.getString( "please_select" )]</option>
@@ -253,13 +251,16 @@
 			</tr>
 		#end
 	#end
+	<tr><td><td><p></p></td></tr>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" class='button' value="$i18n.getString( 'update' )" >
+			<input type="button" class='button' value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();" />
+		</td>
+	</tr>
 </table>
 
-<p>
-	<input type="submit" class='button' value="$i18n.getString( 'update' )" >
-	<input type="button" class='button' value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();" />
-</p>
-
 </form> 	
 
 <div id="representativeInfo" class='hidden text-column'>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-06-07 09:55:49 +0000
@@ -38,7 +38,7 @@
 dhis-web-maintenance-user=Users
 dhis-web-maintenance-dataadmin=Data administration
 dhis-web-maintenance-settings=Settings
-dhis-web-maintenance-patient=Beneficiaries and Programs
+dhis-web-maintenance-patient=Persons and Programs
 dhis-web-maintenance-mobile=Mobile configuration
 dhis-web-caseentry=Name-Based Data Records
 dhis-web-dataentry=Data Entry