------------------------------------------------------------ revno: 7319 committer: Tran Chau <[email protected]> branch nick: dhis2 timestamp: Mon 2012-06-18 11:21:23 +0700 message: Small change Enrollment form UI. modified: 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/programEnrollmentSelectForm.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/programEnrollmentForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-06-18 03:29:11 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-06-18 04:21:23 +0000 @@ -14,7 +14,7 @@ <input type='hidden' id='programId' name='programId' value='$programInstance.program.id'> <input type='hidden' id='patientId' name='patientId' value='$programInstance.patient.id'> <!-- IDENTIFIERS --> - <table id='enrollmentInforDiv' name='enrollmentInforDiv' style='width:100%' > + <table id='enrollmentInforDiv' name='enrollmentInforDiv' class='mainPageTable' > #if( $identifierTypes.size() > 0 ) <tr> <th colspan='2'>$i18n.getString( "identifier" )</th> @@ -33,10 +33,10 @@ </tr> #set( $mark = !$mark ) #end - + <!-- ATTRIBUTES IN GROUPS --> - <tr><td> </td></tr> #foreach ($attributeGroup in $attributeGroups ) + <tr><td> </td></tr> <tr><th colspan="2" class="heading-column">$attributeGroup.name</th></tr> #set( $mark = false ) #foreach($attribute in $attributeGroup.attributes) === 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-06-14 03:58:46 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2012-06-18 04:21:23 +0000 @@ -1,29 +1,39 @@ <h3>$i18n.getString( "patient_info" )</h3> <div> - <table> - <tr> - <td class='bold text-column'>$i18n.getString( "full_name" ):</td> - <td>$encoder.htmlEncode( $patient.getFullName() )</td> - </tr> - <tr> - <td class='bold text-column'>$i18n.getString( "gender" ):</td> - <td>$i18n.getString( $patient.gender )</td> - </tr> - <tr> - <td class='bold text-column'>$i18n.getString( "date_of_birth" ):</td> - <td>$format.formatDate( $patient.birthDate ) $patient.getAge()</td> - </tr> - #if( $patient.programs.size() > 0 ) - <tr> - <td class='bold text-column'>$i18n.getString( "enrolled_for" ):</td> - #foreach( $program in $patient.programs ) - <td>$program.name</td> - </tr> - <tr><td></td> - #end - </tr> - #end + <table class='mainPageTable'> + <tr> + <td> + <table> + <tr> + <td class='bold text-column'>$i18n.getString( "full_name" ): </td> + <td>$encoder.htmlEncode( $patient.getFullName() )</td> + </tr> + <tr> + <td class='bold text-column'>$i18n.getString( "gender" ):</td> + <td>$i18n.getString( $patient.gender )</td> + </tr> + <tr> + <td class='bold text-column'>$i18n.getString( "date_of_birth" ):</td> + <td>$format.formatDate( $patient.birthDate ) $patient.getAge()</td> + </tr> + </table> + <td> + #if( $patient.programs.size() > 0 ) + <td align="right"> + <table> + <tr> + <td class='bold text-column' style="vertical-align:top">$i18n.getString( "enrolled_for" ):</td> + <td rowspan='$patient.programs.size()' style="vertical-align:right"> + #foreach( $program in $patient.programs ) + $program.name<br> + #end + </td> + </tr> + </table> + </td> + #end + </tr> <tr> <td> </td> </tr>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
