dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29656
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15003: Link labels to input fields using 'for' attribute for label.
------------------------------------------------------------
revno: 15003
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-04-26 20:14:51 +0800
message:
Link labels to input fields using 'for' attribute for label.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addRelationshipTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm
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/updateAttibuteForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateRelationshipTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateTrackedEntity.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.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/webapp/dhis-web-maintenance-program/addAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm 2014-04-18 08:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm 2014-04-26 12:14:51 +0000
@@ -13,25 +13,25 @@
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="shortName" name="shortName" class="{validate:{required:true,rangelength:[2,50]}}"/></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "code" )</label></td>
+ <td><label for="code">$i18n.getString( "code" )</label></td>
<td><input type="text" id="code" name="code"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <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" class="{validate:{required:true,minlength:2}}"/></td>
<td></td>
</tr>
@@ -79,7 +79,7 @@
<td></td>
</tr>
<tr id="optionSetRow" class="hidden">
- <td><label>$i18n.getString( "option_set" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="optionSetId">$i18n.getString( "option_set" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><select id="optionSetId" name="optionSetId" class="{validate:{required:true}}" disabled>
#foreach($optionSet in $optionSets)
<option value="$optionSet.id">$optionSet.name</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm 2014-03-24 05:58:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm 2014-04-26 12:14:51 +0000
@@ -9,11 +9,11 @@
<th colspan="2">$i18n.getString( "tracked_entity_attribute_group_deltails" )</th>
</tr>
<tr>
- <td>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true}}"/></td>
</tr>
<tr>
- <td>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+ <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" class="{validate:{required:true}}"/></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm 2014-03-25 07:10:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm 2014-04-26 12:14:51 +0000
@@ -22,7 +22,7 @@
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<input type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}">
</td>
@@ -77,7 +77,7 @@
<tr>
<td>
- <label for="programStage">$i18n.getString( "program_stage" )</label>
+ <label for="programStageId">$i18n.getString( "program_stage" )</label>
</td>
<td>
<select id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();"></select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm 2014-04-26 12:14:51 +0000
@@ -98,7 +98,7 @@
</tr>
<tr name='nonAnonymous'>
- <td><label for="dataEntryMethod">$i18n.getString( "tracked_entity" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="trackedEntityId">$i18n.getString( "tracked_entity" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select id='trackedEntityId' name='trackedEntityId' style="width: 335px;" class="{validate:{required:true}}">
<option value=''>[$i18n.getString('please_select')]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2014-04-26 12:14:51 +0000
@@ -24,27 +24,27 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="shortName" name="shortName" class="{validate:{required:true,minlength:2}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "code" ) </label></td>
+ <td><label for="code">$i18n.getString( "code" ) </label></td>
<td><input style="width: 330px;" type="text" id="code" name="code" class="{validate:{minlength:2}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) </label></td>
+ <td><label for="description">$i18n.getString( "description" ) </label></td>
<td><textarea style="width: 330px;" type="text" id="description" name="description" ></textarea></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "value_type" ) </label></td>
+ <td><label for="valueType">$i18n.getString( "value_type" ) </label></td>
<td>
<select style="width: 336px;" id="valueType" name="valueType" onchange='programIndicatorOnChange();' class="{validate:{required:true}}">
<option value='int'>$i18n.getString('int')</option>
@@ -54,7 +54,7 @@
<td></td>
</tr>
<tr id='rootDateTR' style='display:none'>
- <td><label>$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="rootDate">$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select style="width:336px;" id="rootDate" name="rootDate" class="{validate:{required:true}}">
<option value='incident_date'>$i18n.getString('incident_date')</option>
@@ -65,7 +65,7 @@
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "program_stage" ) </label></td>
+ <td><label for="programStageId">$i18n.getString( "program_stage" ) </label></td>
<td>
<select style="width:336px;" id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();">
<option value=''>[$i18n.getString('please_select')]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm 2014-04-04 12:59:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm 2014-04-26 12:14:51 +0000
@@ -27,12 +27,12 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="name" name="name" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "send_base_on" )</label></td>
+ <td><label for="whenToSend">$i18n.getString( "send_base_on" )</label></td>
<td>
<select type="text" id="whenToSend" name="whenToSend" onchange='whenToSendOnChange()'>
<option value="" >$i18n.getString("days_scheduled")</option>
@@ -42,7 +42,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "date_to_compare")</label></td>
+ <td><label for="datesToCompare">$i18n.getString( "date_to_compare")</label></td>
<td>
<select id='datesToCompare' name='datesToCompare'/>
<option value="enrollmentdate">$i18n.getString( "enrollment_date" )</option>
@@ -51,7 +51,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "send_message" )</label></td>
+ <td><label for="daysAllowedSendMessage">$i18n.getString( "send_message" )</label></td>
<td><input type="text" id="daysAllowedSendMessage" name="daysAllowedSendMessage"
class="{validate:{required:true,number:true}}"
onkeyup='setRealDays();' style="width:100px;"
@@ -65,7 +65,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "recipients" )</label></td>
+ <td><label for="sendTo">$i18n.getString( "recipients" )</label></td>
<td>
<select type="text" id="sendTo" name="sendTo" class="{validate:{required:true,number:true}}" onchange="onchangeUserGroup( )">
<option value="1" >$i18n.getString("tracked_entity_sms_only")</option>
@@ -77,7 +77,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "user_group" )</label></td>
+ <td><label for="userGroup">$i18n.getString( "user_group" )</label></td>
<td>
<select type="text" id="userGroup" name="userGroup" class="userGroup" disabled>
<option value="">[$i18n.getString("please_select")]</option>
@@ -88,7 +88,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message_type" )</label></td>
+ <td><label for="messageType">$i18n.getString( "message_type" )</label></td>
<td>
<select type="text" id="messageType" name="messageType" disabled class="messageType {validate:{required:true,number:true}}" >
<option value="1">$i18n.getString("direct_sms")</option>
@@ -114,7 +114,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message" )</label></td>
+ <td><label for="optionSetId">$i18n.getString( "message" )</label></td>
<td><textarea onkeyup="getMessageLength()" id="templateMessage" name="templateMessage" style="width:320px" class="templateMessage {validate:{required:true}}"></textarea></td>
</tr>
<tr>
@@ -127,8 +127,8 @@
<tr>
<td></td>
<td>
- <input type="submit" value="$i18n.getString( 'add' )">
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programReminder.action?id=$program.id'">
+ <input type="submit" value="$i18n.getString( 'add' )" style="width:10em" >
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programReminder.action?id=$program.id'" style="width:10em" >
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm 2014-04-26 12:14:51 +0000
@@ -20,35 +20,35 @@
</thead>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <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" class="{validate:{required:true,minlength:4}}"/></td>
</tr>
#if( $program.type == 1 )
<tr>
- <td><label>$i18n.getString( "scheduled_days_from_start" )</label></td>
+ <td><label for="minDaysFromStart">$i18n.getString( "scheduled_days_from_start" )</label></td>
<td><input type="text" id="minDaysFromStart" name="minDaysFromStart" class="{validate:{number:true,min:0}}"/></td>
</tr>
<tr><th colspan="2">$i18n.getString( "repeatable_program_stage_details" )</th></tr>
<tr>
- <td><label>$i18n.getString( "repeatable" )</label></td>
+ <td><label for="irregular">$i18n.getString( "repeatable" )</label></td>
<td><input type="checkbox" id="irregular" name="irregular" value='true' onchange='repeatableOnChange();' /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "display_generate_event_box_after_completed" )</label></td>
+ <td><label for="displayGenerateEventBox">$i18n.getString( "display_generate_event_box_after_completed" )</label></td>
<td><input type="checkbox" id="displayGenerateEventBox" name="displayGenerateEventBox" value='true' checked disabled /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "standard_interval_days" )</label></td>
+ <td><label for="standardInterval">$i18n.getString( "standard_interval_days" )</label></td>
<td><input type="text" id="standardInterval" name="standardInterval" class="{validate:{number:true}}" disabled /></td>
</tr>
@@ -64,7 +64,7 @@
#end
<tr>
- <td><label>$i18n.getString( "auto_generate_event" )</label></td>
+ <td><label for="autoGenerateEvent">$i18n.getString( "auto_generate_event" )</label></td>
<td><input type="checkbox" id="autoGenerateEvent" name="autoGenerateEvent" value='true' checked onchange='autoGenerateEventOnChange("$openAfterEnrollment")' /></td>
</tr>
@@ -78,7 +78,7 @@
#end
<tr>
- <td><label>$i18n.getString( "open_data_entry_form_after_enrolment" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="openAfterEnrollment">$i18n.getString( "open_data_entry_form_after_enrolment" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true'
onchange="openAfterEnrollmentOnchange();"
#if($openAfterEnrollment!='') disabled #end>
@@ -87,7 +87,7 @@
</tr>
<tr>
- <td><label>$i18n.getString( "report_date_to_use" )</label></td>
+ <td><label for="reportDateToUse">$i18n.getString( "report_date_to_use" )</label></td>
<td>
<select id="reportDateToUse" name="reportDateToUse" class="{validate:{required:true}}" disabled>
<option value=''>[$i18n.getString('please_select')]</option>
@@ -100,43 +100,43 @@
#end
<tr>
- <td><label>$i18n.getString( "block_entry_form_after_completed" )</label></td>
+ <td><label for="blockEntryForm">$i18n.getString( "block_entry_form_after_completed" )</label></td>
<td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true'></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
+ <td><label for="remindCompleted">$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
<td><input type="checkbox" id="remindCompleted" name="remindCompleted" value='true' ></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
+ <td><label for="allowGenerateNextVisit">$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
<td><input type="checkbox" id="allowGenerateNextVisit" name="allowGenerateNextVisit" value='true' ></td>
<td></td>
</tr>
#if($program.type==1)
<tr>
- <td><label>$i18n.getString( "generated_events_by_enrollment_date" )</label></td>
+ <td><label for="generatedByEnrollmentDate">$i18n.getString( "generated_events_by_enrollment_date" )</label></td>
<td><input type="checkbox" id="generatedByEnrollmentDate" name="generatedByEnrollmentDate" value='true'></td>
<td></td>
</tr>
#end
<tr>
- <td><label>$i18n.getString( "capture_coordinates" )</label></td>
+ <td><label for="captureCoordinates">$i18n.getString( "capture_coordinates" )</label></td>
<td><input type="checkbox" id="captureCoordinates" name="captureCoordinates" value="true" /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "complete_allowed_only_if_validation_passes" )</label></td>
+ <td><label for="validCompleteOnly">$i18n.getString( "complete_allowed_only_if_validation_passes" )</label></td>
<td><input type="checkbox" id="validCompleteOnly" name="validCompleteOnly" value="true" /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "report_date_description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="reportDateDescription">$i18n.getString( "report_date_description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="reportDateDescription" name="reportDateDescription" class="{validate:{required:true}}" value="$i18n.getString( 'report_date' )" /></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm 2014-03-24 09:02:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm 2014-04-26 12:14:51 +0000
@@ -27,12 +27,12 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="name" name="name" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "send_base_on" )</label></td>
+ <td><label for="whenToSend">$i18n.getString( "send_base_on" )</label></td>
<td>
<select type="text" id="whenToSend" name="whenToSend" onchange='whenToSendOnChange()'>
<option value="" >$i18n.getString("days_scheduled")</option>
@@ -41,7 +41,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "send_message" )</label></td>
+ <td><label for="daysAllowedSendMessage">$i18n.getString( "send_message" )</label></td>
<td><input type="text" id="daysAllowedSendMessage" name="daysAllowedSendMessage"
class="{validate:{required:true,number:true}}"
onkeyup='setRealDays();' style="width:100px;"
@@ -55,7 +55,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "recipients" )</label></td>
+ <td><label for="sendTo">$i18n.getString( "recipients" )</label></td>
<td>
<select type="text" id="sendTo" name="sendTo" class="{validate:{required:true,number:true}}" onchange="onchangeUserGroup( )">
<option value="1" >$i18n.getString("tracked_entity_sms_only")</option>
@@ -67,7 +67,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "user_group" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="userGroup">$i18n.getString( "user_group" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select type="text" id="userGroup" name="userGroup" disabled class="{validate:{required:true}}">
<option value="">[$i18n.getString("please_select")]</option>
@@ -78,7 +78,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message_type" )</label></td>
+ <td><label for="messageType">$i18n.getString( "message_type" )</label></td>
<td>
<select type="text" id="messageType" name="messageType" disabled class="messageType {validate:{required:true,number:true}}" >
<option value="1">$i18n.getString("direct_sms")</option>
@@ -103,7 +103,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message" )</label></td>
+ <td><label for="optionSetId">$i18n.getString( "message" )</label></td>
<td><textarea onkeyup="getMessageLength()" id="templateMessage" name="templateMessage" style="width:320px" class="templateMessage {validate:{required:true}}"></textarea></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageSectionForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageSectionForm.vm 2014-04-26 12:14:51 +0000
@@ -27,7 +27,7 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addRelationshipTypeForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addRelationshipTypeForm.vm 2014-04-26 12:14:51 +0000
@@ -13,17 +13,17 @@
<tbody>
<tr>
- <td><label>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="aIsToB">$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="aIsToB" name="aIsToB" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="bIsToA">$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="bIsToA" name="bIsToA" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm 2014-04-26 12:14:51 +0000
@@ -15,13 +15,13 @@
<tbody>
<tr>
- <td><label>$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<input type="text" id='name' name='name' class="{validate:{required:true,minlength:4}}" >
</td>
</tr>
<tr>
- <td><label>$encoder.htmlEncode( $i18n.getString( "operator" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="operator">$encoder.htmlEncode( $i18n.getString( "operator" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select id="operator" name="operator" class="{validate:{required:true}}">
<option value="">[ $i18n.getString( "please_select" ) ]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm 2014-04-26 12:14:51 +0000
@@ -18,13 +18,13 @@
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <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" class="{validate:{required:true,minlength:2}}"/></td>
<td></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm 2014-04-04 15:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm 2014-04-26 12:14:51 +0000
@@ -11,15 +11,15 @@
<table>
<tr><th colspan="3">$i18n.getString('validation_criteria_details')</th></tr>
<tr>
- <td><label>$i18n.getString('name') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString('name') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="2"><input type='text' id='name' name='name' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString('description') <em title="$i18n.getString( 'required' )" class="required">*</em></label></label></td>
+ <td><label for="description">$i18n.getString('description') <em title="$i18n.getString( 'required' )" class="required">*</em></label></label></td>
<td colspan="2"><input type='text' id='description' name='description' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"></td>
</tr>
<tr>
- <td><label>$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="property">$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<table>
<tr>
=== 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-04-04 15:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2014-04-26 12:14:51 +0000
@@ -8,7 +8,7 @@
<table>
<tr>
<td><label for="dataelement">$i18n.getString( "dataelement" )</label></td>
- </tr>
+ </tr>
<tr>
<td>
<input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" style='width:265px;'/>
@@ -26,7 +26,7 @@
<div id="tab-2">
<table>
<tr>
- <td><label>$i18n.getString('program_properties')</label></td>
+ <td><label for="programProperty">$i18n.getString('program_properties')</label></td>
</tr>
<tr>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm 2014-04-18 10:54:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm 2014-04-26 12:14:51 +0000
@@ -16,19 +16,19 @@
</thead>
<tbody>
<tr>
- <td>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $attribute.name )" class="{validate:{required:true,rangelength:[2,160]}}"></td>
</tr>
<tr>
- <td>$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
+ <td><label for="name">$i18n.getString( "shortName" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="shortName" name="shortName" value="$!encoder.htmlEncode( $attribute.shortName )" class="{validate:{required:true,rangelength:[2,50]}}"></td>
</tr>
<tr>
- <td>$i18n.getString( "code" )</td>
- <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $attribute.code )"></td>
+ <td><label for="code">$i18n.getString( "code" )</td>
+ <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $attribute.code )"></label></td>
</tr>
<tr>
- <td>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
+ <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( $attribute.description )" class="{validate:{required:true,minlength:2}}"></td>
</tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
- <td>$i18n.getString( "value_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
+ <td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select id="valueType" name="valueType" onchange="typeOnChange();">
<option value="number" #if( $attribute.valueType == 'number' ) selected="selected" #end>$i18n.getString( "number" )</option>
@@ -76,7 +76,7 @@
</tr>
<tr id="optionSetRow" #if($attribute.optionSet) #else class="hidden" #end>
- <td><label>$i18n.getString( "option_set" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="optionSetId">$i18n.getString( "option_set" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><select id="optionSetId" name="optionSetId" class="{validate:{required:true}}">
#foreach($optionSet in $optionSets)
<option value="$optionSet.id" #if($attribute.optionSet.id==$optionSet.id) selected #end>$optionSet.name</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm 2014-03-24 05:58:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm 2014-04-26 12:14:51 +0000
@@ -12,11 +12,11 @@
<th colspan="2">$i18n.getString( "tracked_entity_attribute_group_deltails" )</th>
</tr>
<tr>
- <td>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $attributeGroup.name )" class="{validate:{required:true}}"/></td>
</tr>
<tr>
- <td>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+ <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( $attributeGroup.description )" class="{validate:{required:true}}"/></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-03-21 09:29:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-04-26 12:14:51 +0000
@@ -23,7 +23,7 @@
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true}}" value="$caseAggregation.name"></td>
</tr>
@@ -40,7 +40,7 @@
</tr>
<tr>
- <td><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="aggregationDataElementInput">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<input id="aggregationDataElementInput" name="aggregationDataElementInput" value='$caseAggregation.aggregationDataElement.name $caseAggregation.optionCombo.name' style='width:300px;'>
<a style='width:20px; margin-bottom:-5px;height:20px;' id='dataElementsButton' name='dataElementsButton'></a>
@@ -74,7 +74,7 @@
<tr>
<td>
- <label for="programStage">$i18n.getString( "program_stage" )</label>
+ <label for="programStageId">$i18n.getString( "program_stage" )</label>
</td>
<td>
<select id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();"></select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2014-04-26 12:14:51 +0000
@@ -94,7 +94,7 @@
</tr>
<tr name='nonAnonymous'>
- <td><label for="dataEntryMethod">$i18n.getString( "tracked_entity" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="trackedEntityId">$i18n.getString( "tracked_entity" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select id='trackedEntityId' name='trackedEntityId' style="width: 335px;" class="{validate:{required:true}}">
<option value=''>[$i18n.getString('please_select')]</option>
@@ -164,7 +164,7 @@
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("shortcut_link_label_eg_add_child")</td>
+ <td><label for="relationshipText">$i18n.getString("shortcut_link_label_eg_add_child")</label></td>
<td><input type='text' id='relationshipText' name='relationshipText' value='$!program.relationshipText' ></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-04-26 12:14:51 +0000
@@ -24,27 +24,27 @@
</tr>
</thead>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}" value='$programIndicator.name'></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="shortName" name="shortName" class="{validate:{required:true,minlength:2}}" value='$programIndicator.shortName'></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "code" )</label></td>
+ <td><label for="code">$i18n.getString( "code" )</label></td>
<td><input style="width: 330px;" type="text" id="code" name="code" class="{validate:{minlength:2}}" value='$programIndicator.code'></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) </label></td>
+ <td><label for="description">$i18n.getString( "description" ) </label></td>
<td><textarea style="width: 330px;" type="text" id="description" name="description">$programIndicator.description</textarea></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "value_type" )</label></td>
+ <td><label for="valueType">$i18n.getString( "value_type" )</label></td>
<td>
<select style="width: 336px;" id="valueType" name="valueType" onchange='programIndicatorOnChange();' class="{validate:{required:true}}">
<option value='int' #if( $programIndicator.valueType=='int' ) selected #end>$i18n.getString('int')</option>
@@ -54,7 +54,7 @@
<td></td>
</tr>
<tr id='rootDateTR' #if($programIndicator.valueType!='date') style='display:none' #end >
- <td><label>$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="rootDate">$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select style="width:336px;" id="rootDate" name="rootDate" class="{validate:{required:true}}">
<option value='incident_date'>$i18n.getString('incident_date')</option>
@@ -65,7 +65,7 @@
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "program_stage" ) </label></td>
+ <td><label for="programStageId">$i18n.getString( "program_stage" ) </label></td>
<td>
<select style="width:336px;" id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();">
<option value=''>[$i18n.getString('please_select')]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm 2014-04-26 12:14:51 +0000
@@ -61,12 +61,12 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="name" name="name" value="$encoder.htmlEncode( $reminder.name )" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "send_base_on" )</label></td>
+ <td><label for="whenToSend">$i18n.getString( "send_base_on" )</label></td>
<td>
<select type="text" id="whenToSend" name="whenToSend" onchange='whenToSendOnChange()'>
<option value="" >$i18n.getString("days_scheduled")</option>
@@ -76,7 +76,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "date_to_compare")</label></td>
+ <td><label for="datesToCompare">$i18n.getString( "date_to_compare")</label></td>
<td>
<select id='datesToCompare' name='datesToCompare' #if($!reminder.whenToSend==3) disabled #end />
<option value="enrollmentdate" #if($!reminder.dateToCompare=='enrollmentdate') selected #end>$i18n.getString( "enrollment_date" )</option>
@@ -91,7 +91,7 @@
#set($time = '-1')
#set($value=-1 * $value)
#end
- <td><label>$i18n.getString( "send_message" )</label></td>
+ <td><label for="daysAllowedSendMessage">$i18n.getString( "send_message" )</label></td>
<td><input type="text" id="daysAllowedSendMessage" name="daysAllowedSendMessage"
class="{validate:{required:true,number:true}}" value="$!value"
onkeyup='setRealDays();' style="width:100px;"
@@ -107,7 +107,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "recipients" )</label></td>
+ <td><label for="sendTo">$i18n.getString( "recipients" )</label></td>
<td>
<select type="text" id="sendTo" name="sendTo" class="{validate:{required:true,number:true}}" onchange="onchangeUserGroup()">
<option value="1" #if($!reminder.sendTo==1) selected #end >$i18n.getString("tracked_entity_sms_only")</option>
@@ -119,7 +119,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "user_group" )</label></td>
+ <td><label for="userGroup">$i18n.getString( "user_group" )</label></td>
<td>
<select type="text" id="userGroup" name="userGroup" class="userGroup" #if($!reminder.sendTo!=5) disabled #end >
<option value="">[$i18n.getString("please_select")]</option>
@@ -130,7 +130,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message_type" )</label></td>
+ <td><label for="messageType">$i18n.getString( "message_type" )</label></td>
<td>
<select type="text" id="messageType" name="messageType" #if($!reminder.sendTo==1 || $!reminder.sendTo==3) disabled #end class="messageType {validate:{required:true,number:true}}" >
<option value="1" #if($!reminder.messageType==1) selected #end >$i18n.getString("direct_sms")</option>
@@ -156,7 +156,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message" )</label></td>
+ <td><label for="templateMessage">$i18n.getString( "message" )</label></td>
<td><textarea onkeyup="getMessageLength()" id="templateMessage" name="templateMessage" style="width:320px" class="templateMessage {validate:{required:true}}">$reminder.templateMessage</textarea></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm 2014-04-26 12:14:51 +0000
@@ -28,35 +28,35 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.displayName )" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <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( $programStage.description )" class="{validate:{required:true,minlength:4}}"/></td>
</tr>
#if($programStage.program.type==1)
<tr>
- <td><label>$i18n.getString( "scheduled_days_from_start" )</label></td>
+ <td><label for="minDaysFromStart">$i18n.getString( "scheduled_days_from_start" )</label></td>
<td><input type="text" id="minDaysFromStart" name="minDaysFromStart" value="$programStage.minDaysFromStart" class="{validate:{number:true,min:0}}"/></td>
</tr>
<tr><th colspan="2">$i18n.getString( "repeatable_program_stage_details" )</th></tr>
<tr>
- <td><label>$i18n.getString( "repeatable" )</label></td>
+ <td><label for="irregular">$i18n.getString( "repeatable" )</label></td>
<td><input type="checkbox" id="irregular" name="irregular" value='true' #if( $programStage.irregular && $programStage.irregular=='true' ) checked #end onchange='repeatableOnChange();' /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "display_generate_event_box_after_completed" )</label></td>
+ <td><label for="displayGenerateEventBox">$i18n.getString( "display_generate_event_box_after_completed" )</label></td>
<td><input type="checkbox" id="displayGenerateEventBox" name="displayGenerateEventBox" value='true' #if( $programStage.displayGenerateEventBox && $programStage.displayGenerateEventBox=='true' ) checked #end #if($programStage.irregular!='true' ) disabled checked #end /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "standard_interval_days" )</label></td>
+ <td><label for="standardInterval">$i18n.getString( "standard_interval_days" )</label></td>
<td><input type="text" id="standardInterval" name="standardInterval" value='$!programStage.standardInterval'class="{validate:{number:true}}" #if($programStage.irregular!='true' ) disabled #end /></td>
</tr>
@@ -72,7 +72,7 @@
#end
<tr>
- <td><label>$i18n.getString( "auto_generate_event" )</label></td>
+ <td><label for="autoGenerateEvent">$i18n.getString( "auto_generate_event" )</label></td>
<td><input type="checkbox" id="autoGenerateEvent" name="autoGenerateEvent" value='true' onchange='autoGenerateEventOnChange("$openAfterEnrollment")' #if( $programStage.autoGenerateEvent && $programStage.autoGenerateEvent=='true' ) checked #end /></td>
</tr>
@@ -85,7 +85,7 @@
#end
<tr>
- <td><label>$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
+ <td><label for="openAfterEnrollment">$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true'
#if($programStage.openAfterEnrollment=='true') checked #end
#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #end
@@ -94,7 +94,7 @@
</tr>
<tr>
- <td><label>$i18n.getString( "report_date_to_use" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="reportDateToUse">$i18n.getString( "report_date_to_use" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="reportDateToUse" name="reportDateToUse" class="{validate:{required:true}}"
#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #elseif($programStage.openAfterEnrollment=='false') disabled #end >
@@ -108,43 +108,43 @@
#end
<tr>
- <td><label>$i18n.getString( "block_entry_form_after_completed" )</label></td>
+ <td><label for="blockEntryForm">$i18n.getString( "block_entry_form_after_completed" )</label></td>
<td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true' #if( $programStage.blockEntryForm=='true' ) checked #end ></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
+ <td><label for="remindCompleted">$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
<td><input type="checkbox" id="remindCompleted" name="remindCompleted" value='true' #if( $programStage.remindCompleted=='true' ) checked #end ></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
+ <td><label for="allowGenerateNextVisit">$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
<td><input type="checkbox" id="allowGenerateNextVisit" name="allowGenerateNextVisit" value='true' #if( $programStage.allowGenerateNextVisit=='true' ) checked #end ></td>
<td></td>
</tr>
#if($programStage.program.type==1)
<tr>
- <td><label>$i18n.getString( "generated_events_by_enrollment_date" )</label></td>
+ <td><label for="generatedByEnrollmentDate">$i18n.getString( "generated_events_by_enrollment_date" )</label></td>
<td><input type="checkbox" id="generatedByEnrollmentDate" name="generatedByEnrollmentDate" value='true' #if($programStage.generatedByEnrollmentDate=='true') checked #end #if( $programStage.program.type!='1' ) disabled #end ></td>
<td></td>
</tr>
#end
<tr>
- <td><label>$i18n.getString( "capture_coordinates" )</label></td>
+ <td><label for="captureCoordinates">$i18n.getString( "capture_coordinates" )</label></td>
<td><input type="checkbox" id="captureCoordinates" name="captureCoordinates" value='true' #if( $programStage.captureCoordinates && $programStage.captureCoordinates=='true' ) checked #end /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "complete_allowed_only_if_validation_passes" )</label></td>
+ <td><label for="validCompleteOnly">$i18n.getString( "complete_allowed_only_if_validation_passes" )</label></td>
<td><input type="checkbox" id="validCompleteOnly" name="validCompleteOnly" value='true' #if( $programStage.validCompleteOnly && $programStage.validCompleteOnly=='true' ) checked #end /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "report_date_description" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="reportDateDescription">$i18n.getString( "report_date_description" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="reportDateDescription" name="reportDateDescription" value='$!programStage.reportDateDescription' class="{validate:{required:true}}" /></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm 2014-04-26 12:14:51 +0000
@@ -58,12 +58,12 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="name" name="name" value="$encoder.htmlEncode( $reminder.name )" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "send_base_on" )</label></td>
+ <td><label for="whenToSend">$i18n.getString( "send_base_on" )</label></td>
<td>
<select type="text" id="whenToSend" name="whenToSend" onchange='whenToSendOnChange()'>
<option value="" >$i18n.getString("days_scheduled")</option>
@@ -78,7 +78,7 @@
#set($time = '-1')
#set($value=-1 * $value)
#end
- <td><label>$i18n.getString( "send_message" )</label></td>
+ <td><label for="daysAllowedSendMessage">$i18n.getString( "send_message" )</label></td>
<td><input type="text" id="daysAllowedSendMessage" name="daysAllowedSendMessage"
class="{validate:{required:true,number:true}}" value="$!value"
onkeyup='setRealDays();' style="width:100px;"
@@ -94,7 +94,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "recipients" )</label></td>
+ <td><label for="sendTo">$i18n.getString( "recipients" )</label></td>
<td>
<select type="text" id="sendTo" name="sendTo" class="{validate:{required:true,number:true}}" onchange="onchangeUserGroup()">
<option value="1" #if($!reminder.sendTo==1) selected #end >$i18n.getString("tracked_entity_sms_only")</option>
@@ -106,7 +106,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "user_group" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="userGroup">$i18n.getString( "user_group" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select type="text" id="userGroup" name="userGroup" #if($!reminder.sendTo!=5) disabled #end class="{validate:{required:true}}" >
<option value="">[$i18n.getString("please_select")]</option>
@@ -117,7 +117,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message_type" )</label></td>
+ <td><label for="messageType">$i18n.getString( "message_type" )</label></td>
<td>
<select type="text" id="messageType" name="messageType" #if($!reminder.sendTo==1 || $!reminder.sendTo==3) disabled #end class="messageType {validate:{required:true,number:true}}" >
<option value="1" #if($!reminder.messageType==1) selected #end >$i18n.getString("direct_sms")</option>
@@ -142,7 +142,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString( "message" )</label></td>
+ <td><label for="message">$i18n.getString( "message" )</label></td>
<td><textarea onkeyup="getMessageLength()" id="templateMessage" name="templateMessage" style="width:320px" class="templateMessage {validate:{required:true}}">$reminder.templateMessage</textarea></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageSectionForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageSectionForm.vm 2014-04-26 12:14:51 +0000
@@ -29,7 +29,7 @@
</thead>
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}" value='$section.name'/></td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateRelationshipTypeForm.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateRelationshipTypeForm.vm 2014-04-26 12:14:51 +0000
@@ -13,15 +13,15 @@
<tbody>
<tr>
- <td>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+ <td><label for="aIsToB">$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="aIsToB" name="aIsToB" value="$encoder.htmlEncode( $relationshipType.aIsToB )" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
- <td>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+ <td><label for="bIsToA">$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="bIsToA" name="bIsToA" value="$encoder.htmlEncode( $relationshipType.bIsToA )" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $relationshipType.name )" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-02-10 10:37:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-04-26 12:14:51 +0000
@@ -16,13 +16,13 @@
<tbody>
<tr>
- <td><label>$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<input type="text" id='name' name='name' class="{validate:{required:true,minlength:4}}" value="$validation.name" >
</td>
</tr>
<tr>
- <td><label>$encoder.htmlEncode( $i18n.getString( "operator" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="operator">$encoder.htmlEncode( $i18n.getString( "operator" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select id="operator" name="operator" class="{validate:{required:true}}">
<option value="">[ $i18n.getString( "please_select" ) ]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateTrackedEntity.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateTrackedEntity.vm 2014-04-14 11:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateTrackedEntity.vm 2014-04-26 12:14:51 +0000
@@ -19,13 +19,13 @@
<tbody>
<tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}" value='$trackedEntity.name' /></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <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" class="{validate:{required:true,minlength:2}}" value='$trackedEntity.description' /></td>
<td></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm 2014-04-04 15:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm 2014-04-26 12:14:51 +0000
@@ -11,15 +11,15 @@
<th colspan="3">$i18n.getString('validation_criteria_details')</th>
</tr>
<tr>
- <td><label>$i18n.getString('name') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="name">$i18n.getString('name') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="2"><input type='text' id='name' name='name' style='width: 40em' value="$validationCriteria.name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
- <td><label>$i18n.getString('description') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="description">$i18n.getString('description') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="2"><input type='text' id='description' name='description' style='width: 40em' value="$validationCriteria.description" class="{validate:{required:true,rangelength:[2,160]}}" /></td>
</tr>
<tr>
- <td><label>$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="property">$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<table>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm 2014-04-25 17:04:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm 2014-04-26 12:14:51 +0000
@@ -80,7 +80,7 @@
</tr>
<tr>
<td>
- <label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label>
+ <label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label>
<input type="text" id="name" value="$!dataEntryForm.name" name="name" class="{validate:{required:true,rangelength:[4,150],alphanumericwithbasicpuncspaces:true,firstletteralphabet:false}}" style="margin-left:15px;width:30em;">
</td>
</tr>
