dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7977
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-29 14:20:26 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css


--
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/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-08-29 06:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-08-29 07:20:26 +0000
@@ -1,16 +1,11 @@
-<h4>$i18n.getString("patient_dashboard")
+<h4>
+ <a href="javascript:onClickBackBtn();">$i18n.getString( 'back_to_registration' )</a>
+ &#8226; <a href="javascript:showProgramEnrollmentForm( '$patient.id' )">$i18n.getString( "program_management" )</a>
  &#8226; <a href="javascript:showUpdatePatientForm( '$patient.id', true )">$i18n.getString( "edit_profile" )</a>
  &#8226; <a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList( '$patient.id' );">$i18n.getString( "manage_relationship" )</a>
  &#8226; <a href="javascript:getPatientLocation( '$patient.id' );">$i18n.getString( "change_patient_location" )</a>
 </h4>
 
-<div id="subMenu">
-	<ul>
-		<li><a href="javascript:onClickBackBtn();">$i18n.getString( 'back_to_registration' )</a></li>
-		<li><a href="javascript:showProgramEnrollmentForm( '$patient.id' )">$i18n.getString( "program_management" )</a></li>
-	</ul>
-</div>
-
 <table>
 	<tr>
 		<td valign='top'>
@@ -37,7 +32,13 @@
 									</tr>
 									<tr>
 										<td>$i18n.getString("phone_number")</td>
-										<td>$!patient.phoneNumber</td>
+										<td>
+											#if($!patient.phoneNumber && $!patient.phoneNumber!='')
+												$!patient.phoneNumber
+											#else
+												[$i18n.getString('none')]
+											#end
+										</td>
 									</tr>
 									#foreach( $identifier in $identifiers )
 									<tr>

=== 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-08-28 05:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-08-29 07:20:26 +0000
@@ -235,7 +235,6 @@
   width:350px;
   overflow:hidden;
   position:relative;
-  top: 45px;
 }
 
 .contentProviderTable