You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by pa...@apache.org on 2002/02/09 19:42:51 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_en.properties
paulsp 02/02/09 10:42:51
Modified: webapp/WEB-INF/templates/vm/emails password-reminder.vm
webapp/WEB-INF/templates/vm/navigations/html top.vm
src/java/org/apache/jetspeed/modules/actions JLoginUser.java
src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization_en.properties
Added: webapp/WEB-INF/templates/vm/screens/html LoginHelp.vm
Log:
o Added screen LoginHelp. This screen contains the Forgotten password
and other login specific "help" functions.
o Password-reminder.vm email message
Removed extra lines, commented out username, and localized subject.
o Moved "forgotten password" functionality from navigation bar to
LoginHelp screen. This was to cleanup the appearance of the
navigation bar.
Revision Changes Path
1.3 +7 -11 jakarta-jetspeed/webapp/WEB-INF/templates/vm/emails/password-reminder.vm
Index: password-reminder.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/emails/password-reminder.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- password-reminder.vm 28 Dec 2001 12:14:07 -0000 1.2
+++ password-reminder.vm 9 Feb 2002 18:42:51 -0000 1.3
@@ -1,23 +1,19 @@
## Set Email headers
#set ($ignored = $email.addTo($user.Email, "$!{user.FirstName} $!{user.LastName}") )
#set ($ignored = $email.setFrom($config.getString("newuser.confirm.email.from"),$config.getString("newuser.confirm.email.name") ))
-#set ($ignored = $email.setSubject("Jetspeed Administration"))
+#set ($ignored = $l10n.PASSWORDREMINDER_EMAIL_SUBJECT
##
-$l10n.PASSWORDREMINDER_GREETING $!user.FirstName $!user.LastName,
-
-$l10n.PASSWORDREMINDER_BODY1
+$l10n.PASSWORDREMINDER_EMAIL_HEADER $!user.FirstName $!user.LastName,
+$l10n.PASSWORDREMINDER_EMAIL_BODY1
$user.Password
-
-$l10n.PASSWORDREMINDER_BODY2
+$l10n.PASSWORDREMINDER_EMAIL_BODY2
$userurl
-$l10n.PASSWORDREMINDER_END
-
-
+$l10n.PASSWORDREMINDER_EMAIL_FOOTER
$config.getString("newuser.confirm.email.name")
-$l10n.PASSWORDREMINDER_PS $user.UserName
-
+## Uncomment the following to include the username in the message
+## $l10n.PASSWORDREMINDER_EMAIL_PS $user.UserName
1.13 +6 -11 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
Index: top.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- top.vm 9 Jan 2002 12:14:20 -0000 1.12
+++ top.vm 9 Feb 2002 18:42:51 -0000 1.13
@@ -103,11 +103,6 @@
</td>
<td rowspan="2" align="center">
<input name="submit" type="submit" value="$l10n.USERFORM_LOGIN" tabindex="4" style="font-size:10" />
-#if ( $config.getBoolean("password.reminder.enable") == true )
- <input name="eventSubmit_doReminder" type="submit" tabindex="5" value="$l10n.USERFORM_PASSWORDSEND" style="font-size:10" >
- <br><small>$l10n.USERFORM_PASSWORDREMINDER</small>
-#end
-
</td>
<td> </td>
</tr>
@@ -117,22 +112,22 @@
<input value="" name="password" maxlength="25" type="password" tabindex="2" style="font-size:10">
</td>
</tr>
-
-#if ( $config.getBoolean("automatic.logon.enable") == true )
+ #if ( $config.getBoolean("automatic.logon.enable") == true )
<tr>
<td style="font-size:10" colspan="2">
<input name="rememberme" value="true" type="checkbox" tabindex="3" />$l10n.USERFORM_REMEMBERME
</td>
</tr>
-#end
-
- #if( $config.getBoolean("topnav.user_creation.enable") == true)
+ #end
<tr>
<td align="center" colspan="3">
+ #if( $config.getBoolean("topnav.user_creation.enable") == true)
<a href="$link.setPage("NewAccount")" style="font-size:10">$l10n.TOP_CREATENEWACCOUNT</a>
+ |
+ #end
+ <a href="$link.setPage("LoginHelp")" style="font-size:10">$l10n.TOP_LOGINHELP</a>
</td>
</tr>
- #end
## Leave space between last line and content
<tr>
<td> </td>
1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/LoginHelp.vm
Index: LoginHelp.vm
===================================================================
<div>
<center>
<table cellpadding="2" cellspacing="0" border="1" width="50%">
<tr>
<td align="center" colspan="3" class="INPUTFORMTITLE">
$l10n.LOGINHELP_TITLE
</td>
</tr>
<tr>
<td>
#if ($data.Message)
## Message include account creation failure messages.
<p><b>$data.Message</b></p>
#end
#if ( $config.getBoolean("password.reminder.enable") == true )
<form accept-charset="UTF-8, ISO-8859-1" method="POST" action="$link.setPage("ConfirmRegistration")" enctype="application/x-www-form-urlencoded">
<input name="$jlink.ActionKey" type="hidden" value="$config.getString("action.login")">
<p>
$l10n.USERFORM_FORGOTPASSWORD_NOTICE
</p>
<center>
<table cellpadding="0" cellspacing="1" border="0">
<tr>
<td align="right" valign="middle">
$l10n.USERFORM_USERNAMEMSG
</td>
<td> </td>
<td align="right" valign="middle">
<input name="username" type="TEXT" value="$!data.Parameters.getString("username")">
</td>
<td align="right" valign="middle">
<input name="eventSubmit_doReminder" type="submit" tabindex="5" value="$l10n.USERFORM_PASSWORDSEND" style="font-size:10" >
</td>
</tr>
</table>
</center>
</form>
<br>
#end
</td>
</tr>
<tr>
<td align="left" colspan="3">
<p>
$l10n.LOGINHELP_NOTICE
</p>
<center>
<a href="mailto:$config.getString("mail.support")">$config.getString("mail.support")</a>
</center>
</td>
</tr>
</table>
</center>
</div>
1.22 +7 -13 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JLoginUser.java 9 Jan 2002 12:14:20 -0000 1.21
+++ JLoginUser.java 9 Feb 2002 18:42:51 -0000 1.22
@@ -108,11 +108,6 @@
public void doReminder( RunData data ) throws Exception
{
try {
- Log.debug("Entering doReminder");
-
- //always send the user to the login screen
- data.setScreenTemplate( JetspeedResources.getString( TurbineConstants.TEMPLATE_LOGIN ) );
-
String username = data.getParameters().getString("username", "");
User user = null;
@@ -124,12 +119,13 @@
if (user == null)
{
+ data.setScreenTemplate("LoginHelp");
data.setMessage(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
Log.debug(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
return;
}
- user.setHasLoggedIn( new Boolean(false));
+ user.setHasLoggedIn( Boolean.FALSE);
data.setUser(user);
DynamicURI url = new DynamicURI(data);
@@ -170,10 +166,11 @@
se.send();
data.setMessage (Localization.getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
- Log.debug(Localization.getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
-
- } catch ( Exception e )
- {
+ Log.info( "Password for user " + user.getUserName() + " was sent to " + user.getEmail());
+ Log.info(Localization.getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
+ data.setScreenTemplate("Login");
+ } catch ( Exception e ) {
+ data.setScreenTemplate("LoginHelp");
String errorTitle = Localization.getString("JLOGINUSER_PASSWORDREMINDER_ERROR") ;
String errorMessage = errorTitle + e.toString();
@@ -193,9 +190,6 @@
{
return;
}
-
- // are we on the ConfirmRegistration page?
- Log.info("Entering JLoginUser action");
boolean newUserApproval = JetspeedResources.getBoolean("newuser.approval.enable", false);
String secretkey = (String) data.getParameters().getString("secretkey", null);
1.12 +16 -12 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JetspeedLocalization_en.properties 9 Jan 2002 12:14:20 -0000 1.11
+++ JetspeedLocalization_en.properties 9 Feb 2002 18:42:51 -0000 1.12
@@ -10,16 +10,16 @@
LOGIN_REMEMBERME=Remember me on this computer
LOGIN_LOGIN=Login
LOGIN_NEW_ACCOUNT=Create a new account
-
-JLOGINUSER_PASSWORDREMINDER_INVALIDUSER=Sorry, that username is not valid.
-JLOGINUSER_PASSWORDREMINDER_SENT=Your password has been emailed to you.
-JLOGINUSER_PASSWORDREMINDER_ERROR=Error sending password reminder:
-
-PASSWORDREMINDER_GREETING=Hello
-PASSWORDREMINDER_BODY1=Your jetspeed account password is:
-PASSWORDREMINDER_BODY2=You can now go to the jetspeed site and login.
-PASSWORDREMINDER_END=Regards,
-PASSWORDREMINDER_PS=PS\n\nDon't forget that your username is:
+LOGIN_TITLE=Account Login
+LOGINHELP_TITLE=Account Login Assistance
+LOGINHELP_NOTICE=If you need additional assistance is required, please send email to the address below.
+
+PASSWORDREMINDER_EMAIL_HEADER=Hello
+PASSWORDREMINDER_EMAIL_BODY1=Your jetspeed account password is:
+PASSWORDREMINDER_EMAIL_BODY2=You can now go to the jetspeed site and login.
+PASSWORDREMINDER_EMAIL_FOOTER=Regards,
+PASSWORDREMINDER_EMAIL_PS=PS: Don't forget that your username is:
+PASSWORDREMINDER_EMAIL_SUBJECT=Password notification
CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, the passwords do not match.
CREATENEWUSERANDCONFIRM_NOUSERNAME=Sorry, you must supply a username.
@@ -33,6 +33,9 @@
JLOGINUSER_NAMENOTVALID=Sorry, that username is not valid. Please make sure that you have entered the valid URL from the email or create a new user account.
JLOGINUSER_CONFIRMFIRST=Sorry, but you must first confirm this account before logging in.
JLOGINUSER_NOAUTHUSERROLE=The role authenticated_user does not exist in database.
+JLOGINUSER_PASSWORDREMINDER_INVALIDUSER=Sorry, that username is not valid.
+JLOGINUSER_PASSWORDREMINDER_SENT=Your password has been sent.
+JLOGINUSER_PASSWORDREMINDER_ERROR=Error sending password reminder:
LOGOUTUSER_THANKS=Thank you for using the system. Please come back soon.
@@ -87,8 +90,9 @@
USERFORM_UPDATE=Update Account
USERFORM_CREATE=Create New Account
USERFORM_LOGIN=Login
-USERFORM_PASSWORDSEND=Password?
+USERFORM_PASSWORDSEND=Email Password
USERFORM_PASSWORDREMINDER=Forgotten your password?<br>Enter your username<br> and click Password?
+USERFORM_FORGOTPASSWORD_NOTICE=Please e-mail my password.
NEWACCOUNT_TITLE=Create a new Jetspeed account
NEWACCOUNT_NOTICE=To create a new account, please fill in all of the fields below.
@@ -105,7 +109,7 @@
TOP_EDITACCOUNT=Edit account:
TOP_LOGOUT=Logout
TOP_CUSTOMIZE=Customize
-
+TOP_LOGINHELP=Login Help
LEFT_DOCUMENTATION=Documentation
HOME=Home
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>