dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6768
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-04-26 21:43:21 +0200
message:
  Anonymous event, cosmetic fix
modified:
  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/dataEntryForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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-02-17 19:02:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-04-26 19:43:21 +0000
@@ -1,6 +1,5 @@
 <h3>$i18n.getString( "anonymous_events" )</h3>	
 
-
 <div class="actions">	
 	<input type="button" class='button' id="createEventBtn" value="$i18n.getString('create_new_event')" onClick="javascript: createNewEvent();" disabled="disabled">
 	<input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete();" disabled="disabled" >

=== 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-27 07:20:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-04-26 19:43:21 +0000
@@ -42,23 +42,23 @@
 <div id='entryForm' #if($!programStageInstance.executionDate) class='visible' #else class='hidden' #end>
 	##providedByAnotherFacility
 	<table class='entryScreen'>	
+		#if($programStageInstance.programInstance.program.displayProvidedOtherFacility == 'true' )
 		<tr>
-			<th>
-				#if($programStageInstance.programInstance.program.displayProvidedOtherFacility == 'true' )
-					#set( $id = $programStageInstance.programStage.id + '_facility' )
-					#if( $!programStageInstance.providedByAnotherFacility)
-						#if( $!programStageInstance.providedByAnotherFacility == 'true' ) 					
-							$i18n.getString( "orgunit_provided_service" ): $programStageInstance.organisationUnit.name
-						#elseif( $!programStageInstance.providedByAnotherFacility == 'false' ) 
-							$i18n.getString( "orgunit_provided_service" ): $i18n.getString("other_facility")
-						#end
-					#else
-						$i18n.getString( "provided_elsewhere" ) 
-						<input type="checkbox" id='$id' onclick="updateProvidingFacility();" #if($programStageInstance.completed) disabled="disabled" #end >
+			<th>				
+				#set( $id = $programStageInstance.programStage.id + '_facility' )
+				#if( $!programStageInstance.providedByAnotherFacility)
+					#if( $!programStageInstance.providedByAnotherFacility == 'true' ) 					
+						$i18n.getString( "orgunit_provided_service" ): $programStageInstance.organisationUnit.name
+					#elseif( $!programStageInstance.providedByAnotherFacility == 'false' ) 
+						$i18n.getString( "orgunit_provided_service" ): $i18n.getString("other_facility")
 					#end
+				#else
+					$i18n.getString( "provided_elsewhere" ) 
+					<input type="checkbox" id='$id' onclick="updateProvidingFacility();" #if($programStageInstance.completed) disabled="disabled" #end >
 				#end
 			</th>
 		</tr>
+		#end
 	</table>
 
 	#if( $customDataEntryFormCode )