dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1719
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-04-01 15:59:58 +0700
message:
  Fixed bug <All pages under the Help main menu need "Back" buttons>
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/feedbackForm.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.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/about/about.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-03-11 19:16:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-04-01 08:59:58 +0000
@@ -13,3 +13,5 @@
   <dt>$i18n.getString( "database_user" ):</dt><dd>$!info.user</dd>
   <dt>$i18n.getString( "java_opts" ):</dt><dd>$!javaOpts</dd>
 </dl>
+<br/>
+<div><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='help.action'" style="width:140px"/></div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm	2010-01-27 20:55:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm	2010-04-01 08:59:58 +0000
@@ -8,4 +8,6 @@
   <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.2"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
   <dt>$i18n.getString( "release" ) 2.0.1:</dt>
   <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.1"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
-</dl>
\ No newline at end of file
+</dl>
+<br/>
+<div><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='help.action'" style="width:140px"/></div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/feedbackForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/feedbackForm.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/feedbackForm.vm	2010-04-01 08:59:58 +0000
@@ -31,7 +31,14 @@
 
 <p><textarea id="stackTrace" name="stackTrace" style="width:500px; height:150px"></textarea></p>
 
-<p><input type="button" value="$i18n.getString( 'send' )" onclick="validateForm()" style="width:140px"></p>
+<p>
+<table>
+<tr>
+<td><input type="button" value="$i18n.getString( 'send' )" onclick="validateForm()" style="width:140px"/></td>
+<td><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='help.action'" style="width:140px"/></td>
+</tr>
+</table>
+</p>
 
 </form>
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.js	2010-02-27 19:45:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.js	2010-04-01 08:59:58 +0000
@@ -1,6 +1,12 @@
 
 $( document ).ready( function()
 {	
+	$( "div#helpBack" ).click(
+		function()
+		{
+			window.location.href="/dhis/dhis-web-portal/intro.action";
+		});
+
     $.get( 
        'getHelpItems.action',
        function( data )

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm	2010-02-25 18:35:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm	2010-04-01 08:59:58 +0000
@@ -4,6 +4,7 @@
 <table>
 <tr>
 <td valign="top"><div id="helpMenu"></div></td>
-<td valign="top"><div id="helpContent">$i18n.getString( "help_intro" )</div></td>
+<td valign="top"><div id="helpContent">$i18n.getString( "help_intro" )</div><br/>
+<div id="helpBack" align="right"><input type="button" value="$i18n.getString( 'back' )" style="width:140px"/></div></td>
 </tr>
 </table>
\ No newline at end of file

=== 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	2010-03-30 02:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm	2010-04-01 08:59:58 +0000
@@ -32,7 +32,7 @@
 <form id="updateUserinforForm" action="updateUserAccount.action" method="post" onsubmit='return false;'>
 	
   <div>
-	<input type="hidden" id="id" name="id" value="$userCredentials.id">
+	<input type="hidden" id="id" name="id" value="$userCredentials.id"/>
   </div>
 
 <table>
@@ -41,39 +41,40 @@
 	</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:20em" disabled="disabled" class="{validate:{required:true,firstletteralphabet:true,minlength:2,maxlength:50,alphanumeric:true}}"></td>
+		<td><input type="text" id="username" name="username" value="$encoder.htmlEncode( $userCredentials.username )" style="width:20em" disabled="disabled" class="{validate:{required:true,firstletteralphabet:true,minlength:2,maxlength:50,alphanumeric:true}}"/></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:20em" style="width:20em" class="{validate:{required:true,minlength:5,maxlength:50,notequalto:'#username'}}"></td>
+		<td><input type="password" id="oldPassword" name="oldPassword" style="width:20em" style="width:20em" class="{validate:{required:true,minlength:5,maxlength:50,notequalto:'#username'}}"/></td>
 	</tr>
 	<tr>
 		<td><label for="rawPassword">$i18n.getString( "new_password" )</label></td>
-		<td><input type="password" id="rawPassword" name="rawPassword" style="width:20em" style="width:20em" class="{validate:{required:false,minlength:5,maxlength:50,notequalto:'#username'}}" ></td>
+		<td><input type="password" id="rawPassword" name="rawPassword" style="width:20em" style="width:20em" class="{validate:{required:false,minlength:5,maxlength:50,notequalto:'#username'}}"/></td>
 	</tr>
 	<tr>
 		<td><label for="retypePassword">$i18n.getString( "retype_new_password" )</label></td>
-		<td><input type="password" id="retypePassword" name="retypePassword" style="width:20em"  class="{validate:{required:false,minlength:5,maxlength:50,equalTo:'#rawPassword'}}"></td>
+		<td><input type="password" id="retypePassword" name="retypePassword" style="width:20em" class="{validate:{required:false,minlength:5,maxlength:50,equalTo:'#rawPassword'}}"/></td>
 	</tr>
 	<tr>
 		<td><label for="surname">$i18n.getString( "surname" ) <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:20em"></td>
+		<td><input type="text" id="surname" name="surname" value="$encoder.htmlEncode( $userCredentials.user.surname )" style="width:20em"/></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:20em"></td>
+		<td><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $userCredentials.user.firstName )" style="width:20em"/></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:20em"></td>
+		<td><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>
-        <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )" style="width:20em"></td>
+        <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )" style="width:20em"/></td>
     </tr>
 	<tr>
 		<td></td>
-		<td valign="top"><input type="submit" value="$i18n.getString( "save" )" style="width:10em"></td>
+		<td valign="top"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>&nbsp;
+		<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='help.action'" style="width:10em"/></td>
 	</tr>
 </table>