dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10661
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-04-22 12:06:45 +0200
message:
  Data element category combo, using checkbox instead of dropdown for consistency
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.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/multidimensional/addDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm	2013-04-22 10:01:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm	2013-04-22 10:06:45 +0000
@@ -40,14 +40,9 @@
         <td><input type="text" id="name" name="name" /></td>
       </tr>
       <tr>
-      	<td><label>$i18n.getString( "skip_total_in_reports" )</label></td>
-      	<td>
-            <select id="skipTotal" name="skipTotal">
-                <option value="false" selected="selected">$i18n.getString( "no" )</option>
-                <option value="true" >$i18n.getString( "yes" )</option>
-            </select>
-            </td>
-        </tr>
+      	<td><label for="skipTotal">$i18n.getString( "skip_total_in_reports" )</label></td>
+      	<td><input type="checkbox" id="skipTotal" name="skipTotal" value="true" /></td>
+      </tr>
       </tr>  
       <tr>
       	<td colspan="2" style="height:15px"></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm	2013-04-22 10:01:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm	2013-04-22 10:06:45 +0000
@@ -43,18 +43,12 @@
       <tr>
         <td style="width:120px"><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
         <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElementCategoryCombo.displayName )"/></td>
-      </tr>      
-      <tr>
-        <td><label>$i18n.getString( "skip_total_in_reports" )</label></td>
-        <td>
-            <select id="skipTotal" name="skipTotal">
-                <option value="false" selected="selected">$i18n.getString( "no" )</option>
-                <option value="true" #if( $dataElementCategoryCombo.skipTotal ) selected="selected"#end>$i18n.getString( "yes" )</option>
-            </select>
-            </td>
-        </tr>
       </tr>  
       <tr>
+        <td><label for="skipTotal">$i18n.getString( "skip_total_in_reports" )</label></td>
+        <td><input type="checkbox" id="skipTotal" name="skipTotal" value="true"#if( $dataElementCategoryCombo.skipTotal ) checked="checked"#end/></td>
+      </tr>
+      <tr>
       	<td colspan="2" style="height:15px"></td>
       </tr>
     </tbody>