dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8415
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-10-07 10:21:33 +0700
message:
  User Profile - Minor changed in GUI.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties


--
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/updateUserProfileForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-10-06 08:45:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-10-07 03:21:33 +0000
@@ -3,9 +3,7 @@
 <h3>$encoder.htmlEncode( $userCredentials.user.getName() )</h3>
 
 <form id="updateUserProfileForm" name="updateUserProfileForm">
-<div>
-	<input type="hidden" id="id" name="id" value="$userCredentials.id"/>
-</div>
+<div><input type="hidden" id="id" name="id" value="$userCredentials.id"/></div>
 
 <table>
 	<tr>
@@ -21,7 +19,7 @@
     </tr>
     <tr>
         <td><label for="introduction">$i18n.getString( "introduction" )</label></td>
-        <td><textarea id="introduction" name="introduction" style="width:20em">$!encoder.htmlEncode( $!userCredentials.user.introduction )</textarea></td>
+        <td><textarea id="introduction" name="introduction" style="width:20em;height:10em">$!encoder.htmlEncode( $!userCredentials.user.introduction )</textarea></td>
     </tr>
 	<tr>
 		<td><label for="jobTitle">$i18n.getString( "job_title" )</label></td>
@@ -30,7 +28,6 @@
 	<tr>
 		<td><label for="gender">$i18n.getString( "gender" )</label></td>
 		<td><select type="text" id="gender" name="gender" style="width:20em">
-			<option value="">[ $i18n.getString( "please_select" ) ]</option>
 			<option value="M" #if( $!userCredentials.user.gender == "M" ) selected="selected" #end>$i18n.getString( "male" )</option>
 			<option value="F" #if( $!userCredentials.user.gender == "F" ) selected="selected" #end>$i18n.getString( "female" )</option>
 			<option value="O" #if( $!userCredentials.user.gender == "O" ) selected="selected" #end>$i18n.getString( "other" )</option>
@@ -50,20 +47,19 @@
 	</tr>
 	<tr>
         <td><label for="education">$i18n.getString( "education" )</label></td>
-        <td><textarea id="education" name="education" style="width:20em">$!encoder.htmlEncode( $!userCredentials.user.education )</textarea></td>
+        <td><textarea id="education" name="education" style="width:20em;height:10em">$!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:20em">$!encoder.htmlEncode( $!userCredentials.user.interests )</textarea></td>
+        <td><textarea id="interests" name="interests" style="width:20em;height:10em">$!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:20em">$!encoder.htmlEncode( $!userCredentials.user.languages )</textarea></td>
+        <td><textarea id="languages" name="languages" style="width:20em;height:10em">$!encoder.htmlEncode( $!userCredentials.user.languages )</textarea></td>
     </tr>
 	<tr>
 		<td></td>
-		<td valign="top"><input type="submit" value="$i18n.getString( 'update' )" style="width:10em">
-		<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='$!backUrl'" style="width:120px"/></td>
+		<td valign="top"><input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/></td>
 	</tr>
 </table>
 </form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-06 08:45:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-07 03:21:33 +0000
@@ -310,7 +310,7 @@
 education=Education
 interests=Interests
 languages=Languages
-update_user_profile_success=Update user profile successfully
+update_user_profile_success=Profile was updated
 
 #-- Change Log------------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2012-10-06 08:45:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2012-10-07 03:21:33 +0000
@@ -424,4 +424,4 @@
 education=Tr\u00ecnh \u0111\u1ed9
 interests=S\u1edf th\u00edch
 languages=Ng\u00f4n ng\u1eef
-update_user_profile_success=C\u1eadp nh\u1eadt profile cho ng\u01b0\u1eddi d\u00f9ng th\u00e0nh c\u00f4ng
\ No newline at end of file
+update_user_profile_success=Profile \u0111\u00e3 \u0111\u01b0\u1ee3c c\u1eadp nh\u1eadt
\ No newline at end of file