------------------------------------------------------------
revno: 4992
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Fri 2011-10-21 13:22:36 +0700
message:
Move the Go back to search button to be on under the beneficiary info area;
rename button label to Back to registration.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
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/programUnenrollmentSelectForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-10-06 09:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-10-21 06:22:36 +0000
@@ -1,4 +1,5 @@
-back_to_search = Go back to search
+back_to_registration = Back to registration
+back_to_relationship = Back to relationship
program_stages_history_plan = Program Stages History/Plan
completed_on = Completed On
scheduled_for = Scheduled For
@@ -438,4 +439,5 @@
edit_profile = Edit profile
aggregate_details = Aggregate details
show_details = Show details
-representative_info = Representative's Information
\ No newline at end of file
+representative_info = Representative's Information
+relationship_for = Relationship for
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm 2011-10-06 06:10:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm 2011-10-21 06:22:36 +0000
@@ -37,7 +37,6 @@
</script>
<h3>$i18n.getString( "add_new_patient" )</h3>
-<p><input type="button" value="$i18n.getString( 'back_to_search' )" onclick="loadPatientList();" style="width:10em"/></p>
<form id="patientForm" name="patientForm" method="post" >
<input type="hidden" id="representativeId" name="representativeId"/>
@@ -49,6 +48,7 @@
<p style="margin-top:10px">
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2011-09-30 08:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2011-10-21 06:22:36 +0000
@@ -9,9 +9,6 @@
});
</script>
-<div>
- <input type="button" value="$i18n.getString( 'back_to_search' )" onclick="showRelationshipList($patient.id)" style="width:10em"/>
-</div>
<h3>$i18n.getString( "adding_new_relationship_for" )</h3>
@@ -21,6 +18,9 @@
<tr>
<td style="vertical-align:top" bgcolor="#cccccc">
<table>
+ <tr>
+ <th colspan='2'>$i18n.getString('patient_profile')</th>
+ </tr>
<tr>
<td class="bold">$i18n.getString( "full_name" ):</td>
<td>
@@ -51,7 +51,10 @@
</table>
</td>
<td style="vertical-align:top">
- <table>
+ <table>
+ <tr>
+ <th colspan='2'>$i18n.getString('relationship_for') $patient.getFullName()</th>
+ </tr>
<tr>
<td>$encoder.htmlEncode( $patient.getFullName() ) $i18n.getString( "'s" )</td>
</tr>
@@ -64,7 +67,7 @@
<option value="$relationshipType.id:$encoder.htmlEncode( $relationshipType.bIsToA )" #if( $relationshipTypeId && "$relationshipType.id:$encoder.htmlEncode( $relationshipType.bIsToA )" == $relationshipTypeId ) selected="selected" #end>$encoder.htmlEncode( $relationshipType.bIsToA )</option>
#end
</select>
- $i18n.getString( "is" )
+ $i18n.getString( "is" )
</td>
</tr>
@@ -90,8 +93,8 @@
</td>
</tr>
<tr>
- <td>
- <select size="15" id="availablePartnersList" name="availablePartnersList" style="min-width:20em;height:10em" class="{validate:{required:true}}">
+ <td colspan='2'>
+ <select size="30" id="availablePartnersList" name="availablePartnersList" style="width:37em;height:20em" class="{validate:{required:true}}">
#foreach ( $partner in $patients )
<option value="$partner.id"> $encoder.htmlEncode( $partner.getFullName() )</option>
#end
@@ -99,7 +102,10 @@
</td>
</tr>
<tr>
- <td><input type="button" value="$i18n.getString( 'assign_relationship' )" onclick="javascript:addRelationship()" style="width:10em"/></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'assign_relationship' )" onclick="javascript:addRelationship()" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'back_to_relationship' )" onclick="showRelationshipList($patient.id)" style="width:10em"/>
+ </td>
</tr>
</table>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm 2011-10-06 09:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm 2011-10-21 06:22:36 +0000
@@ -26,9 +26,6 @@
});
});
</script>
-<div>
- <input type="button" value="$i18n.getString( "back_to_search" )" onclick="showRelationshipList($patient.id);" style="width:10em">
-</div>
<h3>$i18n.getString("add_new_relationship_for"): $patient.getFullName()</h3>
@@ -53,7 +50,22 @@
<p style="margin-top:10px">
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+ <input type="button" id='backbtn' value="$i18n.getString( 'back_to_registration' )" onclick="showRelationshipList($patient.id);" style="width:10em">
</p>
</form>
+<script>
+ var i18n_back_to_registration = '$encoder.jsEscape( $i18n.getString( "back_to_registration" ) , "'" )';
+ var i18n_back_to_relationship = '$encoder.jsEscape( $i18n.getString( "back_to_relationship" ) , "'" )';
+
+ if( getFieldValue('isShowPatientList') == 'false' )
+ {
+ jQuery('#backbtn').val(i18n_back_to_relationship);
+ }
+ else
+ {
+ jQuery('#backbtn').val(i18n_back_to_registration);
+ }
+</script>
+
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-10-06 09:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-10-21 06:22:36 +0000
@@ -2,7 +2,7 @@
<table class="mainPageTable" id='patientInfoDiv'>
<tr>
<td>
- <input type="button" value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" style="width:10em">
+ <input type="button" value="$i18n.getString( 'back_to_registration' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" style="width:10em">
</td>
</tr>
<tr>
=== 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 2011-10-07 03:21:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2011-10-21 06:22:36 +0000
@@ -21,7 +21,7 @@
<td class='bold'>$i18n.getString( "age" ):</td>
<td>$encoder.htmlEncode( $patient.getAge() )</td>
<td align='right'>
- <input type="button" value="$i18n.getString( "back_to_search" )" onclick="loadPatientList();" style="width:10em">
+ <input type="button" value="$i18n.getString( "back_to_registration" )" onclick="loadPatientList();" style="width:10em">
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm 2011-09-30 08:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm 2011-10-21 06:22:36 +0000
@@ -22,15 +22,11 @@
</script>
-<div>
- <input type="button" value="$i18n.getString( "back_to_search" )" onclick="onClickBackBtn();" style="width:10em">
-</div>
-
<h3>$i18n.getString( "program_unenrollment" )</h3>
-<table>
+<table width='100%'>
<tr>
- <td class="bold">$i18n.getString( "full_name" ):</td>
+ <td class="bold" style="width:100px">$i18n.getString( "full_name" ):</td>
<td>$encoder.htmlEncode( $patient.getFullName() )</td>
</tr>
<tr>
@@ -44,9 +40,9 @@
<tr>
<td class="bold">$i18n.getString( "age" ):</td>
<td>$encoder.htmlEncode( $patient.getAge() )</td>
- </tr>
- <tr>
- <td> </td>
+ <td align='right'>
+ <input type="button" value="$i18n.getString( "back_to_registration" )" onclick="onClickBackBtn();" style="width:10em">
+ </td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2011-09-30 08:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2011-10-21 06:22:36 +0000
@@ -1,7 +1,3 @@
-<div>
- <input type="button" value="$i18n.getString( "back_to_search" )" onclick="onClickBackBtn();" style="width:10em">
-</div>
-
<h3>$i18n.getString( "relationship_management" )</h3>
<input type="hidden" id="id" name="id" value="$patient.id">
@@ -34,14 +30,12 @@
<col width="20">
<tr>
- <td></td>
- <td style="text-align:right">
- <input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:showAddRelationship('$patient.id')">
- </td>
- <td style="text-align:right">
- <input type="button" value="$i18n.getString( 'add_new_patient' )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )">
- </td>
- </tr>
+ <td style="text-align:right" colspan='3'>
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:showAddRelationship('$patient.id')" style="width:12em">
+ <input type="button" value="$i18n.getString( 'add_new_patient' )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )" style="width:12em">
+ <input type="button" value="$i18n.getString( "back_to_registration" )" onclick="onClickBackBtn();" style="width:12em">
+ </td>
+ </tr>
<tr>
<th>$i18n.getString( "relationship" )</th>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css 2011-10-07 02:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css 2011-10-21 06:22:36 +0000
@@ -56,4 +56,8 @@
#facilityCol
{
width: 130px;
+}
+
+.border {
+ border:1px solid #ff0000;
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2011-10-19 04:13:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2011-10-21 06:22:36 +0000
@@ -52,8 +52,7 @@
</script>
<h3>$i18n.getString( "update_patient" )</h3>
-<p><input type="button" value="$i18n.getString( 'back_to_search' )" onclick="loadPatientList();" style="width:10em"/></p>
-
+<p>
<form id="patientForm" name="patientForm" action="updatePatient.action" method="post" >
<input type="hidden" id="representativeId" name="representativeId"/>
<input type="hidden" id="relationshipTypeId" name="relationshipTypeId"/>
@@ -266,6 +265,7 @@
<p>
<input type="submit" value="$i18n.getString( "update" )" style="width:10em">
+ <input type="button" value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();" style="width:10em"/>
</p>
</form>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
