dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3610
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-13 08:26:31 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  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/javascript/indicator.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.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/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2011-05-12 03:24:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2011-05-13 01:26:31 +0000
@@ -351,4 +351,3 @@
 view_1											= View 1
 view_2											= View 2
 store_zero_data_values							= Store Zero Data Value
-warning_choose_indicator_type_as_number			= Indicator is created with indicator type as number has denominator as 1.

=== 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	2011-05-12 03:24:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm	2011-05-13 01:26:31 +0000
@@ -76,7 +76,6 @@
 			<input type="button" id="denominatorButton" name="denominatorButton" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:20em"/>
 			<input type="hidden" id="denominator" name="denominator" class="{validate:{required:true}}"/>
 		</td>
-		<td><span id='warning'></span></td>
 	</tr>
 	<tr>
 		<td height="20px"></td>
@@ -92,7 +91,3 @@
 
 #parse( "/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm" )
 
-<script>
-	var i18n_warning_choose_indicator_type_as_number = '$encoder.jsEscape( $i18n.getString( "warning_choose_indicator_type_as_number" ) , "'")';
-</script>
-

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js	2011-05-12 03:24:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js	2011-05-13 01:26:31 +0000
@@ -6,7 +6,6 @@
 	if( eval(type) )
 	{
 		setFieldValue('denominator','1');
-		setInnerHTML('warning', "<i style='color:red'>" + i18n_warning_choose_indicator_type_as_number + "</i>")
 	}
 	else
 	{
@@ -18,8 +17,6 @@
 		{
 			setFieldValue('denominator',getFieldValue('denominatorFormula'));
 		}
-		
-		setInnerHTML('warning',"");
 	}	
 }
 

=== 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	2011-05-12 03:24:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm	2011-05-13 01:26:31 +0000
@@ -75,7 +75,6 @@
 			<input type="hidden" id="denominator" name="denominator" value="$!indicator.denominator"/>
 			<input type="hidden" id="denominatorFormula" name="denominatorFormula" value="$!indicator.denominator"/>
 		</td>
-		<td><span id='warning'></span></td>
 	</tr>
 	<tr>
 		<td height="20px"></td>
@@ -88,8 +87,4 @@
 </table>
 </form>
 
-#parse( "/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm" )
-
-<script>
-	var i18n_warning_choose_indicator_type_as_number = '$encoder.jsEscape( $i18n.getString( "warning_choose_indicator_type_as_number" ) , "'")';
-</script>
\ No newline at end of file
+#parse( "/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm" )
\ No newline at end of file