dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27318
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13581: Program, label clicks for checkboxes
------------------------------------------------------------
revno: 13581
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-01-06 13:14:19 +0100
message:
Program, label clicks for checkboxes
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.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/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2014-01-06 12:01:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2014-01-06 12:14:19 +0000
@@ -50,19 +50,19 @@
<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( "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 style="width: 330px;" type="text" id="description" name="description" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "type" ) </label></td>
+ <td><label for="type">$i18n.getString( "type" ) </label></td>
<td>
<select style="width: 336px;" id="type" name="type" onchange='programOnChange();' class="{validate:{required:true}}">
<option value='1'>$i18n.getString('multiple_events_with_registration')</option>
@@ -74,7 +74,7 @@
</tr>
<tr>
- <td><label>$i18n.getString( "data_entry_method" ) </label></td>
+ <td><label for="dataEntryMethod">$i18n.getString( "data_entry_method" ) </label></td>
<td>
<select id='dataEntryMethod' name='dataEntryMethod' style="width: 335px;">
<option value='false' selected>$i18n.getString('drop_down_lists')</option>
@@ -136,12 +136,12 @@
</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' ></td>
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("relationship_description")</td>
+ <td><label for="relationshipTypeId">$i18n.getString("relationship_description")</label></td>
<td>
<select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
<option value=''>[$i18n.getString("please_select")]</option>
@@ -153,14 +153,14 @@
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("who_is_the_new_relative_to_the_existing_person")</td>
+ <td><label for="relationshipFromA">$i18n.getString("who_is_the_new_relative_to_the_existing_person")</a></td>
<td>
<select type='text' id='relationshipFromA' name='relationshipFromA'></select>
</td>
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("program_for_new_relative_to_be_enrolled_in")</td>
+ <td><label for="relatedProgramId">$i18n.getString("program_for_new_relative_to_be_enrolled_in")</label></td>
<td>
<select type='text' id='relatedProgramId' name='relatedProgramId' >
<option value=''>[$i18n.getString("please_select")]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2014-01-06 06:29:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2014-01-06 12:14:19 +0000
@@ -47,19 +47,19 @@
</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( $program.displayName )" class="{validate:{required:true,minlength:4}}"></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 style="width: 330px;" type="text" id="description" name="description" value="$encoder.htmlEncode( $program.description )" class="{validate:{required:true,minlength:2}}"></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "type" ) </label></td>
+ <td><label for="type">$i18n.getString( "type" ) </label></td>
<td>
<select style="width: 336px;" id="type" name="type" onchange='programOnChange();' class="{validate:{required:true}}">
<option value='1' #if( $program.type=='1' ) selected #end>$i18n.getString('multiple_events_with_registration')</option>
@@ -71,7 +71,7 @@
</tr>
<tr>
- <td><label>$i18n.getString( "data_entry_method" ) </label></td>
+ <td><label for="dataEntryMethod">$i18n.getString( "data_entry_method" ) </label></td>
<td>
<select id='dataEntryMethod' name='dataEntryMethod' style="width: 335px;">
<option value='false' #if( $program.dataEntryMethod=='false' ) selected #end>$i18n.getString('drop_down_lists')</option>
@@ -82,7 +82,7 @@
</tr>
<tr>
- <td><label>$i18n.getString( "version" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="version">$i18n.getString( "version" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="version" name="version" style="width: 330px;" value="$program.version" class="{validate:{required:true,integer:true}}"></td>
<td></td>
</tr>
@@ -92,43 +92,43 @@
</tr>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "allow_select_enrollment_date_in_future" )</label></td>
+ <td><label for="selectEnrollmentDatesInFuture">$i18n.getString( "allow_select_enrollment_date_in_future" )</label></td>
<td><input type="checkbox" id="selectEnrollmentDatesInFuture" name="selectEnrollmentDatesInFuture" value='true' #if($program.selectEnrollmentDatesInFuture=='true') checked #end ></td>
<td></td>
</tr>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "allow_select_incident_date_in_future" )</label></td>
+ <td><label for="selectIncidentDatesInFuture">$i18n.getString( "allow_select_incident_date_in_future" )</label></td>
<td><input type="checkbox" id="selectIncidentDatesInFuture" name="selectIncidentDatesInFuture" value='true' #if($program.selectIncidentDatesInFuture=='true') checked #end ></td>
<td></td>
</tr>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "only_enroll_once" )</label></td>
+ <td><label for="onlyEnrollOnce">$i18n.getString( "only_enroll_once" )</label></td>
<td><input type="checkbox" id="onlyEnrollOnce" name="onlyEnrollOnce" value='true' onchange='programOnChange();' #if( $program.type!='1' ) disabled #end #if($program.onlyEnrollOnce=='true') checked #end></td>
<td></td>
</tr>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "show_incident_date" )</label></td>
+ <td><label for="displayIncidentDate">$i18n.getString( "show_incident_date" )</label></td>
<td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' #if( $program.type=='3' ) disabled #elseif($program.displayIncidentDate=='true') checked #end></td>
<td></td>
</tr>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="dateOfIncidentDescription">$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" value="$!program.dateOfIncidentDescription" class="{validate:{required:true,minlength:4}}" #if( $program.type=='2' || $program.type=='3') disabled #end ></td>
<td></td>
</tr name='nonAnonymous'>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="dateOfEnrollmentDescription">$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" value="$!program.dateOfEnrollmentDescription" class="{validate:{required:true,minlength:4}}" #if( $program.type=='3' ) disabled #end></td>
<td></td>
</tr>
<tr>
- <td><label>$i18n.getString( "allow_enrollment_at_all_orgunits" )</label></td>
+ <td><label for="displayOnAllOrgunit">$i18n.getString( "allow_enrollment_at_all_orgunits" )</label></td>
<td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true' #if($program.displayOnAllOrgunit) checked #end></td>
<td></td>
</tr>
@@ -144,7 +144,7 @@
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("relationship")</td>
+ <td><label for="relationshipTypeId">$i18n.getString("relationship_description")</label></td>
<td>
<select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
<option value=''>[$i18n.getString("please_select")]</option>
@@ -156,7 +156,7 @@
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("who_is_the_new_relative_to_the_existing_person")</td>
+ <td><label for="relationshipFromA">$i18n.getString("who_is_the_new_relative_to_the_existing_person")</label></td>
<td>
<select id='relationshipFromA' name='relationshipFromA'>
#if($!program.relationshipType)
@@ -168,7 +168,7 @@
</tr>
<tr name='nonAnonymous'>
- <td>$i18n.getString("program_for_new_relative_to_be_enrolled_in")</td>
+ <td><label for="relatedProgramId">$i18n.getString("program_for_new_relative_to_be_enrolled_in")</label></td>
<td>
<select type='text' id='relatedProgramId' name='relatedProgramId' >
<option value=''>[$i18n.getString("please_select")]</option>
@@ -194,7 +194,7 @@
<tbody>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
+ <td><label for="ignoreOverdueEvents">$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
<td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true' #if($program.ignoreOverdueEvents=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>
<td></td>
</tr>
