dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8204
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-09-23 10:50:59 +0200
message:
  Made the data element list expand when resizing dialog for indicator/validation rule formulas
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	2012-07-26 11:14:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm	2012-09-23 08:50:59 +0000
@@ -145,7 +145,7 @@
 
 <div id="indicator-expression-container" class="page">
 <form id="indicator-expression-form">
-<table width="780" style="text-align:left">
+<table style="width:100%;text-align:left">
 	<colgroup>
 		<col width="250"/>
 		<col width="10"/>
@@ -170,7 +170,7 @@
 	</tr>
 	<tr>
 		<th colspan="2">$i18n.getString( "formula" )</th>
-		<th>$i18n.getString( "list_of_data_elements" )</th>
+		<th style="width:100%">$i18n.getString( "list_of_data_elements" )</th>
 	</tr>
 	<tr>
 		<td valign="top">
@@ -184,20 +184,20 @@
 		<a href="javascript:insertText( 'expression', '[days]' )"><img src="../images/no_of_days.png" title="$i18n.getString( 'no_of_days' )"/></a>
 		</td>
 		<td></td>
-		<td valign="top">
+		<td valign="top" style="width:100%">
 			<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="8"  style="width:100%" ondblclick="insertText( 'expression', this.value )">
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<th colspan="3">$i18n.getString( "description" )</th>		
+		<th colspan="3" style="width:100%">$i18n.getString( "description" )</th>		
 	</tr>
 	<tr>
-		<td colspan="3"><div id="formulaText" style="width:740px;height:100px;overflow:auto"></div></td>
+		<td colspan="3" style="width:100%"><div id="formulaText" style="width:740px;height:100px;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/expressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm	2012-07-26 11:14:41 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm	2012-09-23 08:50:59 +0000
@@ -11,11 +11,11 @@
 
 <div id="expression-container" class="page">
 <form id="expression-form" name="expression-form">
-<table width="800" style="text-align:left">
+<table style="width:100%;text-align:left">
 	<colgroup>
 		<col width="250"/>
 		<col width="50"/>
-		<col width="500"/>
+		<col />
 	</colgroup>
 	<tr>
 		<th colspan="2">$i18n.getString( "description" )</th>		
@@ -36,7 +36,7 @@
 	</tr>
 	<tr>
 		<th colspan="2">$i18n.getString( "expression" )</th>
-		<th>$i18n.getString( "available_data_elements" )</th>
+		<th style="width:100%">$i18n.getString( "available_data_elements" )</th>
 	</tr>
 	<tr>
 		<td valign="top">
@@ -50,20 +50,20 @@
 		<a href="javascript:insertText( 'expression', '[days]' )"><img src="../images/no_of_days.png" title="$i18n.getString( 'no_of_days' )"/></a>
 		</td>
 		<td></td>
-		<td valign="top">
+		<td valign="top" style="width:100%">
 			<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="8" style="min-width:450px" ondblclick="insertText( 'expression', this.value )">
+			<select id="dataElementId" name="dataElementId" size="8" style="width:100%" ondblclick="insertText( 'expression', this.value )">
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<th colspan="3">$i18n.getString( "description" )</th>		
+		<th colspan="3" style="width:100%">$i18n.getString( "description" )</th>		
 	</tr>
 	<tr>
-		<td colspan="3"><div id="formulaText" style="width:740px;height:100px;overflow:auto"></div></td>
+		<td colspan="3" style="width:100%"><div id="formulaText" style="width:740px;height:100px;overflow:auto"></div></td>
 	</tr>
 	<tr>
 		<td colspan="3"></td>