dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16248
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-07-26 20:27:49 +0200
message:
  Higher div for expressions
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js


--
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/indicatorExpressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm	2014-07-25 07:07:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm	2014-07-26 18:27:49 +0000
@@ -13,7 +13,7 @@
 		minWidth: 840,
 		minHeight: 560,
 		width: 840,
-		height: 560
+		height: 630
 	});
 	
 	getConstantsPage();
@@ -83,7 +83,7 @@
 		<th colspan="4">$i18n.getString( "description" )</th>		
 	</tr>
 	<tr>
-		<td colspan="4"><div id="formulaText" style="width:100%;height:100px;overflow:auto"></div></td>
+		<td colspan="4"><div id="formulaText" style="width:100%;height:170px;overflow:auto"></div></td>
 	</tr>
 	<tr>
 		<td colspan="4"></td>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm	2014-07-25 07:07:54 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm	2014-07-26 18:27:49 +0000
@@ -67,7 +67,7 @@
 		<th colspan="3">$i18n.getString( "description" )</th>		
 	</tr>
 	<tr>
-		<td colspan="3"><div id="formulaText" style="width:100%;height:100px;overflow:auto"></div></td>
+		<td colspan="3"><div id="formulaText" style="width:100%;height:170px;overflow:auto"></div></td>
 	</tr>
 	<tr>
 		<td colspan="3"></td>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js	2014-07-16 15:29:27 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js	2014-07-26 18:27:49 +0000
@@ -9,7 +9,7 @@
 		minWidth: 840,
 		minHeight: 560,
 		width: 840,
-		height: 560,
+		height: 630,
 		title: "Expression"
 	});