dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03216
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1067: Cosmetic fixes.
------------------------------------------------------------
revno: 1067
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-11-20 12:15:42 +0100
message:
Cosmetic fixes.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.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-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2009-11-20 08:30:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2009-11-20 11:15:42 +0000
@@ -6,7 +6,7 @@
removing_representative_failed = Removing representative failed
saving_representative_failed = Saving representative failed
adding_relationship_failed = Adding relationship failed
-relationship_s_for = Relationship's for
+relationship_management = Relationship management
please_select = Please Select
patients_and_programs = Patients and Programs
is = IS
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm 2009-11-19 19:31:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm 2009-11-20 11:15:42 +0000
@@ -2,7 +2,7 @@
<h2><a href="index.action">$i18n.getString( "paitents_and_programs" ) </a></h2>
<ul>
- <li><a href="patient.action">$i18n.getString( "patient_management" ) </a></li>
+ <li><a href="patient.action">$i18n.getString( "patient" ) </a></li>
</ul>
<br>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm 2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm 2009-11-20 11:15:42 +0000
@@ -3,9 +3,8 @@
<form id="programEnrollmentForm" name="programEnrollmentForm" method="post" action="saveProgramEnrollment.action" onsubmit="return validateProgramEnrollment()">
<table>
-
<tr>
- <td><label for="enrollmentDate">$i18n.getString( "date_of_enrollment" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td style="width:180px"><label for="enrollmentDate">$i18n.getString( "date_of_enrollment" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="enrollmentDate" name="enrollmentDate" #if( $programInstance ) value="$!format.formatDate( $programInstance.enrollmentDate )" #end>
<img src="../images/calendar_icon.gif" width="16" height="16" id="getEnrollmentDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date_of_enrollment" )"></td>
<script type="text/javascript">
@@ -18,7 +17,7 @@
</tr>
<tr>
- <td><label for="dateOfIncident">$i18n.getString( "date_of_incident" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td style="width:180px"><label for="dateOfIncident">$i18n.getString( "date_of_incident" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="dateOfIncident" name="dateOfIncident" #if( $programInstance ) value="$!format.formatDate( $programInstance.dateOfIncident )" #end>
<img src="../images/calendar_icon.gif" width="16" height="16" id="getDateOfIncident" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date_of_incident" )"></td>
<script type="text/javascript">
@@ -28,23 +27,22 @@
button : "getDateOfIncident" // trigger for the calendar (button ID)
});
</script>
- </tr>
-
+ </tr>
<tr>
<td></td>
<td></td>
</tr>
<tr>
- <td><input type="submit" #if( $programInstance ) value="$i18n.getString( "update_enrollment_date" ) #else value="$i18n.getString( "enroll" ) #end"></td>
- <td><input type="button" value="$i18n.getString( "unenroll" )" onclick="window.location.href='removeEnrollment.action'" #if( !$programInstance ) disabled="disabled" #end></td>
- </tr>
-
+ <td style="width:180px">
+ <input type="submit" #if( $programInstance ) value="$i18n.getString( "update" )#else value="$i18n.getString( "enroll" ) #end">
+ <input type="button" value="$i18n.getString( "unenroll" )" onclick="window.location.href='removeEnrollment.action'" #if( !$programInstance ) disabled="disabled" #end>
+ </td>
+ </tr>
</table>
</form>
-
#if( $programInstance )
<table class="mainPageTable">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm 2009-11-14 14:29:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm 2009-11-20 11:15:42 +0000
@@ -14,27 +14,19 @@
<table>
<tr>
<td><strong>$i18n.getString( "full_name" ):</strong></td>
- <td>
- $encoder.htmlEncode( $patient.getFullName() )
- </td>
+ <td>$encoder.htmlEncode( $patient.getFullName() )</td>
</tr>
<tr>
<td><strong>$i18n.getString( "gender" ):</strong></td>
- <td>
- $encoder.htmlEncode( $patient.gender )
- </td>
+ <td>$encoder.htmlEncode( $patient.gender )</td>
</tr>
<tr>
<td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
- <td>
- $format.formatDate( $patient.birthDate )
- </td>
+ <td>$format.formatDate( $patient.birthDate )</td>
</tr>
<tr>
<td><strong>$i18n.getString( "age" ):</strong></td>
- <td>
- $encoder.htmlEncode( $patient.getAge() )
- </td>
+ <td>$encoder.htmlEncode( $patient.getAge() )</td>
</tr>
<tr>
<td> </td>
@@ -45,9 +37,9 @@
<table>
<tr>
- <td><label for="programId">$i18n.getString( "program" )</label></td>
+ <td style="width:180px"><label for="programId">$i18n.getString( "program" )</label></td>
<td>
- <select id="programId" name="programId" onchange="document.getElementById( 'programSelectForm' ).submit();" #if( $programs.size() == 0 ) disabled="disabled" #end>
+ <select id="programId" name="programId" onchange="document.getElementById( 'programSelectForm' ).submit();" style="min-width:200px" #if( $programs.size() == 0 ) disabled="disabled"#end>
<option value="0">[$i18n.getString( "select" )]</option>
#foreach( $program in $programs )
<option value="$program.id" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2009-11-20 08:30:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2009-11-20 11:15:42 +0000
@@ -28,8 +28,8 @@
<td></td>
<td></td>
<td colspan="3" style="text-align:right">
- <input type="button" value="$i18n.getString( "sort" )" onclick="javascript:showSortProgramStage()">
- <input type="button" value="$i18n.getString( "add_new" )" onclick="javascript:addProgramStage()">
+ <input type="button" value="$i18n.getString( "sort" )" onclick="javascript:showSortProgramStage()" style="width:75px">
+ <input type="button" value="$i18n.getString( "add_new" )" onclick="javascript:addProgramStage()" style="width:75px">
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm 2009-11-14 14:29:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm 2009-11-20 11:15:42 +0000
@@ -2,7 +2,7 @@
<input type="button" value="$i18n.getString( "back_to_search" )" onclick="window.location.href='searchPatient.action'" style="width:10em">
</div>
-<h3>$i18n.getString( "relationship_s_for" )</h3>
+<h3>$i18n.getString( "relationship_management" )</h3>
<div>
<input type="hidden" id="id" name="id" value="$patient.id">
