dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17758
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-12-20 14:15:34 +0100
message:
  Cleaned up add/edit validation rule screen
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.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-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2014-10-15 13:58:41 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2014-12-20 13:15:34 +0000
@@ -65,7 +65,7 @@
 selected=Selected
 validation_rules=Validation rules
 user_groups_to_alert=User groups to alert
-alert_by_org_units=Only organisation unit related users are alerted
+alert_by_org_units=Alert only organisation unit related users
 yes=Yes
 no=No
 available_validation_rules=Available validation rules

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm	2014-09-29 04:34:06 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm	2014-12-20 13:15:34 +0000
@@ -35,15 +35,17 @@
 <form id="addValidationRuleGroupForm" action="addValidationRuleGroup.action" method="post" class="inputForm">
 
 <table>
+	<colgroup>
+      <col style="width: 120px">
+      <col>
+    </colgroup>
     <tr>
         <th colspan="2">$i18n.getString( "details" )</th>
     </tr>
-
     <tr>
         <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"></td>
     </tr>
-
     <tr>
         <td><label for="description">$i18n.getString( "description" )</label></td>
         <td><input type="text" id="description" name="description"></td>
@@ -52,10 +54,10 @@
 
 <table style="margin-top: 15px;">
     <colgroup>
-      <col style="width: 120px"/>
-      <col style="width: 500px;"/>
-      <col/>
-      <col style="width: 500px;"/>
+      <col style="width: 120px">
+      <col style="width: 500px;">
+      <col>
+      <col style="width: 500px;">
     </colgroup>
 
     <tr>
@@ -103,6 +105,10 @@
 </table>
 
 <table>
+	<colgroup>
+      <col style="width: 120px">
+      <col>
+    </colgroup>
     <tr>
         <td><label for="alertByOrgUnits">$i18n.getString( "alert_by_org_units" )</label></td>
         <td>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2014-07-26 19:08:32 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2014-12-20 13:15:34 +0000
@@ -36,15 +36,17 @@
 </div>
 
 <table>
+	<colgroup>
+      <col style="width: 120px">
+      <col>
+    </colgroup>
     <tr>
         <th colspan="2">$i18n.getString( "details" )</th>
     </tr>
-
     <tr>
         <td><label for="name">$i18n.getString( "name" )</label></td>
         <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $validationRuleGroup.name )"></td>
     </tr>
-
     <tr>
         <td><label for="description">$i18n.getString( "description" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
         <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $validationRuleGroup.description )"></td>
@@ -113,6 +115,10 @@
 </table>
 
 <table>
+	<colgroup>
+      <col style="width: 120px">
+      <col>
+    </colgroup>
     <tr>
         <td><label for="alertByOrgUnits">$i18n.getString( "alert_by_org_units" )</label></td>
         <td>