=== 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-02-13 07:42:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-02-17 14:13:38 +0000
@@ -470,4 +470,5 @@
 back_to_main_menu = Back to main menu
 of = of
 option_set = Option set
-show_all_items = Show all items
\ No newline at end of file
+show_all_items = Show all items
+see_history_plan = See history / plan
\ No newline at end of file

=== 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-03-01 07:44:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-02-17 14:13:38 +0000
@@ -81,7 +81,12 @@
 				##data element name
 				<td class='text-column'>
 					<span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">
-						$encoder.htmlEncode( $programStageDataElement.dataElement.name ) 
+						#if( $!programStageDataElement.dataElement.formName )
+							$encoder.htmlEncode( $programStageDataElement.dataElement.formName ) 
+						#else
+							$encoder.htmlEncode( $programStageDataElement.dataElement.name ) 
+						#end
+						
 						#if ( $programStageDataElement.compulsory )
 							<em title="$i18n.getString( "required" )" class="required">*</em>
 						#end        
@@ -94,7 +99,7 @@
 					#set( $id = $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val' )
 					#if( $!programStageDataElement.dataElement.optionSet )
 						#set( $optionId = $id + '-options')
-						<input name="entryselect" options='$programStageDataElement.dataElement.optionSet.options' id='$id' value='$!patientDataValue.value' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" #if($programStageInstance.completed) disabled="disabled" #end id="$id-options" dataElementId="$programStageDataElement.dataElement.id" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
+						<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()' }" #if($programStageInstance.completed) disabled="disabled" #end id="$id-options" dataElementId="$programStageDataElement.dataElement.id" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
 					#elseif( $programStageDataElement.dataElement.type == "bool" )
 						<select name="entryselect" #if($programStageInstance.completed) disabled="disabled" #end data="{compulsory: $programStageDataElement.compulsory }" id="$id" onchange="saveOpt( $programStageDataElement.dataElement.id )" tabindex="$tabIndex"> 
 							<option value="">[$i18n.getString( "select_value" )]</option>

=== 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-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-02-17 14:13:38 +0000
@@ -21,8 +21,11 @@
 			<td>$encoder.htmlEncode( $patient.getAge() )</td>
 		</tr>
 		</table>
-		<td class="history">
-			<div id="currentSelection" class="hidden"></div>
+	</tr>
+	<tr>
+		<td>
+			<a href="javascript:showHistoryPlan()" id='historyPlanLink' title="$i18n.getString( 'see_history_plan' )" class="hidden">$i18n.getString('see_history_plan')</a>
+			<div id="currentSelection" class="hidden history"></div>
 		</td>
 	</tr>
 	<tr>

=== 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-02-13 07:42:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-02-17 14:13:38 +0000
@@ -17,7 +17,7 @@
 	var programId = jQuery('#dataRecordingSelectDiv [name=programId]').val();
 	if ( programId == 0 )
 	{
-		hideById('currentSelection');
+		hideById('historyPlanLink');
 		return;
 	}
 	jQuery.postJSON( "loadProgramStages.action",
@@ -50,8 +50,7 @@
 				
 				// show history / plan
 				setInnerHTML( 'currentSelection', '' ); 
-				var history = '<h4>' + i18n_program_stages_history_plan + '</h4>';
-				history += '<table class="history">';
+				var history = '<table class="history">';
 				history += '<tr>';
 				history += '<td class="bold row">' + i18n_program_stage + '</td>';
 				history += '<td class="bold row">' + i18n_scheduled_for + '</td>';
@@ -69,7 +68,7 @@
 				}
 				history += '</table>';
 				setInnerHTML( 'currentSelection', history );
-				showById('currentSelection');
+				showById('historyPlanLink');
 				
 				disable('completeBtn');
 				disable('validationBtn');
@@ -82,6 +81,19 @@
 	});
 }
 
+function showHistoryPlan()
+{
+	$('#currentSelection' ).dialog({
+        title: i18n_program_stages_history_plan,
+		maximize: true, 
+		closable: true,
+		modal:false,
+		overlay:{background:'#000000', opacity:0.1},
+		width: 400,
+        height: 400
+    });
+}
+
 //--------------------------------------------------------------------------------------------
 // Load data-entry-form
 //--------------------------------------------------------------------------------------------

=== modified 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-02-08 14:07:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css	2012-02-17 14:13:38 +0000
@@ -10,12 +10,24 @@
  line-height:18px;
 }
 
-input.inputText, select.inputText
+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;
@@ -55,8 +67,6 @@
 {
 	float:right;
 	color: black;  
-	background-color: #D5FFC5;
-	border: 1px solid black;
 	font-size: 12px; 
 }