dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7265
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-06-10 22:59:43 +0300
message:
  fixed layout of indicator forms (add/edit)
modified:
  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/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/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	2012-06-01 12:17:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm	2012-06-10 19:59:43 +0000
@@ -28,9 +28,6 @@
 <input type="hidden" id="denominatorDescription" name="denominatorDescription" value=""/>
 
 <table>
-    <col width="200px" />
-   	<col width="240px" />
-
 	<tr>
 		<th colspan="2">$i18n.getString( "details" )</th>
 	</tr>
@@ -57,7 +54,7 @@
 	<tr>
 		<td><label for="annualized">$i18n.getString( "annualized" )</label></td>
 		<td>
-			<select id="annualized" name="annualized" style="width:240px">
+			<select id="annualized" name="annualized" style="width:246px">
 				<option value="false">$i18n.getString( "no" )</option>
 				<option value="true">$i18n.getString( "yes" )</option>
 			</select>
@@ -66,7 +63,7 @@
 	<tr>
 		<td><label for="indicatorTypeId">$i18n.getString( "indicator_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="indicatorTypeId" name="indicatorTypeId" style="min-width:240px" onchange='indicatorTypeChanged();'>				
+			<select id="indicatorTypeId" name="indicatorTypeId" style="min-width:246px; margin: 0;" onchange='indicatorTypeChanged();'>
 				<option value="">[ $i18n.getString('select') ]</option>
 			#foreach( $indicatorType in $indicatorTypes )
 				<option value="$indicatorType.id" number="$indicatorType.number">$encoder.htmlEncode( $indicatorType.name )</option>
@@ -86,14 +83,14 @@
 	<tr>
 		<td style="width:200px"></td>
 		<td>
-			<input type="button" value="$i18n.getString( 'edit_numerator' )" onclick="indicatorNumeratorForm()" style="width:240px"/>
+			<input type="button" value="$i18n.getString( 'edit_numerator' )" onclick="indicatorNumeratorForm()" style="width:246px"/>
 			<input type="hidden" id="numerator" name="numerator"/>
 		</td>	
 	</tr>
 	<tr>
 		<td style="width:200px"></td>
 		<td>
-			<input type="button" id="denominatorButton" name="denominatorButton" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:240px"/>
+			<input type="button" id="denominatorButton" name="denominatorButton" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:246px"/>
 			<input type="hidden" id="denominator" name="denominator" class="{validate:{required:true}}"/>
 		</td>
 	</tr>
@@ -102,9 +99,6 @@
 
 #if( $groupSets.size() > 0 )
 <table>
-	<col width="200px" />
-	<col width="240px" />
-
 	<tr>
 		<td style="height:15px" colspan="2">
 	</tr>
@@ -117,7 +111,7 @@
     <tr>
 		<td>$encoder.htmlEncode( $groupSet.name )</td>			
 		<td>
-			<select id="selectedGroups" name="selectedGroups" style="min-width: 244px;">
+			<select id="selectedGroups" name="selectedGroups" style="min-width:246px; margin: 0;">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
 				#foreach ( $group in $groupSet.getSortedGroups() )
 				<option value="$group.id">$group.name</option>

=== 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	2012-06-01 13:05:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm	2012-06-10 19:59:43 +0000
@@ -27,9 +27,6 @@
 <input type="hidden" id="denominatorDescription" name="denominatorDescription" value="$!indicator.denominatorDescription"/>
 
 <table>
-    <col width="200px" />
-   	<col width="275px" />
-
 	<tr>
 		<th colspan="2">$i18n.getString( "details" )</th>
 	</tr>
@@ -65,7 +62,7 @@
 	<tr>
 		<td><label for="indicatorTypeId">$i18n.getString( "indicator_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="indicatorTypeId" name="indicatorTypeId" style="min-width:246px" onchange='indicatorTypeChanged();'>
+			<select id="indicatorTypeId" name="indicatorTypeId" style="min-width:246px; margin: 0;" onchange='indicatorTypeChanged();'>
 			#foreach( $indicatorType in $indicatorTypes )
 				<option value="$indicatorType.id" number="$indicatorType.number" #if( $indicator.indicatorType.id == $indicatorType.id ) selected="selected"#end>$encoder.htmlEncode( $indicatorType.name )</option>
 			#end
@@ -100,9 +97,6 @@
 
 #if( $groupSets.size() > 0 )
 <table>
-	<col width="200px" />
-	<col width="260px" />
-
 	<tr>
 		<td style="height:15px" colspan="2">
 	</tr>
@@ -114,7 +108,7 @@
     <tr>
 		<td>$encoder.htmlEncode( $groupSet.name )</td>
 		<td>
-			<select id="indicatorGroups" name="indicatorGroups" style="min-width: 244px;">
+			<select id="indicatorGroups" name="indicatorGroups" style="min-width:246px; margin: 0;">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
 				#foreach ( $group in $groupSet.getSortedGroups() )
 				<option value="$group.id" #if( $group.members.contains( $indicator ) ) selected="selected" #end>$group.name</option>