------------------------------------------------------------ revno: 18885 committer: Tran Chau<tran.hispviet...@gmail.com> branch nick: dhis2 timestamp: Sat 2015-04-11 21:34:49 +0700 message: Minor fix. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.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-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-04-11 13:18:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-04-11 14:34:49 +0000 @@ -537,4 +537,5 @@ add_more_action = Add more action source_type = Source type please_enter_action_description = Please enter action description -confirm_delete_program_rule = Are you sure you want to delete program rule? \ No newline at end of file +confirm_delete_program_rule = Are you sure you want to delete program rule? +edit_program_rule = Edit program rule \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm 2015-04-11 13:18:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm 2015-04-11 14:34:49 +0000 @@ -38,6 +38,7 @@ </script> <h3>$i18n.getString( "create_new_program_rule" )</h3> +<h5>$encoder.htmlEncode($program.displayName)</h5> <form id="programRuleForm" name="programRuleForm" action="addProgramRule.action" method="post" class="inputForm"> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm 2015-04-11 13:18:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm 2015-04-11 14:34:49 +0000 @@ -37,8 +37,9 @@ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_program_rule" ) , "'")'; </script> -<h3>$i18n.getString( "create_new_program_rule" )</h3> - +<h3>$i18n.getString( "edit_program_rule" )</h3> +<h5>$encoder.htmlEncode($programRule.program.displayName)</h5> + <form id="programRuleForm" name="programRuleForm" action="updateProgramRule.action" method="post" class="inputForm"> <input type='hidden' id='programId' name='programId' value="$programRule.program.uid" />
_______________________________________________ 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
