dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5825
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-01-30 11:55:33 +0100
message:
  UI fix to indicator editor
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


--
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	2011-09-24 11:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm	2012-01-30 10:55:33 +0000
@@ -10,7 +10,7 @@
 			modal: true,
 			autoOpen: false,
 			minWidth: 820,
-			minHeight: 500,
+			minHeight: 540,
 			width: 820,
 			height: 540
 		});
@@ -185,12 +185,11 @@
 		</td>
 		<td></td>
 		<td valign="top">
-			<label>$encoder.htmlEncode( $i18n.getString( "filter_by_name" ) )</label><br/>
 			<input type="text" id="filter" name="filter" style="width:370px">
 			<input type="button" value="$i18n.getString( 'filter' )" onclick="getOperandsPage()" style="width:60px">
 			<input type="button" value="$i18n.getString( 'clear' )" onclick="clearSearchText();" style="width:60px"><br/>
 
-			<select id="dataElementId" name="dataElementId" size="8" style="width:500px" ondblclick="insertText( 'expression', this.value )">
+			<select id="dataElementId" name="dataElementId" size="9" style="width:500px" ondblclick="insertText( 'expression', this.value )">
 			</select>
 		</td>
 	</tr>

=== 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	2011-10-27 20:30:28 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm	2012-01-30 10:55:33 +0000
@@ -7,9 +7,9 @@
 			modal: true,
 			autoOpen:false,
 			minWidth: 820,
-			minHeight: 500,
+			minHeight: 540,
 			width:820,
-			height:500,
+			height:540,
 			title: "$i18n.getString( 'expression' )"
 		});
 			
@@ -187,12 +187,11 @@
 		</td>
 		<td></td>
 		<td valign="top">
-			<label>$encoder.htmlEncode( $i18n.getString( "filter_by_name" ) )</label><br/>
 			<input type="text" id="filter" name="filter" style="width:320px">
 			<input type="button" value="$i18n.getString( 'filter' )" onclick="getOperandsPage()" style="width:60px">
 			<input type="button" value="$i18n.getString( 'clear' )" onclick="clearSearchText();" style="width:60px"><br/>
 
-			<select id="dataElementId" name="dataElementId" size="7" style="min-width:450px" ondblclick="insertText( 'expression', this.value )">
+			<select id="dataElementId" name="dataElementId" size="9" style="min-width:450px" ondblclick="insertText( 'expression', this.value )">
 			</select>
 		</td>
 	</tr>
@@ -200,7 +199,7 @@
 		<th colspan="3">$i18n.getString( "description" )</th>		
 	</tr>
 	<tr>
-		<td colspan="3"><div id="formulaText" style="width:740px;height:70px;overflow:auto"></div></td>
+		<td colspan="3"><div id="formulaText" style="width:740px;height:100px;overflow:auto"></div></td>
 	</tr>
 	<tr>
 		<td colspan="3"></td>