------------------------------------------------------------ revno: 18225 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Wed 2015-02-11 17:59:36 +0100 message: Program indicator ui, minor fixes 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/programIndicator.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.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-01-28 19:23:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-02-11 16:59:36 +0000 @@ -26,7 +26,7 @@ close=Close edit_tracked_entity_attribute=Edit tracked entity attribute attribute=Attribute -value_type=Value Type +value_type=Value type create_new_tracked_entity_attribute=Create new tracked entity attribute confirm_delete_tracked_entity_attribute=Are you sure you want to delete this tracked entity attribute? tracked_entity_attribute_management=Tracked entity attribute management === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm 2014-11-03 13:35:42 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm 2015-02-11 16:59:36 +0000 @@ -55,8 +55,7 @@ <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p> <p><label class="bold">$i18n.getString( "code" ):</label><br><span id="codeField"></span></p> <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p> - <p><label class="bold">$i18n.getString( "valueType" ):</label><br><span id="valueTypeField"></span></p> - <p><label class="bold">$i18n.getString( "rootDate" ):</label><br><span id="rootDateField"></span></p> + <p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p> <p><label class="bold">$i18n.getString( "expression" ):</label><br><span id="expressionField"></span></p> <p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p> </div> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2014-11-03 13:35:42 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-02-11 16:59:36 +0000 @@ -61,9 +61,13 @@ <td> <fieldset> <legend>$i18n.getString( "expression" ) <em title="$i18n.getString( "required" )" class="required">*</em></legend> - <table><tr><td> - <textarea style="width:660px" id="expression" name="expression" onkeyup='getConditionDescription();' >$encoder.htmlEncode($!programIndicator.expression)</textarea> - </td></tr></table> + <table> + <tr> + <td> + <textarea style="width:660px" id="expression" name="expression" onkeyup='getConditionDescription();' >$!encoder.htmlEncode($!programIndicator.expression)</textarea> + </td> + </tr> + </table> </fieldset> </td> </tr> @@ -72,7 +76,7 @@ <td> <fieldset> <legend>$i18n.getString( "description" )</legend> - <div id='aggregationDescription'>$!encoder.htmlEncode($description)</div> + <div id='aggregationDescription'>$!encoder.htmlEncode($!description)</div> </fieldset> </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
