dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11120
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3118: Fixed BUG: text input not working in firefox in several modules
------------------------------------------------------------
revno: 3118
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-22 10:35:27 +0100
message:
Fixed BUG: text input not working in firefox in several modules
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js
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/javascript/addOrganisationUnitForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js 2011-03-22 02:17:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js 2011-03-22 09:35:27 +0000
@@ -14,7 +14,6 @@
validation2( 'caseAggregationForm', function(form) {
validationCaseAggregation();
}, {
-
'rules': rules
})
});
=== 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 2011-03-21 15:10:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2011-03-22 09:35:27 +0000
@@ -14,19 +14,19 @@
</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" onchange="nameChanged()" style="width:20em"></td>
+ <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:20em"/></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" )</label></td>
- <td><input type="text" id="shortName" name="shortName" style="width:20em"></td>
+ <td><input type="text" id="shortName" name="shortName" style="width:20em"/></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" style="width:20em"/></td>
</tr>
<tr>
<td><label for="openingDate">$i18n.getString( "opening_date" ) ($i18n.getString( "format.date.label" )) <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 )" style="width:20em"/></td>
<td></td>
</tr>
<tr>
@@ -44,23 +44,23 @@
</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" style="width:20em"/></td>
</tr>
<tr>
<td><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
- <td><input type="text" id="contactPerson" name="contactPerson" style="width:20em"></td>
+ <td><input type="text" id="contactPerson" name="contactPerson" style="width:20em"/></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" style="width:20em"/></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" style="width:20em"/></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" style="width:20em"/></td>
</tr>
<tr>
<td><label for="availableDataSets">$i18n.getString( "available_data_sets" )</label></td>
@@ -72,8 +72,10 @@
</tr>
<tr>
<td></td>
- <td><input type="button" value="$i18n.getString( 'add' )" style="width:120px" onclick="moveSelectedById( 'availableDataSets', 'dataSets' )"><input
- type="button" value="$i18n.getString( 'remove' )" style="width:120px" onclick="moveSelectedById( 'dataSets', 'availableDataSets' )"></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'add' )" style="width:120px" onclick="moveSelectedById( 'availableDataSets', 'dataSets' )"/>
+ <input type="button" value="$i18n.getString( 'remove' )" style="width:120px" onclick="moveSelectedById( 'dataSets', 'availableDataSets' )"/>
+ </td>
</tr>
<tr>
<td><label for="dataSets">$i18n.getString( "selected_data_sets" )</label></td>
@@ -81,7 +83,9 @@
</tr>
<tr>
<td></td>
- <td><input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='organisationUnit.action'" style="width:10em"/></td>
+ <td>
+ <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='organisationUnit.action'" style="width:10em"/>
+ </td>
</tr>
</table>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitForm.js 2011-03-21 15:10:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitForm.js 2011-03-22 09:35:27 +0000
@@ -56,14 +56,14 @@
'rules' : rules
} );
- jQuery( "#name" ).attr( "maxlength", r.organisationUnit.name.length );
- jQuery( "#shortName" ).attr( "maxlength", r.organisationUnit.shortName.length );
- jQuery( "#code" ).attr( "maxlength", r.organisationUnit.code.length );
- jQuery( "#url" ).attr( "maxlength", r.organisationUnit.url.length );
- jQuery( "#contactPerson" ).attr( "maxlength", r.organisationUnit.contactPerson.length );
- jQuery( "#address" ).attr( "maxlength", r.organisationUnit.address.length );
- jQuery( "#email" ).attr( "maxlength", r.organisationUnit.email.length );
- jQuery( "#phoneNumber" ).attr( "maxlength", r.organisationUnit.phoneNumber.length );
+ jQuery( "#name" ).attr( "maxlength", r.organisationUnit.name.length[1] );
+ jQuery( "#shortName" ).attr( "maxlength", r.organisationUnit.shortName.length[1] );
+ jQuery( "#code" ).attr( "maxlength", r.organisationUnit.code.length[1] );
+ jQuery( "#url" ).attr( "maxlength", r.organisationUnit.url.length[1] );
+ jQuery( "#contactPerson" ).attr( "maxlength", r.organisationUnit.contactPerson.length[1] );
+ jQuery( "#address" ).attr( "maxlength", r.organisationUnit.address.length[1] );
+ jQuery( "#email" ).attr( "maxlength", r.organisationUnit.email.length[1] );
+ jQuery( "#phoneNumber" ).attr( "maxlength", r.organisationUnit.phoneNumber.length[1] );
checkValueIsExist( "name", "validateOrganisationUnit.action" );
datePickerValid( 'openingDate', false );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js 2011-03-16 16:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupForm.js 2011-03-22 09:35:27 +0000
@@ -16,7 +16,7 @@
'rules' : rules
} );
- jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroup.name.length );
+ jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroup.name.length[1] );
checkValueIsExist( "name", "validateOrganisationUnitGroup.action" );
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js 2011-03-16 16:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js 2011-03-22 09:35:27 +0000
@@ -24,8 +24,8 @@
'rules' : rules
} );
- jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroupSet.name.length );
- jQuery( "#description" ).attr( "maxlength", r.organisationUnitGroupSet.description.length );
+ jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroupSet.name.length[1] );
+ jQuery( "#description" ).attr( "maxlength", r.organisationUnitGroupSet.description.length[1] );
checkValueIsExist( "name", "validateOrganisationUnitGroupSet.action" );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitForm.js 2011-03-21 15:10:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitForm.js 2011-03-22 09:35:27 +0000
@@ -55,12 +55,12 @@
'rules' : rules
} );
- jQuery( "#name" ).attr( "maxlength", r.organisationUnit.name.length );
- jQuery( "#shortName" ).attr( "maxlength", r.organisationUnit.shortName.length );
- jQuery( "#code" ).attr( "maxlength", r.organisationUnit.code.length );
- jQuery( "#url" ).attr( "maxlength", r.organisationUnit.url.length );
- jQuery( "#contactPerson" ).attr( "maxlength", r.organisationUnit.contactPerson.length );
- jQuery( "#address" ).attr( "maxlength", r.organisationUnit.address.length );
- jQuery( "#email" ).attr( "maxlength", r.organisationUnit.email.length );
- jQuery( "#phoneNumber" ).attr( "maxlength", r.organisationUnit.phoneNumber.length );
+ jQuery( "#name" ).attr( "maxlength", r.organisationUnit.name.length[1] );
+ jQuery( "#shortName" ).attr( "maxlength", r.organisationUnit.shortName.length[1] );
+ jQuery( "#code" ).attr( "maxlength", r.organisationUnit.code.length[1] );
+ jQuery( "#url" ).attr( "maxlength", r.organisationUnit.url.length[1] );
+ jQuery( "#contactPerson" ).attr( "maxlength", r.organisationUnit.contactPerson.length[1] );
+ jQuery( "#address" ).attr( "maxlength", r.organisationUnit.address.length[1] );
+ jQuery( "#email" ).attr( "maxlength", r.organisationUnit.email.length[1] );
+ jQuery( "#phoneNumber" ).attr( "maxlength", r.organisationUnit.phoneNumber.length[1] );
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js 2011-03-16 16:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupForm.js 2011-03-22 09:35:27 +0000
@@ -13,5 +13,5 @@
'rules': rules
});
- jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroup.name.length );
+ jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroup.name.length[1] );
});
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js 2011-03-16 16:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js 2011-03-22 09:35:27 +0000
@@ -24,8 +24,8 @@
'rules' : rules
} );
- jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroupSet.name.length );
- jQuery( "#description" ).attr( "maxlength", r.organisationUnitGroupSet.description.length );
+ jQuery( "#name" ).attr( "maxlength", r.organisationUnitGroupSet.name.length[1] );
+ jQuery( "#description" ).attr( "maxlength", r.organisationUnitGroupSet.description.length[1] );
checkValueIsExist( "name", "validateOrganisationUnitGroupSet.action", {
id : $organisationUnitGroupSet.id
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js 2011-03-15 14:49:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js 2011-03-22 09:35:27 +0000
@@ -44,9 +44,11 @@
'rules' : rules
} );
- jQuery( "#rawPassword" ).attr( "maxlength", "35" );
- jQuery( "#retypePassword" ).attr( "maxlength", "35" );
- jQuery( "#surname" ).attr( "maxlength", "140" );
- jQuery( "#firstName" ).attr( "maxlength", "140" );
- jQuery( "#email" ).attr( "maxlength", "160" );
+ jQuery( "#rawPassword" ).attr( "maxlength", r.user.password.length[1] );
+ jQuery( "#retypePassword" ).attr( "maxlength", r.user.password.length[1] );
+ jQuery( "#surname" ).attr( "maxlength", r.user.name.length[1] );
+ jQuery( "#firstName" ).attr( "maxlength", r.user.name.length[1] );
+ jQuery( "#email" ).attr( "maxlength", r.user.email.length[1] );
+ jQuery( "#phoneNumber" ).attr( "maxlength", r.user.phone.length[1] );
+
} );
=== 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 2011-03-14 21:10:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2011-03-22 09:35:27 +0000
@@ -34,7 +34,7 @@
</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 )" style="width:20em"></td>
</tr>
<tr>
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
