dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17039
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-10-10 16:03:26 +0200
message:
  Expression builder, markup fixes
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-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.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	2014-08-28 12:01:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm	2014-10-10 14:03:26 +0000
@@ -58,7 +58,7 @@
 	</tr>
 	<tr>
 		<td valign="top">
-		<textarea id="expression" name="expression" style="width:100%; height:158px; margin-top:2px;" wrap="virtual" onchange="cleanExpression()" class="{validate:{required:true}}"></textarea><br/>
+		<textarea id="expression" name="expression" style="width:100%; height:160px; margin-top:2px;" wrap="virtual" onchange="cleanExpression()" class="{validate:{required:true}}"></textarea><br/>
 		<div style="margin-bottom:2px">
 			<a href="javascript:insertText( 'expression', '(' )"><img src="../images/left_parent.png" title="$i18n.getString( 'left_brackets' )"/></a>
 			<a href="javascript:insertText( 'expression', ')' )"><img src="../images/right_parent.png" title="$i18n.getString( 'right_brackets' )"/></a>
@@ -71,9 +71,11 @@
 		</td>
 		<td></td>
 		<td colspan="2" valign="top">
+			<div style="margin-bottom: 4px">
 			<input type="text" id="filter" name="filter" style="width:280px">
 			<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/>
+			<input type="button" value="$i18n.getString( 'clear' )" onclick="clearSearchText();" style="width:60px">
+			</div>
 
 			<select id="dataElementId" name="dataElementId" size="9"  style="width:100%" ondblclick="insertText( 'expression', this.value )">
 			</select>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2014-04-02 15:07:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2014-10-10 14:03:26 +0000
@@ -14,7 +14,7 @@
 <div id="critiera" class="inputCriteria" style="width:660px; height:auto; padding:20px;">
 <div style="width:320px; float:left;">
 	<label>$i18n.getString( "organisation_unit" )</label>
-	<div id="selectionTree" style="width:290px; height:228px"></div>
+	<div id="selectionTree" style="width:290px; height:202px"></div>
 </div>
 <div>
     <input type="radio" name="criteria" id="registrationRadio" value="registration" checked="checked"/>

=== 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-08-28 12:01:44 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm	2014-10-10 14:03:26 +0000
@@ -23,13 +23,15 @@
 	</tr>
 	<tr>
 		<td valign="top">
-			<input type="text" id="description" name="description" style="width:100%" class="{validate:{required:true}}"/><br>
+			<input type="text" id="description" name="description" style="width:100%" class="{validate:{required:true}}"/>
+			<div style="margin: 4px 0">
 			<input type="radio" id="missingValueStrategyA" name="missingValueStrategy" value="SKIP_IF_ANY_VALUE_MISSING">
 				<label for="missingValueStrategyA">$i18n.getString( "skip_if_any_value_is_missing" )</label><br>
 			<input type="radio" id="missingValueStrategyB" name="missingValueStrategy" value="SKIP_IF_ALL_VALUES_MISSING">
 				<label for="missingValueStrategyB">$i18n.getString( "skip_if_all_values_are_missing" )</label><br>
 			<input type="radio" id="missingValueStrategyC" name="missingValueStrategy" value="NEVER_SKIP">
-				<label for="missingValueStrategyC">$i18n.getString( "never_skip" )</label>
+				<label for="missingValueStrategyC">$i18n.getString( "never_skip" )</label>
+			</div>
 		</td>
 		<td valign="top"></td>
 		<td valign="top">
@@ -46,7 +48,7 @@
 	</tr>
 	<tr>
 		<td valign="top">
-		<textarea id="expression" name="expression" style="width:100%; height:158px; margin-top:2px;" wrap="virtual" onchange="getExpressionText()" class="{validate:{required:true}}"></textarea><br/>
+		<textarea id="expression" name="expression" style="width:100%; height:160px; margin-top:2px;" wrap="virtual" onchange="getExpressionText()" class="{validate:{required:true}}"></textarea><br/>
 		<div style="margin-bottom:2px">
 			<a href="javascript:insertText( 'expression', '(' )"><img src="../images/left_parent.png" alt="$i18n.getString( 'left_brackets' )"/></a>
 			<a href="javascript:insertText( 'expression', ')' )"><img src="../images/right_parent.png" alt="$i18n.getString( 'right_brackets' )"/></a>
@@ -59,9 +61,11 @@
 		</td>
 		<td></td>
 		<td valign="top">
+			<div style="margin-bottom: 4px">
 			<input type="text" id="filter" name="filter" style="width:280px">
 			<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/>
+			<input type="button" value="$i18n.getString( 'clear' )" onclick="clearSearchText();" style="width:60px">
+			</div>
 
 			<select id="dataElementId" name="dataElementId" size="9" style="width:100%" ondblclick="insertText( 'expression', this.value )">
 			</select>