=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2014-04-17 16:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2014-07-10 06:49:13 +0000
@@ -1,7 +1,7 @@
 <div id='reportTitle' name='reportTitle' style="display:none;">
 	#set($id = '')
 	#foreach( $attributeValue in $entityInstance.attributeValues)
-		#set($id=$id + $attributeValue.value + ";")
+		#set($id=$id + "<b>" + $attributeValue.attribute.displayName + ":</b> " + $attributeValue.value + "<br>")
 	#end 
 				
 	<h3>$i18n.getString('records_of') $!encoder.htmlEncode( $id )  $i18n.getString('at') $programStage.displayName $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
@@ -12,16 +12,15 @@
 	#if( $entityInstance )
 		<table>
 			<tr>            
+				<td class='bold coordinates1'>$i18n.getString('program'):</td>
+				<td class='coordinates2'>$program.displayName
+					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, false)' #if( $programStageInstance.programInstance.followup == 'false') class='hidden' #end name='imgMarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/risk_small.png'></a>
+					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, true)' #if( $programStageInstance.programInstance.followup == 'true') class='hidden' #end name='imgUnmarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/unrisk_small.png'></a>			
+				</td>
 				<td class='coordinates1'>
 					<span class='bold' id="entityInstanceName">$i18n.getString( "attributes" ): </span>
 				</td>
-				<td class='coordinates2'>$id</td>
-				<td class='bold coordinates1'>$i18n.getString('program'):</td>
-				<td class='coordinates2'>$program.displayName</td>
-				<td rowspan='2'>
-					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, false)' #if( $programStageInstance.programInstance.followup == 'false') class='hidden' #end name='imgMarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/risk_large.png'></a>
-					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, true)' #if( $programStageInstance.programInstance.followup == 'true') class='hidden' #end name='imgUnmarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/unrisk_large.png'></a>			
-				</td>
+				<td>$id</td>
 			</tr>
 			<tr><td class='bold coordinates1' style="vertical-align:top">$i18n.getString('program_stage'):</td>
 				<td class='coordinates2'>$programStageInstance.programStage.displayName</td>