← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14943: Added missing label elements

 

------------------------------------------------------------
revno: 14943
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-22 18:33:23 +0200
message:
  Added missing label elements
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-04-05 20:08:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-04-22 16:33:23 +0000
@@ -574,6 +574,11 @@
   height: 8em;
 }
 
+.inputForm label
+{
+  color: #222;
+}
+
 .settingIndent
 {
   margin-left: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm	2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm	2014-04-22 16:33:23 +0000
@@ -67,7 +67,7 @@
 		</td>
 	</tr>
     <tr>
-        <td>$i18n.getString( 'legend_set' )</td>            
+        <td><label>$i18n.getString( 'legend_set' )</label></td>            
         <td>
             <select id="selectedLegendSetId" name="selectedLegendSetId">
                 <option value="0">[$i18n.getString('please_select')]</option>
@@ -115,7 +115,7 @@
 
 	#foreach ( $groupSet in $groupSets )
     <tr>
-		<td>$encoder.htmlEncode( $groupSet.name )</td>			
+		<td><label>$encoder.htmlEncode( $groupSet.name )</label></td>			
 		<td>
 			<select id="selectedGroups" name="selectedGroups">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm	2014-04-21 16:43:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm	2014-04-22 16:33:23 +0000
@@ -186,7 +186,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>$i18n.getString( 'option_set_for_data_values' )</td>			
+		<td><label>$i18n.getString( 'option_set_for_data_values' )</label></td>			
 		<td>
 			<select id="selectedOptionSetId" name="selectedOptionSetId">
 				<option value="0">[$i18n.getString('please_select')]</option>
@@ -197,7 +197,7 @@
 		</td>
     </tr>
     <tr>
-        <td>$i18n.getString( 'option_set_for_comments' )</td>            
+        <td><label>$i18n.getString( 'option_set_for_comments' )</label></td>            
         <td>
             <select id="selectedCommentOptionSetId" name="selectedCommentOptionSetId">
                 <option value="0">[$i18n.getString('please_select')]</option>
@@ -208,7 +208,7 @@
         </td>
     </tr>
     <tr>
-        <td>$i18n.getString( 'legend_set' )</td>            
+        <td><label>$i18n.getString( 'legend_set' )</label></td>            
         <td>
             <select id="selectedLegendSetId" name="selectedLegendSetId">
                 <option value="0">[$i18n.getString('please_select')]</option>
@@ -219,7 +219,7 @@
         </td>
     </tr>
     <tr>
-        <td style="width:200px">$i18n.getString( "aggregation_levels" )</td>
+        <td style="width:200px"><label>$i18n.getString( "aggregation_levels" )</label></td>
         <td><input type="checkbox" #if ( $!dataElement.hasAggregationLevels() )checked="checked"#end onclick="toggleById( 'aggregationLevelsContainer' )"/></td>
     </tr>
 </table>
@@ -275,7 +275,7 @@
     
 	#foreach ( $groupSet in $groupSets )
     <tr>
-		<td>$!encoder.htmlEncode( $groupSet.name )</td>
+		<td><label>$!encoder.htmlEncode( $groupSet.name )</label></td>
 		<td>
 			<select id="dataElementGroups" name="dataElementGroups">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm	2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm	2014-04-22 16:33:23 +0000
@@ -65,7 +65,7 @@
 		</td>
 	</tr>
     <tr>
-        <td>$i18n.getString( 'legend_set' )</td>            
+        <td><label>$i18n.getString( 'legend_set' )</label></td>            
         <td>
             <select id="selectedLegendSetId" name="selectedLegendSetId">
                 <option value="0">[$i18n.getString('please_select')]</option>
@@ -112,7 +112,7 @@
 
 	#foreach ( $groupSet in $groupSets )
     <tr>
-		<td>$encoder.htmlEncode( $groupSet.name )</td>
+		<td><label>$encoder.htmlEncode( $groupSet.name )</label></td>
 		<td>
 			<select id="indicatorGroups" name="indicatorGroups">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2014-04-07 07:19:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2014-04-22 16:33:23 +0000
@@ -179,7 +179,7 @@
       </tr>
       </tr>
       <tr>
-        <td>$i18n.getString( 'legend_set' )</td>
+        <td><label>$i18n.getString( 'legend_set' )</label></td>
         <td>
           <select id="selectedLegendSetId" name="selectedLegendSetId">
             <option value="0">[$i18n.getString('please_select')]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2014-04-07 07:19:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2014-04-22 16:33:23 +0000
@@ -182,7 +182,7 @@
         </td>
       </tr>
       <tr>
-        <td>$i18n.getString( 'legend_set' )</td>
+        <td><label>$i18n.getString( 'legend_set' )</label></td>
         <td>
           <select id="selectedLegendSetId" name="selectedLegendSetId">
             <option value="0">[$i18n.getString('please_select')]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2014-02-18 10:24:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2014-04-22 16:33:23 +0000
@@ -159,7 +159,7 @@
     </tr>
 	#foreach ( $groupSet in $groupSets )
     <tr>
-		<td>$encoder.htmlEncode( $groupSet.name )</td>			
+		<td><label>$encoder.htmlEncode( $groupSet.name )</label></td>			
 		<td>
 			<select id="selectedGroups" name="selectedGroups">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2014-02-18 10:24:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2014-04-22 16:33:23 +0000
@@ -168,7 +168,7 @@
     </tr>
 	#foreach ( $groupSet in $groupSets )
     <tr>
-		<td>$encoder.htmlEncode( $groupSet.name )</td>
+		<td><label>$encoder.htmlEncode( $groupSet.name )</label></td>
 		<td>
 			<select id="orgUnitGroups" name="orgUnitGroups">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm	2013-05-19 18:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm	2014-04-22 16:33:23 +0000
@@ -62,7 +62,7 @@
     </tr>
     #end
 	<tr class="jasperReportTableDataSource">
-		<td>$i18n.getString( "report_table" )</td>
+		<td><label for="reportTable">$i18n.getString( "report_table" )</label></td>
 		<td>
 			<select id="reportTableId" name="reportTableId">
 			<option value="0">[ $i18n.getString( "none" ) ]</option>