dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19540
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8561: Consistent forms
------------------------------------------------------------
revno: 8561
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-17 21:06:30 +0200
message:
Consistent forms
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java
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/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-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm 2012-10-11 14:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm 2012-10-17 19:06:30 +0000
@@ -2,7 +2,7 @@
<h3>$i18n.getString( "user_account" )</h3>
-<form id="updateUserinforForm" action="updateUserAccount.action" method="post" onsubmit='return false;'>
+<form id="updateUserinforForm" action="updateUserAccount.action" method="post" onsubmit='return false;' class="inputForm">
<div>
<input type="hidden" id="id" name="id" value="$userCredentials.id"/>
</div>
@@ -13,35 +13,35 @@
</tr>
<tr>
<td><label for="username">$i18n.getString( "user_name" )</label></td>
- <td><input type="text" id="username" name="username" value="$!encoder.htmlEncode( $!userCredentials.username )" style="width:25em" disabled="disabled"></td>
+ <td><input type="text" id="username" name="username" value="$!encoder.htmlEncode( $!userCredentials.username )" disabled="disabled"></td>
</tr>
<tr>
<td><label for="firstName">$i18n.getString( "first_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="firstName" name="firstName" value="$!encoder.htmlEncode( $!userCredentials.user.firstName )" style="width:25em"></td>
+ <td><input type="text" id="firstName" name="firstName" value="$!encoder.htmlEncode( $!userCredentials.user.firstName )"></td>
</tr>
<tr>
<td><label for="surname">$i18n.getString( "last_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="surname" name="surname" value="$!encoder.htmlEncode( $!userCredentials.user.surname )" style="width:25em"></td>
+ <td><input type="text" id="surname" name="surname" value="$!encoder.htmlEncode( $!userCredentials.user.surname )"></td>
</tr>
<tr>
<td><label for="rawPassword">$i18n.getString( "old_password" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="password" id="oldPassword" name="oldPassword" style="width:25em"></td>
+ <td><input type="password" id="oldPassword" name="oldPassword"></td>
</tr>
<tr>
<td><label for="rawPassword">$i18n.getString( "new_password" )</label></td>
- <td><input type="password" id="rawPassword" name="rawPassword" style="width:25em"></td>
+ <td><input type="password" id="rawPassword" name="rawPassword"></td>
</tr>
<tr>
<td><label for="retypePassword">$i18n.getString( "retype_new_password" )</label></td>
- <td><input type="password" id="retypePassword" name="retypePassword" style="width:25em"></td>
+ <td><input type="password" id="retypePassword" name="retypePassword"></td>
</tr>
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
- <td><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $!userCredentials.user.email )" style="width:25em"/></td>
+ <td><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><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $!userCredentials.user.phoneNumber )" style="width:25em"/></td>
+ <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $!userCredentials.user.phoneNumber )"></td>
</tr>
<tr>
<td></td>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm 2012-10-11 14:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm 2012-10-17 19:06:30 +0000
@@ -2,7 +2,7 @@
<h3>$encoder.htmlEncode( $userCredentials.user.getName() )</h3>
-<form id="updateUserProfileForm" name="updateUserProfileForm">
+<form id="updateUserProfileForm" name="updateUserProfileForm" class="inputForm">
<div><input type="hidden" id="id" name="id" value="$userCredentials.id"/></div>
<table>
@@ -11,23 +11,23 @@
</tr>
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
- <td><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $userCredentials.user.email )" style="width:25em"/></td>
+ <td><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><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )" style="width:25em"/></td>
+ <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )"></td>
</tr>
<tr>
<td><label for="introduction">$i18n.getString( "introduction" )</label></td>
- <td><textarea id="introduction" name="introduction" style="width:25em;height:8em">$!encoder.htmlEncode( $!userCredentials.user.introduction )</textarea></td>
+ <td><textarea id="introduction" name="introduction">$!encoder.htmlEncode( $!userCredentials.user.introduction )</textarea></td>
</tr>
<tr>
<td><label for="jobTitle">$i18n.getString( "job_title" )</label></td>
- <td><input type="text" id="jobTitle" name="jobTitle" value="$!encoder.htmlEncode( $userCredentials.user.jobTitle )" style="width:25em"></td>
+ <td><input type="text" id="jobTitle" name="jobTitle" value="$!encoder.htmlEncode( $userCredentials.user.jobTitle )"></td>
</tr>
<tr>
<td><label for="gender">$i18n.getString( "gender" )</label></td>
- <td><select type="text" id="gender" name="gender" style="width:25em">
+ <td><select type="text" id="gender" name="gender">
<option value="gender_male" #if( $!userCredentials.user.gender == "gender_male" ) selected="selected"#end>$i18n.getString( "male" )</option>
<option value="gender_female" #if( $!userCredentials.user.gender == "gender_female" ) selected="selected"#end>$i18n.getString( "female" )</option>
<option value="gender_other" #if( $!userCredentials.user.gender == "gender_other" ) selected="selected"#end>$i18n.getString( "other" )</option>
@@ -35,27 +35,27 @@
</tr>
<tr>
<td><label for="birthday">$i18n.getString( "birthday" )</label></td>
- <td><input type="text" id="birthday" name="birthday" value="$!format.formatDate( $!userCredentials.user.birthday )" style="width:25em"/></td>
+ <td><input type="text" id="birthday" name="birthday" value="$!format.formatDate( $!userCredentials.user.birthday )"></td>
</tr>
<tr>
<td><label for="nationality">$i18n.getString( "nationality" )</label></td>
- <td><input type="text" id="nationality" name="nationality" value="$!encoder.htmlEncode( $!userCredentials.user.nationality )" style="width:25em"/></td>
+ <td><input type="text" id="nationality" name="nationality" value="$!encoder.htmlEncode( $!userCredentials.user.nationality )"></td>
</tr>
<tr>
<td><label for="employer">$i18n.getString( "employer" )</label></td>
- <td><input type="text" id="employer" name="employer" value="$!encoder.htmlEncode( $!userCredentials.user.employer )" style="width:25em"/></td>
+ <td><input type="text" id="employer" name="employer" value="$!encoder.htmlEncode( $!userCredentials.user.employer )"></td>
</tr>
<tr>
<td><label for="education">$i18n.getString( "education" )</label></td>
- <td><textarea id="education" name="education" style="width:25em;height:8em">$!encoder.htmlEncode( $!userCredentials.user.education )</textarea></td>
+ <td><textarea id="education" name="education">$!encoder.htmlEncode( $!userCredentials.user.education )</textarea></td>
</tr>
<tr>
<td><label for="interests">$i18n.getString( "interests" )</label></td>
- <td><textarea id="interests" name="interests" style="width:25em;height:8em">$!encoder.htmlEncode( $!userCredentials.user.interests )</textarea></td>
+ <td><textarea id="interests" name="interests">$!encoder.htmlEncode( $!userCredentials.user.interests )</textarea></td>
</tr>
<tr>
<td><label for="languages">$i18n.getString( "languages" )</label></td>
- <td><textarea id="languages" name="languages" style="width:25em;height:8em">$!encoder.htmlEncode( $!userCredentials.user.languages )</textarea></td>
+ <td><textarea id="languages" name="languages">$!encoder.htmlEncode( $!userCredentials.user.languages )</textarea></td>
</tr>
<tr>
<td></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java 2012-07-02 12:40:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java 2012-10-17 19:06:30 +0000
@@ -144,13 +144,6 @@
this.phoneNumber = phoneNumber;
}
- private String jobTitle;
-
- public void setJobTitle( String jobTitle )
- {
- this.jobTitle = jobTitle;
- }
-
private String passwordUnMatched;
public String getPasswordUnMatched()
@@ -209,7 +202,6 @@
user.setFirstName( firstName );
user.setEmail( email );
user.setPhoneNumber( phoneNumber );
- user.setJobTitle( jobTitle );
user.updateOrganisationUnits( new HashSet<OrganisationUnit>( orgUnits ) );
UserCredentials userCredentials = new UserCredentials();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java 2012-07-02 12:40:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java 2012-10-17 19:06:30 +0000
@@ -136,13 +136,6 @@
this.phoneNumber = phoneNumber;
}
- private String jobTitle;
-
- public void setJobTitle( String jobTitle )
- {
- this.jobTitle = jobTitle;
- }
-
private Collection<String> selectedList = new ArrayList<String>();
public void setSelectedList( Collection<String> selectedList )
@@ -192,7 +185,6 @@
user.setFirstName( firstName );
user.setEmail( email );
user.setPhoneNumber( phoneNumber );
- user.setJobTitle( jobTitle );
user.updateOrganisationUnits( new HashSet<OrganisationUnit>( units ) );
UserCredentials userCredentials = userService.getUserCredentials( user );
=== 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-10-17 18:53:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2012-10-17 19:06:30 +0000
@@ -79,10 +79,6 @@
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
<td colspan="3"><input type="text" id="phoneNumber" name="phoneNumber" style="width:20em"></td>
</tr>
- <tr>
- <td><label for="jobTitle">$i18n.getString( "job_title" )</label></td>
- <td colspan="3"><input type="text" id="jobTitle" name="jobTitle" style="width:20em"></td>
- </tr>
</table>
#tblDynamicAttributes( { "attributes": $attributes } )
=== 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-10-17 18:53:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2012-10-17 19:06:30 +0000
@@ -89,10 +89,6 @@
<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 )"></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 )"></td>
- </tr>
</table>
#tblDynamicAttributes( { "attributes": $attributes, "attributeValues": $attributeValues } )
