dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8923
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-11-07 11:33:05 +0700
message:
  Minor fix for program validation rule ui.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.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/addMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm	2012-10-30 03:46:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm	2012-11-07 04:33:05 +0000
@@ -16,7 +16,7 @@
     <tbody>
 	<tr>
 		<td>
-			<label>$i18n.getString('description') <em title="$i18n.getString( "required" )" class="required">*</em></label>
+			<label>$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label>
 		</td>
 	</tr>
 	<tr>
@@ -95,13 +95,13 @@
 	<tr>	
 		<td>
 			<fieldset>
-				<legend>$i18n.getString("formula")</legend>
+				<legend>$i18n.getString("formula") <em title="$i18n.getString( "required" )" class="required">*</em></legend>
 				<textarea rows='5' id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:300px'></textarea>
 			</fieldset>
 		</td>
 		<td>
 			<fieldset>
-				<legend>$i18n.getString("formula")</legend>
+				<legend>$i18n.getString("formula") <em title="$i18n.getString( "required" )" class="required">*</em></legend>
 				<textarea rows='5' id='rightSide' name='rightSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('rightStageDescription', 'rightSide')" style='width:300px'></textarea>
 			</fieldset>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm	2012-10-30 03:46:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm	2012-11-07 04:33:05 +0000
@@ -7,29 +7,24 @@
 <input type='hidden' id='programId' name='programId' value='$program.id'>
 <input type='hidden' id='dateType' name='dateType' value='false'>
 <table>
-	
 	<thead>
       <tr>
-        <th>$i18n.getString( "program_validation_rule_details" )</th>
+        <th colspan='2'>$i18n.getString( "program_validation_rule_details" )</th>
       </tr>
     </thead>
-    <tbody>
-	
-	<tr>
-		<td><label>$i18n.getString('description') <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-	</tr>
-	<tr>
+    
+	<tbody>
+	
+	<tr>
+		<td><label>$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+	
 		<td>			
-			<input type="text" id='description' name='description' class="{validate:{required:true,minlength:4}}" style='width:300px;'>
+			<input type="text" id='description' name='description' class="{validate:{required:true,minlength:4}}" >
 		</td>
 	</tr>
 	<tr>
-		<th><label>$i18n.getString('validation')</label></th>
-	</tr>
-	<tr>
 		<td>$i18n.getString("program_stage")</td>
-	</tr>
-	<tr>
+	
 		<td>
 			<select id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();" style='width:320px;'>
 				<option value=''>[$i18n.getString( "please_select" )]</option>
@@ -41,14 +36,14 @@
 	</tr>
 	<tr>
 		<td>$i18n.getString("data_elements")</td>
-	</tr>
-	<tr>
+	
 		<td>
 			<select id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide', 'leftStageDescription');" style='width:320px;'>
 			</select>
 		</td>
 	</tr>
 	<tr>
+		<td></td>
 		<td>
 			<input type='button' value="+" title="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' class="small-button" >
 			&nbsp;&nbsp;
@@ -64,23 +59,22 @@
 		</td>
 	</tr>
 	<tr>	
+		<td><label>$i18n.getString("formula") <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
-			<fieldset>
-				<legend>$i18n.getString("formula")</legend>
-				<textarea rows='5' id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:320px;'></textarea>
-				<input type='hidden' id='rightSide' name='rightSide' value='1==1'>
-			</fieldset>
+			<textarea rows='5' id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:320px;'></textarea>
+			<input type='hidden' id='rightSide' name='rightSide' value='1==1'>
 		</td>
 	</tr>
 	<tr>	
+		<td><label>$i18n.getString("description")</label></td>
 		<td>
-			<fieldset>
-				<legend>$i18n.getString( "description" )</legend>
+			<fieldset style='width:300px;'>
 				<div id='leftStageDescription' style='width:300px;'></div>
 			</fieldset>
 		</td>
 	</tr>
 	<tr>
+		<td></td>
 		<td>
 			<input type='submit' value="$i18n.getString( 'add' )" >
 			<input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$program.id'">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm	2012-11-06 03:21:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm	2012-11-07 04:33:05 +0000
