------------------------------------------------------------ revno: 18211 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Mon 2015-02-09 19:12:51 +0100 message: Data element + org unit group set, made description field textarea modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.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-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2015-02-06 13:28:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2015-02-09 18:12:51 +0000 @@ -29,16 +29,16 @@ </tr> <tr> - <td><label for="description" style="width:100%">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td> - <td><input type="text" id="description" name="description"></td> - </tr> - - <tr> <td><label for="code">$i18n.getString( "code" )</label></td> <td><input type="text" id="code" name="code" ></td> </tr> <tr> + <td><label for="description" style="width:100%">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td> + <td><textarea id="description" name="description"></textarea></td> + </tr> + + <tr> <td><label for="compulsory" style="width:100%">$i18n.getString( "compulsory" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td> <td> <select id="compulsory" name="compulsory" onchange="changeCompulsory(this.value)"> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2015-02-06 13:28:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2015-02-09 18:12:51 +0000 @@ -29,16 +29,16 @@ </tr> <tr> - <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> - <td><input type="text" id="description" name="description" value="#if( $dataElementGroupSet.description)$encoder.htmlEncode( $dataElementGroupSet.description )#end"></td> - </tr> - - <tr> <td><label for="code">$i18n.getString( "code" )</label></td> <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataElementGroupSet.code )"></td> </tr> <tr> + <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> + <td><textarea id="description" name="description">$!encoder.htmlEncode( $!dataElementGroupSet.description )</textarea></td> + </tr> + + <tr> <td><label for="compulsory">$i18n.getString( "compulsory" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> <td> <select id="compulsory" name="compulsory" onchange="changeCompulsory( this.value )"> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm 2015-02-06 13:28:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm 2015-02-09 18:12:51 +0000 @@ -40,16 +40,16 @@ </tr> <tr> - <td><label for="description" style="width:100%">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td> - <td><input type="text" id="description" name="description"></td> - </tr> - - <tr> <td><label for="code">$i18n.getString( "code" )</label></td> <td><input type="text" id="code" name="code" ></td> </tr> <tr> + <td><label for="description" style="width:100%">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td> + <td><textarea id="description" name="description"></textarea></td> + </tr> + + <tr> <td><label for="compulsory" style="width:100%">$i18n.getString( "compulsory" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td> <td> <select id="compulsory" name="compulsory" onchange="changeCompulsory(this.value)"> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2015-02-06 13:28:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2015-02-09 18:12:51 +0000 @@ -44,16 +44,16 @@ </tr> <tr> - <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> - <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $organisationUnitGroupSet.description )"></td> - </tr> - - <tr> <td><label for="code">$i18n.getString( "code" )</label></td> <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $organisationUnitGroupSet.code )"></td> </tr> <tr> + <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> + <td><textarea id="description" name="description">$!encoder.htmlEncode( $!organisationUnitGroupSet.description )</textarea></td> + </tr> + + <tr> <td><label for="compulsory">$i18n.getString( "compulsory" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> <td> <select id="compulsory" name="compulsory" onchange="changeCompulsory( this.value )">
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
