dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19535
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8556: Centralized styling of input forms
------------------------------------------------------------
revno: 8556
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-17 13:58:35 +0200
message:
Centralized styling of input forms
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm
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/addIndicatorGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm
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/updateIndicatorGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2012-10-16 13:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2012-10-17 11:58:35 +0000
@@ -618,6 +618,21 @@
}
/*----------------------------------------------------------------------------*/
+/* Forms */
+/*----------------------------------------------------------------------------*/
+
+.inputForm input[type=text],select
+{
+ width: 25em;
+}
+
+.inputForm textarea
+{
+ width: 25em;
+ height: 8em;
+}
+
+/*----------------------------------------------------------------------------*/
/* jQuery overrides */
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2012-10-17 11:58:35 +0000
@@ -47,7 +47,7 @@
<h3>$i18n.getString( "create_new_data_dictionary" )</h3>
-<form id="addDataDictionaryForm" action="addDataDictionary.action" method="post" >
+<form id="addDataDictionaryForm" action="addDataDictionary.action" method="post" class="inputForm">
<table>
<tr>
@@ -56,17 +56,17 @@
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:28em"/></td>
+ <td><input type="text" id="name" name="name"/></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description" style="width:28em; height:8em"></textarea></td>
+ <td><textarea id="description" name="description"></textarea></td>
</tr>
<tr>
<td><label for="region">$i18n.getString( "region" )</label></td>
- <td><input type="text" id="region" name="region" style="width:28em"/></td>
+ <td><input type="text" id="region" name="region"></td>
</tr>
<tr>
<td colspan="2" height="15px"></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2012-09-17 07:20:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2012-10-17 11:58:35 +0000
@@ -26,7 +26,7 @@
<h3>$i18n.getString( "create_new_data_element" )</h3>
-<form id="addDataElementForm" action="addDataElement.action" method="POST" >
+<form id="addDataElementForm" action="addDataElement.action" method="POST" class="inputForm">
<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id"/>
<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
@@ -36,32 +36,32 @@
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:240px" /></td>
+ <td><input type="text" id="name" name="name" /></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="shortName" name="shortName" style="width:240px" /></td>
+ <td><input type="text" id="shortName" name="shortName" /></td>
</tr>
<tr>
<td><label for="alternativeName">$i18n.getString( "alternative_name" )</label></td>
- <td><input type="text" id="alternativeName" name="alternativeName" style="width:240px" /></td>
+ <td><input type="text" id="alternativeName" name="alternativeName" /></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" style="width:240px" /></td>
+ <td><input type="text" id="code" name="code" /></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description" style="width: 240px; height:8em;"></textarea></td>
+ <td><textarea id="description" name="description"></textarea></td>
</tr>
<tr>
<td><label for="formName">$i18n.getString( "form_name" )</label></td>
- <td><input type="text" id="formName" name="formName" style="width:240px" /></td>
+ <td><input type="text" id="formName" name="formName" /></td>
</tr>
<tr>
<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="domainType" name="domainType" style="min-width:246px; margin: 0;">
+ <select id="domainType" name="domainType">
<option value="aggregate" selected="selected">$i18n.getString( "aggregate" )</option>
<option value="patient">$i18n.getString( "patient" )</option>
</select>
@@ -70,7 +70,7 @@
<tr>
<td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="valueType" style="min-width:246px; margin: 0;" onchange="changeValueType( this.value )">
+ <select id="valueType" onchange="changeValueType( this.value )">
<option value="int" selected="selected" onclick="enable('numberType');">$i18n.getString( "number" )</option>
<option value="string" onclick="disable('numberType');enable('textType')">$i18n.getString( "text" )</option>
<option value="bool" onclick="disable('numberType');">$i18n.getString( "yes_no" )</option>
@@ -83,7 +83,7 @@
<tr id='numberTypeTR'>
<td><label for="numberValueType">$i18n.getString( "number_value_type" )</label></td>
<td>
- <select id="numberType" name="numberType" style="min-width:246px; margin: 0;">
+ <select id="numberType" name="numberType">
<option value="number">$i18n.getString( "number" )</option>
<option value="int" >$i18n.getString( "int" )</option>
<option value="positiveNumber">$i18n.getString( "positiveNumber" )</option>
@@ -103,7 +103,7 @@
<tr id="aggregationOperator">
<td><label for="aggregationOperatorSelect">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="aggregationOperatorSelect" name="aggregationOperator" style="min-width:246px; margin: 0;">
+ <select id="aggregationOperatorSelect" name="aggregationOperator">
<option value="sum" selected="selected">$i18n.getString( "sum" )</option>
<option value="average">$i18n.getString( "average" )</option>
</select>
@@ -112,7 +112,7 @@
<tr>
<td><label for="zeroIsSignificant">$i18n.getString( "store_zero_data_values" )</label></td>
<td>
- <select id="zeroIsSignificant" name="zeroIsSignificant" style="min-width:246px; margin: 0;">
+ <select id="zeroIsSignificant" name="zeroIsSignificant">
<option value="false" selected="selected">$i18n.getString( "no" )</option>
<option value="true" >$i18n.getString( "yes" )</option>
</select>
@@ -120,12 +120,12 @@
</tr>
<tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
- <td><input type="text" id="url" name="url" style="width:240px" /></td>
+ <td><input type="text" id="url" name="url"/></td>
</tr>
<tr>
<td><label for="selectedCategoryComboId">$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="selectedCategoryComboId" style="min-width:246px; margin: 0;">
+ <select id="selectedCategoryComboId">
#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
<option value="$dataElementCategoryCombo.id" #if( $dataElementCategoryCombo.id == $defaultCategoryCombo.id ) selected="selected" #end>$encoder.htmlEncode( $dataElementCategoryCombo.name )</option>
#end
@@ -140,7 +140,7 @@
<tr>
<td>$i18n.getString( 'option_set' )</td>
<td>
- <select id="selectedOptionSetId" name="selectedOptionSetId" style="min-width:246px; margin: 0;;">
+ <select id="selectedOptionSetId" name="selectedOptionSetId">
<option value="0">[$i18n.getString('please_select')]</option>
#foreach ( $optionSet in $optionSets )
<option value="$optionSet.id">$optionSet.name</option>
@@ -181,7 +181,7 @@
</tr>
<td>
- <select multiple size="4" id="aggregationLevels" name="aggregationLevels" style="width:450px" ondblclick="moveSelectedById( 'aggregationLevels', 'organisationUnitLevels' )"></select>
+ <select multiple size="4" id="aggregationLevels" name="aggregationLevels" style="width:440px" ondblclick="moveSelectedById( 'aggregationLevels', 'organisationUnitLevels' )"></select>
</td>
</tr>
@@ -207,7 +207,7 @@
<tr>
<td>$encoder.htmlEncode( $groupSet.name )</td>
<td>
- <select id="selectedGroups" name="selectedGroups" style="min-width:246px; margin: 0;;">
+ <select id="selectedGroups" name="selectedGroups">
<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/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2012-10-17 11:58:35 +0000
@@ -29,7 +29,7 @@
<h3>$i18n.getString( "create_new_data_element_group" )</h3>
-<form id="addDataElementGroupForm" action="addDataElementGroup.action" method="post" >
+<form id="addDataElementGroupForm" action="addDataElementGroup.action" method="post" class="inputForm">
<table>
<tr>
@@ -37,8 +37,8 @@
</tr>
<tr>
- <td style="width: 200px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td style="min-width: 240px;"><input type="text" id="name" name="name" style="width:240px" /></td>
+ <td style="width: 120px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" /></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2012-10-17 11:58:35 +0000
@@ -21,10 +21,10 @@
<h3>$i18n.getString( "add_dataelementgroupset" )</h3>
-<form id="addDataElementGroupSet" action="addDataElementGroupSet.action" method="post">
+<form id="addDataElementGroupSet" action="addDataElementGroupSet.action" method="post" class="inputForm">
<table>
- <col style="width: 200px;" />
+ <col style="width: 120px;" />
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
@@ -32,18 +32,18 @@
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:250px"/></td>
+ <td><input type="text" id="name" name="name"/></td>
</tr>
<tr>
<td><label for="description" style="width:100%">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" style="width:250px"></td>
+ <td><input type="text" id="description" name="description"></td>
</tr>
<tr>
<td><label for="compulsory" style="width:100%">$i18n.getString( "compulsory" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="compulsory" name="compulsory" style="width:254px" onchange="changeCompulsory(this.value)">
+ <select id="compulsory" name="compulsory" onchange="changeCompulsory(this.value)">
<option value="true" selected="selected">$i18n.getString( "yes" )</option>
<option value="false">$i18n.getString( "no" )</option>
</select>
=== 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-10 19:59:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2012-10-17 11:58:35 +0000
@@ -22,7 +22,7 @@
<h3>$i18n.getString( "create_new_indicator" )</h3>
-<form id="addIndicatorForm" action="addIndicator.action" method="post" >
+<form id="addIndicatorForm" action="addIndicator.action" method="post" class="inputForm">
<input type="hidden" id="numeratorDescription" name="numeratorDescription"/>
<input type="hidden" id="denominatorDescription" name="denominatorDescription" value=""/>
@@ -32,29 +32,29 @@
<th colspan="2">$i18n.getString( "details" )</th>
</tr>
<tr>
- <td style="width:200px"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:240px"/></td>
+ <td style="width:120px"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" onchange="nameChanged()" /></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="shortName" name="shortName" style="width:240px"/></td>
+ <td><input type="text" id="shortName" name="shortName" /></td>
</tr>
<tr>
<td><label for="alternativeName">$i18n.getString( "alternative_name" )</label></td>
- <td><input type="text" id="alternativeName" name="alternativeName" style="width:240px"/></td>
+ <td><input type="text" id="alternativeName" name="alternativeName" /></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" style="width:240px"/></td>
+ <td><input type="text" id="code" name="code" /></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description" style="width:240px; height:8em"></textarea></td>
+ <td><textarea id="description" name="description"></textarea></td>
</tr>
<tr>
<td><label for="annualized">$i18n.getString( "annualized" )</label></td>
<td>
- <select id="annualized" name="annualized" style="width:246px">
+ <select id="annualized" name="annualized">
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</select>
@@ -63,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:246px; margin: 0;" onchange='indicatorTypeChanged();'>
+ <select id="indicatorTypeId" name="indicatorTypeId" onchange='indicatorTypeChanged();'>
<option value="">[ $i18n.getString('select') ]</option>
#foreach( $indicatorType in $indicatorTypes )
<option value="$indicatorType.id" number="$indicatorType.number">$encoder.htmlEncode( $indicatorType.name )</option>
@@ -73,7 +73,7 @@
</tr>
<tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
- <td><input type="text" id="url" name="url" style="width:240px"/></td>
+ <td><input type="text" id="url" name="url" /></td>
</tr>
</table>
@@ -81,16 +81,16 @@
<table>
<tr>
- <td style="width:200px"></td>
+ <td style="width:120px"></td>
<td>
- <input type="button" value="$i18n.getString( 'edit_numerator' )" onclick="indicatorNumeratorForm()" style="width:246px"/>
+ <input type="button" value="$i18n.getString( 'edit_numerator' )" onclick="indicatorNumeratorForm()" style="width:200px"/>
<input type="hidden" id="numerator" name="numerator"/>
</td>
</tr>
<tr>
- <td style="width:200px"></td>
+ <td style="width:120px"></td>
<td>
- <input type="button" id="denominatorButton" name="denominatorButton" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:246px"/>
+ <input type="button" id="denominatorButton" name="denominatorButton" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:200px"/>
<input type="hidden" id="denominator" name="denominator" class="{validate:{required:true}}"/>
</td>
</tr>
@@ -111,7 +111,7 @@
<tr>
<td>$encoder.htmlEncode( $groupSet.name )</td>
<td>
- <select id="selectedGroups" name="selectedGroups" style="min-width:246px; margin: 0;">
+ <select id="selectedGroups" name="selectedGroups">
<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/addIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm 2012-10-17 11:58:35 +0000
@@ -35,11 +35,10 @@
<h3>$i18n.getString( "create_new_indicator_group" )</h3>
-<form id="addIndicatorGroupForm" action="addIndicatorGroup.action" method="post" >
+<form id="addIndicatorGroupForm" action="addIndicatorGroup.action" method="post" class="inputForm">
<table>
- <col width="200px" />
- <col width="240px" />
+ <col width="120px" />
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
@@ -47,7 +46,7 @@
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:240px;"/></td>
+ <td><input type="text" id="name" name="name" /></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2012-10-17 11:58:35 +0000
@@ -21,26 +21,27 @@
<h3>$i18n.getString( "add_indicatorgroupset" )</h3>
-<form id="addIndicatorGroupSet" action="addIndicatorGroupSet.action" method="post">
+<form id="addIndicatorGroupSet" action="addIndicatorGroupSet.action" method="post" class="inputForm">
<table>
+ <col width="120px" />
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:250px"/></td>
+ <td><input type="text" id="name" name="name"></td>
</tr>
<tr>
<td><label for="description" style="width:100%">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" style="width:250px"></td>
+ <td><input type="text" id="description" name="description"></td>
</tr>
<tr>
<td><label for="compulsory" style="width:100%">$i18n.getString( "compulsory" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="compulsory" name="compulsory" style="width:254px" onchange="changeCompulsory(this.value)">
+ <select id="compulsory" name="compulsory" onchange="changeCompulsory(this.value)">
<option value="true" selected="selected">$i18n.getString( "yes" )</option>
<option value="false">$i18n.getString( "no" )</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm 2012-06-10 19:25:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm 2012-10-17 11:58:35 +0000
@@ -2,7 +2,7 @@
<h3>$i18n.getString( "create_new_indicator_type" )</h3>
-<form id="addIndicatorTypeForm" action="addIndicatorType.action" method="post" >
+<form id="addIndicatorTypeForm" action="addIndicatorType.action" method="post" class="inputForm">
<table>
<tr>
@@ -10,15 +10,15 @@
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:250px;"/></td>
+ <td><input type="text" id="name" name="name"></td>
</tr>
<tr>
<td><label for="factor">$i18n.getString( "factor" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="factor" name="factor" style="width:250px;"/></td>
+ <td><input type="text" id="factor" name="factor"></td>
</tr>
<tr>
<td><label for="number">$i18n.getString( "number" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><select id="number" name="number" style="width:256px;" maxlength="10">
+ <td><select id="number" name="number" maxlength="10">
<option value='true'>$i18n.getString('yes')</option>
<option value='false' selected>$i18n.getString('no')</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2012-10-17 11:58:35 +0000
@@ -49,7 +49,7 @@
<h3>$i18n.getString( "edit_data_dictionary" )</h3>
-<form id="updateDataDictionaryForm" action="updateDataDictionary.action" method="post" >
+<form id="updateDataDictionaryForm" action="updateDataDictionary.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$dataDictionary.id"/>
@@ -61,15 +61,15 @@
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataDictionary.name )" style="width:28em"/></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataDictionary.name )"></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description" style="width:28em; height:8em"/>$!encoder.htmlEncode( $dataDictionary.description )</textarea></td>
+ <td><textarea id="description" name="description">$!encoder.htmlEncode( $dataDictionary.description )</textarea></td>
</tr>
<tr>
<td><label for="region">$i18n.getString( "region" )</label></td>
- <td><input type="text" id="region" name="region" value="$!encoder.htmlEncode( $dataDictionary.region )" style="width:28em"/></td>
+ <td><input type="text" id="region" name="region" value="$!encoder.htmlEncode( $dataDictionary.region )"></td>
</tr>
<tr>
<td colspan="2" height="15px"></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2012-09-17 08:57:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2012-10-17 11:58:35 +0000
@@ -27,7 +27,7 @@
<h3>$i18n.getString( "edit_data_element" )</h3>
-<form id="updateDataElementForm" action="updateDataElement.action" method="POST" >
+<form id="updateDataElementForm" action="updateDataElement.action" method="post" class="inputForm">
<input type="hidden" id="id" name="id" value="$dataElement.id"/>
<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id"/>
<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
@@ -38,32 +38,32 @@
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElement.name )" onchange="nameChanged()" style="width:240px;"/></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElement.name )" onchange="nameChanged()"></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" )</label></td>
- <td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $dataElement.shortName )" style="width:240px;"/></td>
+ <td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $dataElement.shortName )"></td>
</tr>
<tr>
<td><label for="alternativeName">$i18n.getString( "alternative_name" )</label></td>
- <td><input type="text" id="alternativeName" name="alternativeName" value="$!encoder.htmlEncode( $dataElement.alternativeName )" style="width:240px;"/></td>
+ <td><input type="text" id="alternativeName" name="alternativeName" value="$!encoder.htmlEncode( $dataElement.alternativeName )"></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataElement.code )" style="width:240px;"/></td>
+ <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataElement.code )"></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description" style="width:240px; height:8em">$!encoder.htmlEncode( $dataElement.description )</textarea></td>
+ <td><textarea id="description" name="description">$!encoder.htmlEncode( $dataElement.description )</textarea></td>
</tr>
<tr>
<td><label for="formName">$i18n.getString( "form_name" )</label></td>
- <td><input type="text" id="formName" name="formName" value="$!encoder.htmlEncode( $dataElement.formName )" style="width:240px"/></td>
+ <td><input type="text" id="formName" name="formName" value="$!encoder.htmlEncode( $dataElement.formName )"></td>
</tr>
<tr>
<td><label for="active">$i18n.getString( "active" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="active" name="active" style="min-width:246px; margin: 0;">
+ <select id="active" name="active">
<option value="true" #if( $dataElement.active ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( !$dataElement.active ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
@@ -72,7 +72,7 @@
<tr>
<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="domainType" name="domainType" style="min-width:246px; margin: 0;">
+ <select id="domainType" name="domainType">
<option value="aggregate" #if( $dataElement.getDomainTypeNullSafe() == 'aggregate' ) selected="selected" #end>$i18n.getString( "aggregate" )</option>
<option value="patient" #if( $dataElement.getDomainTypeNullSafe() == 'patient' ) selected="selected" #end>$i18n.getString( "patient" )</option>
</select>
@@ -81,7 +81,7 @@
<tr #if( $calculatedDataElement ) style="display:none" #end>
<td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="valueType" name="valueType" style="min-width:246px; margin: 0;" onchange="changeValueType( this.value )">
+ <select id="valueType" name="valueType" onchange="changeValueType( this.value )">
<option value="int" #if( $dataElement.type == 'int' ) selected="selected" #end >$i18n.getString( "number" )</option>
<option value="string" #if( $dataElement.type == 'string' ) selected="selected" #end >$i18n.getString( "text" )</option>
<option value="trueOnly" #if( $dataElement.type == 'trueOnly' ) selected="selected" #end >$i18n.getString( "yes_only" )</option>
@@ -93,7 +93,7 @@
<tr id='numberTypeTR' #if( $dataElement.type != 'int' ) style="display:none" #end>
<td><label for="numberValueType">$i18n.getString( "number_value_type" )</label></td>
<td>
- <select id="numberType" name="numberType" style="min-width:246px; margin: 0;">
+ <select id="numberType" name="numberType">
<option value="number" #if( $dataElement.numberType == 'number' ) selected="selected" #end style="min-width:246px;">$i18n.getString( "number" )</option>
<option value="int" #if( $dataElement.numberType == 'int' ) selected="selected" #end>$i18n.getString( "int" )</option>
<option value="positiveNumber" #if( $dataElement.numberType == 'positiveNumber' ) selected="selected" #end>$i18n.getString( "positiveNumber" )</option>
@@ -106,7 +106,7 @@
<tr id='textTypeTR' #if( $dataElement.type != 'string' ) style='display:none;' #end>
<td><label for="textValueType">$i18n.getString( "text_type" )</label></td>
<td>
- <select id="textType" name="textType" style="min-width:246px;" >
+ <select id="textType" name="textType">
<option value="text" #if( $dataElement.textType == 'text' ) selected="selected" #end>$i18n.getString( "text" )</option>
<option value="longText" #if( $dataElement.textType == 'longText' ) selected="selected" #end >$i18n.getString( "long_text" )</option>
</select>
@@ -115,7 +115,7 @@
<tr>
<td><label for="aggregationOperatorSelect" id="lblOperator">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="aggregationOperatorSelect" name="aggregationOperator" style="min-width:246px; margin: 0;">
+ <select id="aggregationOperatorSelect" name="aggregationOperator">
<option value="sum" #if( $dataElement.aggregationOperator == 'sum' ) selected="selected" #end>$i18n.getString( "sum" )</option>
<option value="average" #if( $dataElement.aggregationOperator == 'average' ) selected="selected" #end>$i18n.getString( "average" )</option>
</select>
@@ -124,7 +124,7 @@
<tr>
<td><label for="zeroIsSignificant ">$i18n.getString( "store_zero_data_values" )</label></td>
<td>
- <select id="zeroIsSignificant" name="zeroIsSignificant" style="min-width:246px; margin: 0;">
+ <select id="zeroIsSignificant" name="zeroIsSignificant">
<option value="false"#if(!$dataElement.zeroIsSignificant) selected="selected" #end >$i18n.getString( "no" )</option>
<option value="true" #if($dataElement.zeroIsSignificant) selected="selected" #end >$i18n.getString( "yes" )</option>
</select>
@@ -139,12 +139,12 @@
</tr>
<tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
- <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $dataElement.url )" style="width:240px"/></td>
+ <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $dataElement.url )"></td>
</tr>
<tr #if( $calculatedDataElement ) style="display:none" #end >
<td><label for="selectedCategoryComboId">$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="selectedCategoryComboId" style="min-width:246px; margin: 0;">
+ <select id="selectedCategoryComboId">
#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
<option value="$dataElementCategoryCombo.id" #if( $dataElementCategoryCombo.id == $dataElement.categoryCombo.id ) selected="selected" #end>$encoder.htmlEncode( $dataElementCategoryCombo.name )</option>
#end
@@ -159,7 +159,7 @@
<tr>
<td>$i18n.getString( 'option_set' )</td>
<td>
- <select id="selectedOptionSetId" name="selectedOptionSetId" style="min-width:246px; margin: 0;;">
+ <select id="selectedOptionSetId" name="selectedOptionSetId">
<option value="0">[$i18n.getString('please_select')]</option>
#foreach ( $optionSet in $optionSets )
<option value="$optionSet.id" #if( $dataElement.optionSet.id == "$optionSet.id" ) selected #end >$optionSet.name</option>
@@ -222,7 +222,7 @@
<tr>
<td>$encoder.htmlEncode( $groupSet.name )</td>
<td>
- <select id="dataElementGroups" name="dataElementGroups" style="min-width:246px; margin: 0;">
+ <select id="dataElementGroups" name="dataElementGroups">
<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
#foreach ( $group in $groupSet.getSortedGroups() )
<option value="$group.id" #if( $group.members.contains( $dataElement ) ) selected="selected" #end>$group.name</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2012-10-17 11:58:35 +0000
@@ -32,7 +32,7 @@
<h3>$i18n.getString( "edit_data_element_group" )</h3>
-<form id="updateDataElementGroupForm" action="updateDataElementGroup.action" method="post" >
+<form id="updateDataElementGroupForm" action="updateDataElementGroup.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$dataElementGroup.id"/>
@@ -44,8 +44,8 @@
</tr>
<tr>
- <td style="width: 200px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td style="min-width: 240px;"><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElementGroup.name )" style="width:240px"/>
+ <td style="width: 120px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElementGroup.name )">
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2012-10-17 11:58:35 +0000
@@ -21,12 +21,12 @@
<h3>$i18n.getString( "update_dataelementgroupset" )</h3>
-<form id="updateDataElementGroupSet" action="updateDataElementGroupSet.action" method="post">
+<form id="updateDataElementGroupSet" action="updateDataElementGroupSet.action" method="post" class="inputForm">
<input type=hidden id="id" name="id" value="$dataElementGroupSet.id"/>
<table>
- <col style="width: 200px;" />
+ <col style="width: 120px;" />
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
@@ -34,18 +34,18 @@
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:250px" value="$encoder.htmlEncode( $dataElementGroupSet.name )"/></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElementGroupSet.name )"/></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" value="#if( $dataElementGroupSet.description)$encoder.htmlEncode( $dataElementGroupSet.description )#end" style="width:250px"></td>
+ <td><input type="text" id="description" name="description" value="#if( $dataElementGroupSet.description)$encoder.htmlEncode( $dataElementGroupSet.description )#end"></td>
</tr>
<tr>
<td><label for="compulsory">$i18n.getString( "compulsory" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select id="compulsory" name="compulsory" style="width:254px" onchange="changeCompulsory( this.value )">
+ <select id="compulsory" name="compulsory" onchange="changeCompulsory( this.value )">
<option value="true" #if( $dataElementGroupSet.compulsory ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( !$dataElementGroupSet.compulsory ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
=== 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-10 19:59:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2012-10-17 11:58:35 +0000
@@ -20,7 +20,7 @@
<h3>$i18n.getString( "edit_indicator" )</h3>
-<form id="updateIndicatorForm" action="updateIndicator.action" method="post" >
+<form id="updateIndicatorForm" action="updateIndicator.action" method="post" class="inputForm">
<input type="hidden" id="id" name="id" value="$indicator.id"/>
<input type="hidden" id="numeratorDescription" name="numeratorDescription" value="$!indicator.numeratorDescription"/>
@@ -31,29 +31,29 @@
<th colspan="2">$i18n.getString( "details" )</th>
</tr>
<tr>
- <td style="width:200px"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicator.name )" style="width:240px;"/></td>
+ <td style="width:120px"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicator.name )"></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $indicator.shortName )" style="width:240px;"/></td>
+ <td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $indicator.shortName )"></td>
</tr>
<tr>
<td><label for="alternativeName">$i18n.getString( "alternative_name" )</label></td>
- <td><input type="text" id="alternativeName" name="alternativeName" value="$!encoder.htmlEncode( $indicator.alternativeName )" style="width:240px;"/></td>
+ <td><input type="text" id="alternativeName" name="alternativeName" value="$!encoder.htmlEncode( $indicator.alternativeName )"></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $indicator.code )" style="width:240px;"/></td>
+ <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $indicator.code )"></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description" style="width:240px;; height:8em">$!encoder.htmlEncode( $indicator.description )</textarea></td>
+ <td><textarea id="description" name="description">$!encoder.htmlEncode( $indicator.description )</textarea></td>
</tr>
<tr>
<td><label for="annualized">$i18n.getString( "annualized" )</label></td>
<td>
- <select id="annualized" name="annualized" style="width:246px;">
+ <select id="annualized" name="annualized">
<option value="false">$i18n.getString( "no" )</option>
<option value="true"#if( $indicator.annualized ) selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
@@ -62,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; margin: 0;" onchange='indicatorTypeChanged();'>
+ <select id="indicatorTypeId" name="indicatorTypeId" 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
@@ -71,7 +71,7 @@
</tr>
<tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
- <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $indicator.url )" style="width:240px"/></td>
+ <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $indicator.url )"></td>
</tr>
</table>
@@ -79,16 +79,16 @@
<table>
<tr>
- <td style="width:200px"></td>
+ <td style="width:120px"></td>
<td>
- <input type="button" value="$i18n.getString( 'edit_numerator' )" onclick="indicatorNumeratorForm()" style="width:246px"/>
+ <input type="button" value="$i18n.getString( 'edit_numerator' )" onclick="indicatorNumeratorForm()" style="width:200px"/>
<input type="hidden" id="numerator" name="numerator" value="$!indicator.numerator"/>
</td>
</tr>
<tr>
- <td style="width:200px"></td>
+ <td></td>
<td>
- <input type="button" id="denominatorButton" name="denominatorButton" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:246px" #if($!indicator.indicatorType.number=='true') disabled #end/>
+ <input type="button" value="$i18n.getString( 'edit_denominator' )" onclick="indicatorDenominatorForm()" style="width:200px" #if($!indicator.indicatorType.number=='true') disabled #end/>
<input type="hidden" id="denominator" name="denominator" value="$!indicator.denominator"/>
<input type="hidden" id="denominatorFormula" name="denominatorFormula" value="$!indicator.denominator"/>
</td>
@@ -108,7 +108,7 @@
<tr>
<td>$encoder.htmlEncode( $groupSet.name )</td>
<td>
- <select id="indicatorGroups" name="indicatorGroups" style="min-width:246px; margin: 0;">
+ <select id="indicatorGroups" name="indicatorGroups">
<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>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm 2012-10-17 11:58:35 +0000
@@ -31,22 +31,21 @@
<h3>$i18n.getString( "edit_indicator_group" )</h3>
-<form id="updateIndicatorGroupForm" action="updateIndicatorGroup.action" method="post" >
+<form id="updateIndicatorGroupForm" action="updateIndicatorGroup.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$indicatorGroup.id"/>
</div>
<table>
- <col width="200px" />
- <col width="275px" />
+ <col width="120px" />
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicatorGroup.name )" style="width:240px;"/></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicatorGroup.name )"></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2012-10-17 11:58:35 +0000
@@ -23,7 +23,7 @@
<h3>$i18n.getString( "update_indicatorgroupset" )</h3>
-<form id="updateIndicatorGroupSet" action="updateIndicatorGroupSet.action" method="post">
+<form id="updateIndicatorGroupSet" action="updateIndicatorGroupSet.action" method="post" class="inputForm">
<input type=hidden id="id" name="id" value="$indicatorGroupSet.id"/>
<table>
<tr>
@@ -31,18 +31,18 @@
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:250px" value="$encoder.htmlEncode( $indicatorGroupSet.name )"/></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicatorGroupSet.name )"/></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" value="#if( $indicatorGroupSet.description)$encoder.htmlEncode( $indicatorGroupSet.description )#end" style="width:250px"></td>
+ <td><input type="text" id="description" name="description" value="#if( $indicatorGroupSet.description)$encoder.htmlEncode( $indicatorGroupSet.description )#end"></td>
</tr>
<tr>
<td><label for="compulsory">$i18n.getString( "compulsory" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select id="compulsory" name="compulsory" style="width:254px" onchange="changeCompulsory( this.value )">
+ <select id="compulsory" name="compulsory" onchange="changeCompulsory( this.value )">
<option value="true" #if( $indicatorGroupSet.compulsory ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( !$indicatorGroupSet.compulsory ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm 2012-06-10 19:25:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm 2012-10-17 11:58:35 +0000
@@ -7,7 +7,7 @@
<h3>$i18n.getString( "edit_indicator_type" )</h3>
-<form id="updateIndicatorTypeForm" action="updateIndicatorType.action" method="post" >
+<form id="updateIndicatorTypeForm" action="updateIndicatorType.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$indicatorType.id">
@@ -19,15 +19,15 @@
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicatorType.name )" style="width:250px"/> </td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $indicatorType.name )"> </td>
</tr>
<tr>
<td><label for="factor">$i18n.getString( "factor" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="factor" name="factor" value="$indicatorType.factor" style="width:250px"/></td>
+ <td><input type="text" id="factor" name="factor" value="$indicatorType.factor"></td>
</tr>
<tr>
<td><label for="number">$i18n.getString( "number" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><select id="number" name="number" style="width:256px" maxlength="10">
+ <td><select id="number" name="number" maxlength="10">
<option value='true' #if($indicatorType.number=='true') selected #end>$i18n.getString('yes')</option>
<option value='false' #if($indicatorType.number=='false') selected #end>$i18n.getString('no')</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2012-09-27 03:57:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2012-10-17 11:58:35 +0000
@@ -49,7 +49,7 @@
<h3>$i18n.getString( "add_dataset" )</h3>
-<form id="addDataSetForm" name="addDataSetForm" action="addDataSet.action" method="post" >
+<form id="addDataSetForm" name="addDataSetForm" action="addDataSet.action" method="post" class="inputForm">
<table id="detailsList" style="width: 540px;">
<col/> ## Labels
<col/> ## Input
@@ -61,28 +61,28 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:20em"/></td>
+ <td><input type="text" id="name" name="name" onchange="nameChanged()"></td>
</tr>
<tr>
<td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="shortName" name="shortName" style="width:20em"/></td>
+ <td><input type="text" id="shortName" name="shortName"></td>
</tr>
<tr>
<td><label>$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" style="width:20em"/></td>
+ <td><input type="text" id="code" name="code"></td>
</tr>
<tr>
<td><label>$i18n.getString( "description" )</label></td>
- <td><input type="text" id="description" name="description" style="width:20em"/></td>
+ <td><input type="text" id="description" name="description"></td>
</tr>
<tr>
<td><label>$i18n.getString( "expiry_days" )</label></td>
- <td><input type="text" id="expiryDays" name="expiryDays" value="0" style="width:20em"/></td>
+ <td><input type="text" id="expiryDays" name="expiryDays" value="0"></td>
</tr>
<tr>
<td><label>$i18n.getString( "frequency" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="frequencySelect" name="frequencySelect" style="min-width:20em; margin:0;">
+ <select id="frequencySelect" name="frequencySelect">
#foreach ( $periodType in $periodTypes )
<option value="$periodType.name">$i18n.getString( $periodType.name )</option>
#end
@@ -92,7 +92,7 @@
<tr>
<td><label>$i18n.getString( "notification_recipients" )</label></td>
<td>
- <select id="notificationRecipients" name="notificationRecipients" style="min-width:20em; margin:0;">
+ <select id="notificationRecipients" name="notificationRecipients">
<option value="-1">[ $i18n.getString( "none" ) ]</option>
#foreach( $group in $userGroups )
<option value="$group.id">$encoder.htmlEncode( $group.name )</option>
@@ -103,7 +103,7 @@
<tr>
<td><label>$i18n.getString( "skip_aggregation" )</label></td>
<td>
- <select id="skipAggregation" name="skipAggregation" style="min-width:20em; margin:0;">
+ <select id="skipAggregation" name="skipAggregation">
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</select>
@@ -119,7 +119,7 @@
<tr>
<td><label>$i18n.getString( "allow_future_periods" )</label></td>
<td>
- <select id="allowFuturePeriods" name="allowFuturePeriods" style="min-width:20em; margin:0;">
+ <select id="allowFuturePeriods" name="allowFuturePeriods">
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</select>
@@ -128,7 +128,7 @@
<tr>
<td><label>$i18n.getString( "all_fields_for_data_element_required" )</label></td>
<td>
- <select id="fieldCombinationRequired" name="fieldCombinationRequired" style="min-width:20em; margin:0;">
+ <select id="fieldCombinationRequired" name="fieldCombinationRequired">
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</select>
@@ -137,7 +137,7 @@
<tr>
<td><label>$i18n.getString( "complete_allowed_only_if_validation_passes" )</label></td>
<td>
- <select id="validCompleteOnly" name="validCompleteOnly" style="min-width:20em; margin:0;">
+ <select id="validCompleteOnly" name="validCompleteOnly">
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</select>
@@ -146,7 +146,7 @@
<tr>
<td><label>$i18n.getString( "skip_offline" )</label></td>
<td>
- <select id="skipOffline" name="skipOffline" style="min-width:20em; margin:0;">
+ <select id="skipOffline" name="skipOffline">
<option value="false">$i18n.getString( "no" )</option>
<option value="true">$i18n.getString( "yes" )</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2012-10-17 11:58:35 +0000
@@ -23,7 +23,7 @@
<h3>$i18n.getString( "add_section" ) #openHelp( "dataset_sections_edit" )</h3>
-<form id="addSectionForm" name="addSectionForm" action="addSection.action" method="post" >
+<form id="addSectionForm" name="addSectionForm" action="addSection.action" method="post" class="inputForm">
<table id="detailsList">
<col/>
<col/>
@@ -35,15 +35,15 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="sectionName" name="sectionName" style="width:20em"></td>
+ <td><input type="text" id="sectionName" name="sectionName"></td>
</tr>
<tr>
<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" style="width:20em" value="$dataSet.name" disabled="disabled"/><input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/></td>
+ <td><input type="text" value="$dataSet.name" disabled="disabled"/><input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" style="width:20em" value="$!categoryCombo.name" disabled="disabled"/><input type="hidden" id="categoryComboId" name="categoryComboId" value="$!categoryCombo.id"/></td>
+ <td><input type="text" value="$!categoryCombo.name" disabled="disabled"/><input type="hidden" id="categoryComboId" name="categoryComboId" value="$!categoryCombo.id"/></td>
</tr>
<tr><td> </td><td> </td></tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2012-09-27 03:57:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2012-10-17 11:58:35 +0000
@@ -49,7 +49,7 @@
<h3>$i18n.getString( "edit_dataset" )</h3>
-<form id="editDataSetForm" name="editDataSetForm" action="updateDataSet.action" method="post" >
+<form id="editDataSetForm" name="editDataSetForm" action="updateDataSet.action" method="post" class="inputForm">
<input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/>
<table id="detailsList" style="width: 540px;">
@@ -61,28 +61,28 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:20em" value="$!encoder.htmlEncode( $dataSet.name )"/></td>
+ <td><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $dataSet.name )"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="shortName" name="shortName" style="width:20em" value="$!encoder.htmlEncode( $dataSet.shortName )"/></td>
+ <td><input type="text" id="shortName" name="shortName" value="$!encoder.htmlEncode( $dataSet.shortName )"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" style="width:20em" value="$!encoder.htmlEncode( $dataSet.code )"/></td>
+ <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataSet.code )"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "description" )</label></td>
- <td><input type="text" id="description" name="description" style="width:20em" value="$!encoder.htmlEncode( $dataSet.description )"/></td>
+ <td><input type="text" id="description" name="description" value="$!encoder.htmlEncode( $dataSet.description )"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "expiry_days" )</label></td>
- <td><input type="text" id="expiryDays" name="expiryDays" style="width:20em" value="$!encoder.htmlEncode( $dataSet.expiryDays )"/></td>
+ <td><input type="text" id="expiryDays" name="expiryDays" value="$!encoder.htmlEncode( $dataSet.expiryDays )"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "frequency" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="frequencySelect" name="frequencySelect" style="min-width:20em; margin:0;">
+ <select id="frequencySelect" name="frequencySelect">
#foreach ( $periodType in $periodTypes )
<option value="$periodType.name" #if( $dataSet.periodType.name.equals( $periodType.name ) ) selected="selected" #end>$i18n.getString( $periodType.name )</option>
#end
@@ -92,7 +92,7 @@
<tr>
<td><label>$i18n.getString( "skip_aggregation" )</label></td>
<td>
- <select id="skipAggregation" name="skipAggregation" style="min-width:20em; margin:0;">
+ <select id="skipAggregation" name="skipAggregation">
<option value="false">$i18n.getString( "no" )</option>
<option value="true"#if( $dataSet.skipAggregation == true ) selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
@@ -101,7 +101,7 @@
<tr>
<td><label>$i18n.getString( "notification_recipients" )</label></td>
<td>
- <select id="notificationRecipients" name="notificationRecipients" style="min-width:20em; margin:0;">
+ <select id="notificationRecipients" name="notificationRecipients">
<option value="-1">[ $i18n.getString( "none" ) ]</option>
#foreach( $group in $userGroups )
<option value="$group.id"#if( $dataSet.notificationRecipients && $dataSet.notificationRecipients.equals( $group ) ) selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
@@ -119,7 +119,7 @@
<tr>
<td><label for="allowFuturePeriods">$i18n.getString( "allow_future_periods" )</label></td>
<td>
- <select id="allowFuturePeriods" name="allowFuturePeriods" style="min-width:20em; margin:0;">
+ <select id="allowFuturePeriods" name="allowFuturePeriods">
<option value="false">$i18n.getString( "no" )</option>
<option value="true"#if( $dataSet.allowFuturePeriods == true ) selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
@@ -128,7 +128,7 @@
<tr>
<td><label for="fieldCombinationRequired">$i18n.getString( "all_fields_for_data_element_required" )</label></td>
<td>
- <select id="fieldCombinationRequired" name="fieldCombinationRequired" style="min-width:20em; margin:0;">
+ <select id="fieldCombinationRequired" name="fieldCombinationRequired">
<option value="false">$i18n.getString( "no" )</option>
<option value="true"#if( $dataSet.fieldCombinationRequired == true ) selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
@@ -137,7 +137,7 @@
<tr>
<td><label for="validCompleteOnly">$i18n.getString( "complete_allowed_only_if_validation_passes" )</label></td>
<td>
- <select id="validCompleteOnly" name="validCompleteOnly" style="min-width:20em; margin:0;">
+ <select id="validCompleteOnly" name="validCompleteOnly">
<option value="false">$i18n.getString( "no" )</option>
<option value="true"#if( $dataSet.validCompleteOnly == true ) selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
@@ -146,7 +146,7 @@
<tr>
<td><label for="skipOffline">$i18n.getString( "skip_offline" )</label></td>
<td>
- <select id="skipOffline" name="skipOffline" style="min-width:20em; margin:0;">
+ <select id="skipOffline" name="skipOffline">
<option value="false">$i18n.getString( "no" )</option>
<option value="true"#if( $dataSet.skipOffline == true ) selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2012-10-17 11:58:35 +0000
@@ -23,7 +23,7 @@
<h3>$i18n.getString( "edit_section" )</h3>
-<form id="editDataSetForm" name="editDataSetForm" action="updateSection.action" method="post" >
+<form id="editDataSetForm" name="editDataSetForm" action="updateSection.action" method="post" class="inputForm">
<input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/>
<input type="hidden" id="sectionId" name="sectionId" value="$section.id"/>
<input type="hidden" id="categoryComboId" name="categoryComboId" value="$!categoryCombo.id"/>
@@ -39,15 +39,15 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="sectionName" name="sectionName" style="width:20em" value= "$section.name"></td>
+ <td><input type="text" id="sectionName" name="sectionName" value= "$section.name"></td>
</tr>
<tr>
<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" style="width:20em" value="$dataSet.name" disabled="disabled"/></td>
+ <td><input type="text" value="$dataSet.name" disabled="disabled"/></td>
</tr>
<tr>
<td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" style="width:20em" value="$!categoryCombo.name" disabled="disabled"/></td>
+ <td><input type="text" value="$!categoryCombo.name" disabled="disabled"/></td>
</tr>
</tbody>
</table>