@@ -16,7 +16,7 @@
 	
 	<tr>
 		<td>
-			<label>$i18n.getString('description') <em title="$i18n.getString( "required" )" class="required">*</em></label>
+			<label>$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label>
 		</td>
 	</tr>
 	<tr>
@@ -98,14 +98,14 @@
 	<tr>
 		<td>
 			<fieldset>
-				<legend>$i18n.getString("formula")</legend>
-				<textarea rows='5' id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:320px;'>$validation.leftSide</textarea>
+				<legend>$i18n.getString("formula") <em title="$i18n.getString( "required" )" class="required">*</em></legend>
+				<textarea rows='5' id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:320px;' class="{validate:{required:true,minlength:4}}">$validation.leftSide</textarea>
 			</fieldset>
 		</td>
 		<td>
 			<fieldset>
-				<legend>$i18n.getString("formula")</legend>
-				<textarea rows='5' id='rightSide' name='rightSide' onkeyup="getValidationDescription('rightStageDescription', 'rightSide')" style='width:300px;'>$validation.rightSide</textarea>
+				<legend>$i18n.getString("formula") <em title="$i18n.getString( "required" )" class="required">*</em></legend>
+				<textarea rows='5' id='rightSide' name='rightSide' onkeyup="getValidationDescription('rightStageDescription', 'rightSide')" style='width:300px;' class="{validate:{required:true,minlength:4}}">$validation.rightSide</textarea>
 			</fieldset>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm	2012-10-30 03:46:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm	2012-11-07 04:33:05 +0000
@@ -15,22 +15,15 @@
     <tbody>
 	
 	<tr>
-		<td width="20em" colspan='2'>
-			<label>$i18n.getString('description') <em title="$i18n.getString( "required" )" class="required">*</em></label>
+		<td>
+			<label>$i18n.getString('name') <em title="$i18n.getString( "required" )" class="required">*</em></label>
 		</td>
-	</tr>
-	<tr>
 		<td colspan='2'>			
 			<input type="text" id='description' name='description' value='$validation.description' class="{validate:{required:true,minlength:4}}">
 		</td>
 	</tr>
 	<tr>
-		<th><label>$i18n.getString('validation')</label></th>
-	</tr>
-	<tr>
 		<td><label>$i18n.getString("program_stage")</label></td>
-	</tr>
-	<tr>
 		<td>
 			<select id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
 				<option value=''>[$i18n.getString( "please_select" )]</option>
@@ -42,14 +35,13 @@
 	</tr>
 	<tr>
 		<td>$i18n.getString("data_elements")</td>
-	</tr>
-	<tr>
 		<td>
 			<select id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide', 'leftStageDescription');">
 			</select>
 		</td>
 	</tr>
 	<tr>
+		<td></td>
 		<td>
 			<input type='button' value="+" title="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' class="small-button" >
 			&nbsp;&nbsp;
@@ -65,23 +57,22 @@
 		</td>
 	</tr>
 	<tr>
+		<td><label>$i18n.getString("formula") <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
-			<fieldset>
-				<legend>$i18n.getString("formula")</legend>
-				<textarea rows='5' id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:300px;'>$validation.leftSide</textarea>
-				<input type='hidden' id='rightSide' name='rightSide' value='1==1'>
-			</fieldset>
+			<textarea rows='5' id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')" style='width:320px;' class="{validate:{required:true,minlength:4}}">$validation.leftSide</textarea>
+			<input type='hidden' id='rightSide' name='rightSide' value='1==1'>
 		</td>
 	</tr>
 	<tr>	
+		<td><label>$i18n.getString("description")</label></td>
 		<td>
-			<fieldset>
-				<legend>$i18n.getString( "description" )</legend>
+			<fieldset style='width:300px;'>
 				<div id='leftStageDescription' style='width:300px;'>$!leftDescription</div>
 			</fieldset>
 		</td>
 	</tr>
 	<tr>
+		<td></td>
 		<td>
 			<input type='submit' value="$i18n.getString( 'update' )" >
 			<input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$validation.program.id'">