dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19539
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8560: Consistent forms using css
------------------------------------------------------------
revno: 8560
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-17 20:53:29 +0200
message:
Consistent forms using css
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.ajax.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.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/javascripts/commons.ajax.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.ajax.js 2012-09-19 16:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.ajax.js 2012-10-17 18:53:29 +0000
@@ -224,7 +224,7 @@
if ( numberOfPages > 1 )
{
- html += 'Page: <select onchange="dataDictionary.reloadOperands( this.value )">';
+ html += 'Page: <select onchange="dataDictionary.reloadOperands( this.value )" style="width:60px">';
for ( var i = 1; i <= numberOfPages; i++ )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2011-12-01 04:07:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2012-10-17 18:53:29 +0000
@@ -10,15 +10,18 @@
{
var type = byId( 'indicatorTypeId' ).options[byId( 'indicatorTypeId' ).selectedIndex].getAttribute( 'number' );
byId( 'denominatorButton' ).disabled = eval( type );
+
if ( eval( type ) )
{
setFieldValue( 'denominator', '1' );
- } else
+ }
+ else
{
if ( getFieldValue( 'denominatorFormula' ) == undefined )
{
setFieldValue( 'denominator', '' );
- } else
+ }
+ else
{
setFieldValue( 'denominator', getFieldValue( 'denominatorFormula' ) );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2012-02-23 11:12:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2012-10-17 18:53:29 +0000
@@ -96,3 +96,4 @@
data_sets=Data sets
organisation_unit_groups=Organisation unit groups
select_group=Select group
+phone_number=Phone number
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2012-03-07 10:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2012-10-17 18:53:29 +0000
@@ -23,37 +23,37 @@
<h3>$i18n.getString( "create_new_org_unit" ) #openHelp( "ou_edit" )</h3>
-<form id="addOrganisationUnitForm" name="addOrganisationUnitForm" action="addOrganisationUnit.action" method="post">
+<form id="addOrganisationUnitForm" name="addOrganisationUnitForm" action="addOrganisationUnit.action" method="post" class="inputForm">
<table>
<tr>
<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:20em"/></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:20em"/></td>
+ <td><input type="text" id="shortName" name="shortName"></td>
</tr>
<tr>
<td><label for="description">$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 for="code">$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 for="openingDate">$i18n.getString( "opening_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="openingDate" name="openingDate" value="$format.formatDate( $defaultDate )" style="width:20em"/></td>
+ <td><input type="text" id="openingDate" name="openingDate" value="$format.formatDate( $defaultDate )"></td>
<td></td>
</tr>
<tr>
<td><label for="active">$i18n.getString( "registers_data" )</label></td>
<td>
- <select id="active" name="active" style="min-width:20em">
+ <select id="active" name="active">
<option value="true" selected="selected">$i18n.getString( "yes" )</option>
<option value="false">$i18n.getString( "no" )</option>
</select>
@@ -61,19 +61,19 @@
</tr>
<tr>
<td><label for="comment">$i18n.getString( "comment" )</label></td>
- <td><textarea id="comment" name="comment" style="width:20em; height:5em"></textarea></td>
+ <td><textarea id="comment" name="comment"></textarea></td>
</tr>
<tr>
<td><label for="longitude">$i18n.getString( "longitude_optional" )</label></td>
- <td><input type="text" id="longitude" name="longitude" style="width:20em"/></td>
+ <td><input type="text" id="longitude" name="longitude"></td>
</tr>
<tr>
<td><label for="latitude">$i18n.getString( "latitude_optional" )</label></td>
- <td><input type="text" id="latitude" name="latitude" style="width:20em"/></td>
+ <td><input type="text" id="latitude" name="latitude"></td>
</tr>
<tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
- <td><input type="text" id="url" name="url" style="width:20em"/></td>
+ <td><input type="text" id="url" name="url"></td>
</tr>
</table>
@@ -88,20 +88,20 @@
<th colspan="2">$i18n.getString( "contact_details" )</th>
</tr>
<tr>
- <td style="width:200px"><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
- <td><input type="text" id="contactPerson" name="contactPerson" style="width:20em"/></td>
+ <td style="width:120px"><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
+ <td><input type="text" id="contactPerson" name="contactPerson"></td>
</tr>
<tr>
<td><label for="address">$i18n.getString( "address" ) </label></td>
- <td><input type="text" id="address" name="address" style="width:20em"/></td>
+ <td><input type="text" id="address" name="address"></td>
</tr>
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
- <td><input type="text" id="email" name="email" style="width:20em"/></td>
+ <td><input type="text" id="email" name="email"></td>
</tr>
<tr>
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
- <td><input type="text" id="phoneNumber" name="phoneNumber" style="width:20em"/></td>
+ <td><input type="text" id="phoneNumber" name="phoneNumber"></td>
</tr>
<tr>
@@ -114,8 +114,8 @@
<th colspan="2">$i18n.getString( "data_sets" )</th>
</tr>
<tr>
- <td style="width:200px"><label for="availableDataSets">$i18n.getString( "available_data_sets" )</label></td>
- <td><select multiple id="availableDataSets" size="5" style="width:20em" ondblclick="moveSelectedById( 'availableDataSets', 'dataSets' )">
+ <td style="width:120px"><label for="availableDataSets">$i18n.getString( "available_data_sets" )</label></td>
+ <td><select multiple id="availableDataSets" size="5" ondblclick="moveSelectedById( 'availableDataSets', 'dataSets' )">
#foreach( $dataSet in $dataSets )
<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.name )</option>
#end
@@ -131,7 +131,7 @@
<tr>
<td><label for="dataSets">$i18n.getString( "selected_data_sets" )</label></td>
- <td><select multiple id="dataSets" name="dataSets" size="5" style="width:20em" ondblclick="moveSelectedById( 'dataSets', 'availableDataSets' )"></select></td>
+ <td><select multiple id="dataSets" name="dataSets" size="5" ondblclick="moveSelectedById( 'dataSets', 'availableDataSets' )"></select></td>
</tr>
<tr>
@@ -145,7 +145,7 @@
<tr>
<td>$encoder.htmlEncode( $groupSet.name )</td>
<td>
- <select id="selectedGroups" name="selectedGroups" style="min-width: 244px;">
+ <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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm 2012-06-01 13:05:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm 2012-10-17 18:53:29 +0000
@@ -18,15 +18,15 @@
<h3>$i18n.getString( "crease_new_org_unit_group" ) #openHelp( "ou_groups_edit" )</h3>
-<form name="addOrganisationUnitGroupForm" id="addOrganisationUnitGroupForm" action="addOrganisationUnitGroup.action" method="POST">
+<form name="addOrganisationUnitGroupForm" id="addOrganisationUnitGroupForm" action="addOrganisationUnitGroup.action" method="post" class="inputForm">
<table>
<tr>
<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" 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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm 2012-10-17 18:53:29 +0000
@@ -21,7 +21,7 @@
<h3>$i18n.getString( "create_new_org_unit_group_set" ) #openHelp( "ou_groupsets_edit" )</h3>
-<form id="addOrganisationUnitGroupSetForm" action="addOrganisationUnitGroupSet.action" method="post" >
+<form id="addOrganisationUnitGroupSetForm" action="addOrganisationUnitGroupSet.action" method="post" class="inputForm">
<table>
<tr>
@@ -29,19 +29,19 @@
</tr>
<tr>
- <td><label for="name" style="width:100%">$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><label for="name" style="width:12px">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm 2011-03-18 14:24:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm 2012-10-17 18:53:29 +0000
@@ -6,7 +6,7 @@
<h3>$i18n.getString( "organisation_unit_level_management" ) #openHelp( "ou_level" )</h3>
-<form method="post" id="saveOrganisationUnitLevelsForm" action="saveOrganisationUnitLevels.action">
+<form method="post" id="saveOrganisationUnitLevelsForm" action="saveOrganisationUnitLevels.action" class="inputForm">
<table>
<tr>
@@ -16,7 +16,7 @@
#foreach ( $level in $levels )
<tr>
<td style="text-align: center">$level.level</td>
- <td><input type="text" id="level${level.level}" name="level${level.level}" style="width:20em" value="$!level.name" class="uniqueFields {validate:{required:true,alphanumeric:false,unique:'uniqueFields'}}"/></td>
+ <td><input type="text" id="level${level.level}" name="level${level.level}" value="$!level.name" class="uniqueFields {validate:{required:true,alphanumeric:false,unique:'uniqueFields'}}"/></td>
</tr>
#end
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm 2012-03-07 14:05:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm 2012-10-17 18:53:29 +0000
@@ -29,7 +29,7 @@
<h3>$i18n.getString( "edit_org_unit" ) #openHelp( "ou_edit" )</h3>
-<form id="updateOrganisationUnitForm" name="updateOrganisationUnitForm" action="updateOrganisationUnit.action" method="post">
+<form id="updateOrganisationUnitForm" name="updateOrganisationUnitForm" action="updateOrganisationUnit.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$organisationUnit.id"/>
@@ -40,36 +40,36 @@
<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( $organisationUnit.name )" onchange="nameChanged()" style="width:20em"/></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( $organisationUnit.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" value="$encoder.htmlEncode( $organisationUnit.shortName )" style="width:20em"/></td>
+ <td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $organisationUnit.shortName )"></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" )</label></td>
- <td><input type="text" id="description" name="description" value="$!encoder.htmlEncode( $organisationUnit.description )" style="width:20em"/></td>
+ <td><input type="text" id="description" name="description" value="$!encoder.htmlEncode( $organisationUnit.description )"></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $organisationUnit.code )" style="width:20em"/></td>
+ <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $organisationUnit.code )"></td>
</tr>
<tr>
<td><label for="openingDate">$i18n.getString( "opening_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="openingDate" name="openingDate" value="$!format.formatDate( $organisationUnit.openingDate )" style="width:20em"/></td>
+ <td><input type="text" id="openingDate" name="openingDate" value="$!format.formatDate( $organisationUnit.openingDate )"></td>
<td></td>
</tr>
#if( $numberOfChildren == 0 )
<tr>
<td><label for="closedDate">$i18n.getString( "closed_date" )</label></td>
- <td><input type="text" id="closedDate" name="closedDate" value="$!format.formatDate( $organisationUnit.closedDate )" style="width:20em"/></td>
+ <td><input type="text" id="closedDate" name="closedDate" value="$!format.formatDate( $organisationUnit.closedDate )"></td>
</tr>
#end
<tr>
<td><label for="active">$i18n.getString( "registers_data" )</label></td>
<td>
- <select id="active" name="active" style="min-width:20em">
+ <select id="active" name="active">
<option value="true" #if( $organisationUnit.active ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( !$organisationUnit.active ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
@@ -77,21 +77,21 @@
</tr>
<tr>
<td><label for="comment">$i18n.getString( "comment" )</label></td>
- <td><textarea id="comment" name="comment" style="width:20em; height:5em">$!encoder.htmlEncode( $organisationUnit.comment )</textarea></td>
+ <td><textarea id="comment" name="comment">$!encoder.htmlEncode( $organisationUnit.comment )</textarea></td>
</tr>
#if( $point )
<tr>
<td><label for="longitude">$i18n.getString( "longitude_optional" )</label></td>
- <td><input type="text" id="longitude" name="longitude" value="$!{longitude}" style="width:20em"/></td>
+ <td><input type="text" id="longitude" name="longitude" value="$!{longitude}"></td>
</tr>
<tr>
<td><label for="latitude">$i18n.getString( "latitude_optional" )</label></td>
- <td><input type="text" id="latitude" name="latitude" value="$!{latitude}" style="width:20em"/></td>
+ <td><input type="text" id="latitude" name="latitude" value="$!{latitude}"></td>
</tr>
#end
<tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
- <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $organisationUnit.url )" style="width:20em"/></td>
+ <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $organisationUnit.url )"></td>
</tr>
</table>
@@ -106,20 +106,20 @@
<th colspan="2">$i18n.getString( "contact_details" )</th>
</tr>
<tr>
- <td style="width:200px"><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
- <td><input type="text" id="contactPerson" name="contactPerson" value="$!encoder.htmlEncode( $organisationUnit.contactPerson )" style="width:20em"/></td>
+ <td style="width:120px"><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
+ <td><input type="text" id="contactPerson" name="contactPerson" value="$!encoder.htmlEncode( $organisationUnit.contactPerson )"></td>
</tr>
<tr>
<td><label for="address">$i18n.getString( "address" ) </label></td>
- <td><input type="text" id="address" name="address" value="$!encoder.htmlEncode( $organisationUnit.address )" style="width:20em"/></td>
+ <td><input type="text" id="address" name="address" value="$!encoder.htmlEncode( $organisationUnit.address )"></td>
</tr>
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
- <td><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $organisationUnit.email )" style="width:20em"/></td>
+ <td><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $organisationUnit.email )"></td>
</tr>
<tr>
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
- <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $organisationUnit.phoneNumber )" style="width:20em"/></td>
+ <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $organisationUnit.phoneNumber )"></td>
</tr>
<tr>
@@ -132,9 +132,9 @@
<th colspan="2">$i18n.getString( "data_sets" )</th>
</tr>
<tr>
- <td style="width:200px"><label for="availableDataSets">$i18n.getString( "available_data_sets" )</label></td>
+ <td style="width:120px"><label for="availableDataSets">$i18n.getString( "available_data_sets" )</label></td>
<td>
- <select multiple id="availableDataSets" size="5" style="width:20em" ondblclick="moveSelectedById( 'availableDataSets', 'dataSets' )">
+ <select multiple id="availableDataSets" size="5" ondblclick="moveSelectedById( 'availableDataSets', 'dataSets' )">
#foreach( $dataSet in $availableDataSets )
<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.name )</option>
#end
@@ -151,7 +151,7 @@
<tr>
<td><label for="dataSets">$i18n.getString( "data_sets" )</label></td>
<td>
- <select multiple id="dataSets" name="dataSets" size="5" style="width:20em" ondblclick="moveSelectedById( 'dataSets', 'availableDataSets' )">
+ <select multiple id="dataSets" name="dataSets" size="5" ondblclick="moveSelectedById( 'dataSets', 'availableDataSets' )">
#foreach( $dataSet in $dataSets )
<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.name )</option>
#end
@@ -168,7 +168,7 @@
<tr>
<td>$encoder.htmlEncode( $groupSet.name )</td>
<td>
- <select id="orgUnitGroups" name="orgUnitGroups" style="min-width: 244px;">
+ <select id="orgUnitGroups" name="orgUnitGroups">
<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
#foreach ( $group in $groupSet.getSortedGroups() )
<option value="$group.id" #if( $group.members.contains( $organisationUnit ) ) selected="selected" #end>$group.name</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm 2012-06-01 13:05:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm 2012-10-17 18:53:29 +0000
@@ -17,7 +17,7 @@
<h3>$i18n.getString( "edit_org_unit_group" ) #openHelp( "ou_groups_edit" )</h3>
-<form id="updateOrganisationUnitGroupForm" action="updateOrganisationUnitGroup.action" method="post">
+<form id="updateOrganisationUnitGroupForm" action="updateOrganisationUnitGroup.action" method="post" class="inputForm">
<input type="hidden" name="id" id="id" style="width:300px" value="$!organisationUnitGroup.id"/>
<table>
@@ -25,8 +25,8 @@
<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" style="width:240px;" value="$!organisationUnitGroup.name"/></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="$!organisationUnitGroup.name"/></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2012-10-17 18:53:29 +0000
@@ -27,7 +27,7 @@
<h3>$i18n.getString( "edit_org_unit_group_set" ) #openHelp( "ou_groupsets_edit" )</h3>
-<form id="updateOrganisationUnitGroupSetForm" action="updateOrganisationUnitGroupSet.action" method="post" >
+<form id="updateOrganisationUnitGroupSetForm" action="updateOrganisationUnitGroupSet.action" method="post" class="inputForm">
<input type="hidden" id="id" name="id" value="$organisationUnitGroupSet.id"/>
@@ -38,18 +38,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" value="$encoder.htmlEncode( $organisationUnitGroupSet.name )" style="width:250px"></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $organisationUnitGroupSet.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="$encoder.htmlEncode( $organisationUnitGroupSet.description )" style="width:250px"></td>
+ <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $organisationUnitGroupSet.description )"></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( $organisationUnitGroupSet.compulsory ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( !$organisationUnitGroupSet.compulsory ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2012-10-17 18:53:29 +0000
@@ -33,25 +33,26 @@
<h3>$i18n.getString( "create_new_user_role" )</h3>
-<form id="addRoleForm" name="addRoleForm" action="addRole.action" method="post" >
+<form id="addRoleForm" name="addRoleForm" action="addRole.action" method="post" class="inputForm">
<table>
<col style="width: 120px"/>
- <col style="width: 500px;"/>
+ <col style="width: 500px;"/>
<col/>
<col style="width: 500px;"/>
<tr>
- <th colspan="4">$i18n.getString( "details" )</th>
+ <th colspan="2">$i18n.getString( "details" )</th>
+ <td colspan="2"></td>
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="name" name="name" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="name" name="name"></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="description" name="description" style="width:20em""></td>
+ <td colspan="3"><input type="text" id="description" name="description"></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2012-10-17 18:53:29 +0000
@@ -36,13 +36,10 @@
</script>
<h3>$i18n.getString( "create_new_user" )</h3>
-<form id="addUserForm" action="addUser.action" method="post" >
+<form id="addUserForm" action="addUser.action" method="post" class="inputForm">
<table>
- <col style="width: 200px"/>
- <col style="width: 350px"/>
- <col/>
- <col style="width: 350px"/>
+ <col style="width: 120px"/>
<tr>
<th colspan="4">$i18n.getString( "details" )</th>
@@ -50,32 +47,32 @@
<tr>
<td><label for="username">$i18n.getString( "username" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="username" name="username" style="width:20em" autocomplete="off"></td>
+ <td colspan="3"><input type="text" id="username" name="username" autocomplete="off"></td>
</tr>
<tr>
<td><label for="rawPassword">$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="password" id="rawPassword" name="rawPassword" style="width:20em" autocomplete="off"></td>
+ <td colspan="3"><input type="password" id="rawPassword" name="rawPassword" autocomplete="off"></td>
</tr>
<tr>
<td><label for="retypePassword">$i18n.getString( "retype_password" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="password" id="retypePassword" name="retypePassword" style="width:20em" autocomplete="off"></td>
+ <td colspan="3"><input type="password" id="retypePassword" name="retypePassword" autocomplete="off"></td>
</tr>
<tr>
<td><label for="surname">$i18n.getString( "surname" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="surname" name="surname" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="surname" name="surname"></td>
</tr>
<tr>
<td><label for="firstName">$i18n.getString( "firstName" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="firstName" name="firstName" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="firstName" name="firstName"></td>
</tr>
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
- <td colspan="3"><input type="text" id="email" name="email" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="email" name="email" ></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm 2012-10-17 18:53:29 +0000
@@ -32,11 +32,10 @@
<h3>$i18n.getString( "add_user_group" )</h3>
-<form id="addUserGroupForm" name="addUserGroupForm" action="addUserGroup.action" method="post" >
+<form id="addUserGroupForm" name="addUserGroupForm" action="addUserGroup.action" method="post" class="inputForm">
<table id="detailsList">
- <col style="width: 200px"/>
- <col style="width: 270px"/>
+ <col style="width: 120px"/>
<tr>
<th colspan="2">$i18n.getString( "user_group_details" )</th>
@@ -44,7 +43,7 @@
<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: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-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2012-10-17 18:53:29 +0000
@@ -31,7 +31,7 @@
<h3>$i18n.getString( "edit_user_role" )</h3>
-<form id="updateRoleForm" name="updateRoleForm" action="updateRole.action" method="post">
+<form id="updateRoleForm" name="updateRoleForm" action="updateRole.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$userAuthorityGroup.id"/>
</div>
@@ -43,17 +43,18 @@
<col style="width: 500px;"/>
<tr>
- <th colspan="4">$i18n.getString( "details" )</th>
+ <th colspan="2">$i18n.getString( "details" )</th>
+ <td colspan="2"></td>
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $userAuthorityGroup.name )" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $userAuthorityGroup.name )"></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="description" name="description" value="$!encoder.htmlEncode( $userAuthorityGroup.description )" style="width:20em"/></td>
+ <td colspan="3"><input type="text" id="description" name="description" value="$!encoder.htmlEncode( $userAuthorityGroup.description )"></td>
</tr>
<tr>
@@ -107,7 +108,6 @@
#end
</select>
</td>
-
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2012-10-17 18:53:29 +0000
@@ -39,14 +39,14 @@
<h3>$i18n.getString( "edit_user" )</h3>
-<form id="updateUserForm" action="updateUser.action" method="post" >
+<form id="updateUserForm" action="updateUser.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$userCredentials.id"/>
</div>
<table>
- <col style="width: 200px"/>
+ <col style="width: 120px"/>
<col style="width: 350px"/>
<col/>
<col style="width: 350px"/>
@@ -57,41 +57,41 @@
<tr>
<td><label for="username">$i18n.getString( "username" )</label></td>
- <td colspan="3"><input type="text" id="username" name="username" value="$encoder.htmlEncode( $userCredentials.username )" style="width:20em" disabled="disabled" autocomplete="off"/></td>
+ <td colspan="3"><input type="text" id="username" name="username" value="$encoder.htmlEncode( $userCredentials.username )" disabled="disabled" autocomplete="off"/></td>
</tr>
<tr>
<td><label for="rawPassword">$i18n.getString( "password" )</label></td>
- <td colspan="3"><input type="password" id="rawPassword" name="rawPassword" style="width:20em" autocomplete="off"></td>
+ <td colspan="3"><input type="password" id="rawPassword" name="rawPassword" autocomplete="off"></td>
</tr>
<tr>
<td><label for="retypePassword">$i18n.getString( "retype_password" ) </label></td>
- <td colspan="3"><input type="password" id="retypePassword" name="retypePassword" style="width:20em" autocomplete="off"></td>
+ <td colspan="3"><input type="password" id="retypePassword" name="retypePassword" autocomplete="off"></td>
</tr>
<tr>
<td><label for="surname">$i18n.getString( "surname" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="surname" name="surname" value="$encoder.htmlEncode( $userCredentials.user.surname )" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="surname" name="surname" value="$encoder.htmlEncode( $userCredentials.user.surname )"></td>
</tr>
<tr>
<td><label for="firstName">$i18n.getString( "firstName" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3"><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $userCredentials.user.firstName )" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $userCredentials.user.firstName )"></td>
</tr>
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
- <td colspan="3"><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $userCredentials.user.email )" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $userCredentials.user.email )"></td>
</tr>
<tr>
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
- <td colspan="3"><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )" style="width:20em"/></td>
+ <td colspan="3"><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )"></td>
</tr>
<tr>
<td><label for="jobTitle">$i18n.getString( "job_title" )</label></td>
- <td colspan="3"><input type="text" id="jobTitle" name="jobTitle" value="$!encoder.htmlEncode( $userCredentials.user.jobTitle )" style="width:20em"></td>
+ <td colspan="3"><input type="text" id="jobTitle" name="jobTitle" value="$!encoder.htmlEncode( $userCredentials.user.jobTitle )"></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm 2012-10-17 18:53:29 +0000
@@ -34,11 +34,11 @@
<h3>$i18n.getString( "edit_user_group" )</h3>
-<form id="editUserGroupForm" name="editUserGroupForm" action="updateUserGroup.action" method="post">
+<form id="editUserGroupForm" name="editUserGroupForm" action="updateUserGroup.action" method="post" class="inputForm">
<input type="hidden" name="userGroupId" id="userGroupId" value="$group.id" />
<table id="detailsList">
- <col style="width: 200px"/>
+ <col style="width: 120px"/>
<col style="width: 270px"/>
<tr>
@@ -47,7 +47,7 @@
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value ="$encoder.htmlEncode( $group.name )" style="width: 240px"></td>
+ <td><input type="text" id="name" name="name" value ="$encoder.htmlEncode( $group.name )"></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm 2011-12-09 20:44:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm 2012-10-17 18:53:29 +0000
@@ -17,7 +17,7 @@
<h3>$i18n.getString( 'create_new_resource' )</h3>
-<form id="documentForm" action="saveDocument.action" method="post" enctype="multipart/form-data">
+<form id="documentForm" action="saveDocument.action" method="post" enctype="multipart/form-data" class="inputForm">
<input type='hidden' id='id' name='id' value='$!document.id'/>
<table>
<tr>
@@ -25,12 +25,12 @@
</tr>
<tr>
<td style="width:70px"><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:20em" value="$!document.name" class="{validate:{required:true,minlength:2,maxlength:160}}"></td>
+ <td><input type="text" id="name" name="name" value="$!document.name" class="{validate:{required:true,minlength:2,maxlength:160}}"></td>
</tr>
<tr>
<td><label for="external">$i18n.getString( "type" )</label></td>
<td>
- <select id="external" name="external" style="width:20em" onchange="toggleExternal()">
+ <select id="external" name="external" onchange="toggleExternal()">
#if( $!document && !$!document.external )
<option value="false">$i18n.getString( "upload_file" )</option>
#elseif( $!document)
@@ -48,7 +48,7 @@
<table>
<tr>
<td style="width:70px"><label for="upload">$i18n.getString( "file" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="file" id="upload" name="upload" size="25" ></td>
+ <td><input type="file" id="upload" name="upload" size="30" ></td>
</tr>
</table>
</div>
@@ -57,7 +57,7 @@
<table>
<tr>
<td style="width:70px"><label for="url">$i18n.getString( "url" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="url" name="url" style="width:20em" #if($!document) value="$!document.url" #else value="http://"; #end ></td>
+ <td><input type="text" id="url" name="url" #if($!document) value="$!document.url" #else value="http://"; #end ></td>
</tr>
</table>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm 2012-10-01 10:50:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm 2012-10-17 18:53:29 +0000
@@ -4,24 +4,24 @@
<h3>$i18n.getString( 'create_new_report' )</h3>
-<form id="reportForm" action="addReport.action" method="post" enctype="multipart/form-data">
+<form id="reportForm" action="addReport.action" method="post" enctype="multipart/form-data" class="inputForm">
<input type="hidden" id="id" name="id" value="$!report.id" />
<input type="hidden" id="currentDesign" name="currentDesign" value="$!report.design" />
<table>
- <col width="220"/>
- <col/>
+ <col width="120"/>
+ <col width="400"/>
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
</tr>
<tr>
<td><label for="name">$i18n.getString( "name" )</label></td>
- <td><input type="text" id="name" name="name" style="width:290px" value="$!report.name"></td>
+ <td><input type="text" id="name" name="name" value="$!report.name"></td>
</tr>
<tr>
<td><label for="upload">$i18n.getString( "jasper_design" )</label></td>
- <td><input type="file" id="upload" name="upload" size="35" /></td>
+ <td><input type="file" id="upload" name="upload" size="30" /></td>
</tr>
<tr>
<td></td>
@@ -36,7 +36,7 @@
<tr>
<td><label for="usingOrgUnitGroupSets">$i18n.getString( "include_organisation_unit_group_sets" )</label></td>
<td>
- <select id="usingOrgUnitGroupSets" name="usingOrgUnitGroupSets" style="width:290px">
+ <select id="usingOrgUnitGroupSets" name="usingOrgUnitGroupSets">
<option value="false"#if ( $report && $report.usingOrgUnitGroupSets )selected="selected"#end>$i18n.getString( "no" )</option>
<option value="true"#if ( $report && $report.usingOrgUnitGroupSets )selected="selected"#end>$i18n.getString( "yes" )</option>
</select>
@@ -52,7 +52,7 @@
<tr class="reportTableDataSource">
<td>$i18n.getString( "report_table" )</td>
<td>
- <select id="reportTableId" name="reportTableId" style="width:260px">
+ <select id="reportTableId" name="reportTableId">
<option value="0">[ $i18n.getString( "none" ) ]</option>
#foreach( $table in $reportTables )
<option value="$table.id"#if( $!report.reportTable.id == $table.id ) selected="selected"#end>$table.name</option>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2012-09-22 21:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2012-10-17 18:53:29 +0000
@@ -1,22 +1,22 @@
<h3>$encoder.htmlEncode( $i18n.getString( "create_new_validation_rule" ) )</h3>
-<form id="addValidationRuleForm" action="addValidationRule.action" method="post" onsubmit="enable('periodTypeName');">
+<form id="addValidationRuleForm" action="addValidationRule.action" method="post" onsubmit="enable('periodTypeName');" class="inputForm">
<table>
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
</tr>
<tr>
<td><label for="name">$encoder.htmlEncode( $i18n.getString( "name" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:20em"></td>
+ <td><input type="text" id="name" name="name"></td>
</tr>
<tr>
<td><label for="description">$encoder.htmlEncode( $i18n.getString( "description" ) )</label></td>
- <td><textarea name="description" style="width:20em; height:6em"></textarea></td>
+ <td><textarea name="description"></textarea></td>
</tr>
<tr>
<td><label for="periodType">$encoder.htmlEncode( $i18n.getString( "period_type" ) )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select type="text" id="periodTypeName" name="periodTypeName" style="min-width:20em" >
+ <select type="text" id="periodTypeName" name="periodTypeName">
#foreach ( $periodType in $periodTypes )
<option value="$periodType.name" #if( $periodType.name.equals( ${monthlyPeriodTypeName} ) ) selected #end>$i18n.getString($periodType.name)</option>
#end
@@ -27,7 +27,7 @@
<tr>
<td><label for="operatorId">$encoder.htmlEncode( $i18n.getString( "operator" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select id="operator" name="operator" style="width:20em">
+ <select id="operator" name="operator">
<option value="">[ $i18n.getString( "select_operator" ) ]</option>
<option value="equal_to">$encoder.htmlEncode( $i18n.getString( "equal_to" ) )</option>
<option value="not_equal_to">$encoder.htmlEncode( $i18n.getString( "not_equal_to" ) )</option>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm 2012-10-17 18:53:29 +0000
@@ -17,7 +17,7 @@
<h3>$i18n.getString( "create_new_validation_rule_group" )</h3>
-<form id="addValidationRuleGroupForm" action="addValidationRuleGroup.action" method="post" >
+<form id="addValidationRuleGroupForm" action="addValidationRuleGroup.action" method="post" class="inputForm">
<table>
<tr>
@@ -26,12 +26,12 @@
<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:20em" /></td>
+ <td><input type="text" id="name" name="name"></td>
</tr>
<tr>
<td><label for="description">$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>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm 2012-09-22 21:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm 2012-10-17 18:53:29 +0000
@@ -5,7 +5,7 @@
<h3>$encoder.htmlEncode( $i18n.getString( "edit_validation_rule" ) )</h3>
-<form id="updateValidationRuleForm" action="updateValidationRule.action" method="POST" onsubmit="enable('periodTypeName');">
+<form id="updateValidationRuleForm" action="updateValidationRule.action" method="POST" onsubmit="enable('periodTypeName');" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$!validationRule.id">
@@ -17,15 +17,15 @@
</tr>
<tr>
<td><label for="name">$encoder.htmlEncode( $i18n.getString( "name" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $validationRule.name )" style="width:20em"></td>
+ <td><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $validationRule.name )"></td>
</tr>
<tr>
<td><label for="description">$encoder.htmlEncode( $i18n.getString( "description" ) )</label></td>
- <td><textarea name="description" style="width:20em; height:6em">$!encoder.htmlEncode( $validationRule.description )</textarea></td>
+ <td><textarea name="description">$!encoder.htmlEncode( $validationRule.description )</textarea></td>
</tr>
<tr>
<td><label for="periodType">$encoder.htmlEncode( $i18n.getString( "period_type" ) )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><select type="text" id="periodTypeName" name="periodTypeName" style="min-width:20em" disabled>
+ <td><select type="text" id="periodTypeName" name="periodTypeName" disabled>
#foreach ( $periodType in $periodTypes )
<option value="$periodType.name" #if( $validationRule.periodType.name.equals($periodType.name ) ) selected #end>$i18n.getString($periodType.name)</option>
#end
@@ -36,7 +36,7 @@
<tr>
<td><label for="operatorId">$encoder.htmlEncode( $i18n.getString( "operator" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select id="operator" name="operator" style="width:20em">
+ <select id="operator" name="operator">
<option value="equal_to" #if ( $validationRule.operator == 'equal_to' )selected="selected"#end>$encoder.htmlEncode( $i18n.getString( "equal_to" ) )</option>
<option value="not_equal_to" #if ( $validationRule.operator == 'not_equal_to' )selected="selected"#end>$encoder.htmlEncode( $i18n.getString( "not_equal_to" ) )</option>
<option value="greater_than" #if ( $validationRule.operator == 'greater_than' )selected="selected"#end>$encoder.htmlEncode( $i18n.getString( "greater_than" ) )</option>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm 2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm 2012-10-17 18:53:29 +0000
@@ -17,7 +17,7 @@
<h3>$i18n.getString( "edit_validation_rule_group" )</h3>
-<form id="updateValidationRuleGroupForm" action="updateValidationRuleGroup.action" method="post" >
+<form id="updateValidationRuleGroupForm" action="updateValidationRuleGroup.action" method="post" class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$validationRuleGroup.id">
@@ -30,12 +30,12 @@
<tr>
<td><label for="name">$i18n.getString( "name" )</label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $validationRuleGroup.name )" style="width:20em"></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $validationRuleGroup.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="$encoder.htmlEncode( $validationRuleGroup.description )" style="width:20em"></td>
+ <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $validationRuleGroup.description )"></td>
</tr>
</table>
