------------------------------------------------------------ revno: 3483 committer: Hieu <[email protected]> branch nick: dhis2 timestamp: Thu 2011-04-28 16:19:06 +0700 message: Fixed translation_key and replaced normal menu page without tree for patient mobile setting. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.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/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-04-26 09:00:27 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-04-28 09:19:06 +0000 @@ -1251,7 +1251,7 @@ class="org.hisp.dhis.patient.action.mobilesetting.ShowMobileSettingFormAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/showPatientMobileSetting.vm</param> - <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> </action> <action name="editPatientMobileSetting" === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2011-04-04 11:57:57 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2011-04-28 09:19:06 +0000 @@ -5,12 +5,12 @@ <li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li> <li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li> <li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li> - <li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_registration" )</a></li> + <li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_orgunit_registration" )</a></li> <li><a href="program.action">$i18n.getString( "program" )</a></li> <li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li> - <li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation" )</a></li> + <li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li> <li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li> - <li><a href="patientMobileSetting.action">$i18n.getString( "patientMobileSetting" )</a></li> + <li><a href="patientMobileSetting.action">$i18n.getString( "patient_mobile_setting" )</a></li> </ul> <h2>$i18n.getString( "import" )</h2> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm 2011-04-05 08:08:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm 2011-04-28 09:19:06 +0000 @@ -10,7 +10,7 @@ <li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li> <li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li> <li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li> - <li><a href="patientMobileSetting.action">$i18n.getString( "patientMobileSetting" )</a></li> + <li><a href="patientMobileSetting.action">$i18n.getString( "patient_mobile_setting" )</a></li> </ul>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
