paulsp 2002/11/24 19:47:17
Modified: xdocs changes.xml
docs/site changes.html
src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization_en.properties
webapp/WEB-INF/templates/vm/screens/html
NewUserAwaitingAcceptance.vm NewUserRejected.vm
Log:
Localized NewUserRejected.vm and NewUserAwaitingAcceptance.vm
Bug 5476
Revision Changes Path
1.94 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- changes.xml 20 Nov 2002 17:01:47 -0000 1.93
+++ changes.xml 25 Nov 2002 03:47:17 -0000 1.94
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Fixed - Bug 5476 - 2002/11/24 - Localized NewUserRejected.vm and
NewUserAwaitingAcceptance.vm (PS)
+</li>
+<li>
Add - 2002/11/20 - Added JetspeedPortletLinkTag and matching functionality in
JetspeedLink for usage in Velocity (MO)
</li>
<li>
1.74 +4 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- changes.html 20 Nov 2002 17:01:46 -0000 1.73
+++ changes.html 25 Nov 2002 03:47:17 -0000 1.74
@@ -5,6 +5,7 @@
<!-- start the processing -->
<!-- ====================================================================== -->
+ <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
<!-- Main Page Section -->
<!-- ====================================================================== -->
<html>
@@ -132,6 +133,9 @@
action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's
initials) [Thanks to developer_name]
</li>
-->
+<li>
+ Fixed - Bug 5476 - 2002/11/24 - Localized NewUserRejected.vm and
NewUserAwaitingAcceptance.vm (PS)
+</li>
<li>
Add - 2002/11/20 - Added JetspeedPortletLinkTag and matching functionality in
JetspeedLink for usage in Velocity (MO)
</li>
1.25 +3 -2
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JetspeedLocalization_en.properties 16 Sep 2002 17:57:14 -0000 1.24
+++ JetspeedLocalization_en.properties 25 Nov 2002 03:47:17 -0000 1.25
@@ -39,7 +39,8 @@
JLOGINUSER_PASSWORDREMINDER_INVALIDUSER=Sorry, that username is not valid.
JLOGINUSER_PASSWORDREMINDER_SENT=Your password has been sent.
JLOGINUSER_PASSWORDREMINDER_ERROR=Error sending password reminder:
-
+JLOGINUSER_REQUEST_RECORDED=Your request for an account has been recorded. You
will be contacted shortly to let you know if it was accepted.
+JLOGINUSER_REQUEST_REJECTED=Your request for an account has been rejected.
LOGOUTUSER_THANKS=Thank you for using the system. Please come back soon.
SENDCONFIRMATIONEMAIL_BODY1=Welcome to the Jetspeed Portal from Apache. Your new
account has been \n\
1.2 +25 -3
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewUserAwaitingAcceptance.vm
Index: NewUserAwaitingAcceptance.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewUserAwaitingAcceptance.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewUserAwaitingAcceptance.vm 19 Nov 2001 07:46:56 -0000 1.1
+++ NewUserAwaitingAcceptance.vm 25 Nov 2002 03:47:17 -0000 1.2
@@ -1,4 +1,26 @@
-<div align="left">
- <p>Your request for an account has been recorded.</p>
- <p>You will be contacted shortly to let you know if it was accepted.</p>
+<div>
+ <center>
+ <table cellpadding="2" cellspacing="0" border="1" width="50%">
+ <tr>
+ <td align="center" colspan="3" class="INPUTFORMTITLE">
+ $l10n.LOGIN_TITLE
+ </td>
+ </tr>
+ <tr>
+ <td class="INPUTFORM">
+ <p>$l10n.JLOGINUSER_REQUEST_RECORDED</p>
+ </td>
+ </tr>
+ <tr>
+ <td align="left" colspan="3" class="INPUTFORM">
+ <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.2 +25 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewUserRejected.vm
Index: NewUserRejected.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewUserRejected.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewUserRejected.vm 19 Nov 2001 07:46:56 -0000 1.1
+++ NewUserRejected.vm 25 Nov 2002 03:47:17 -0000 1.2
@@ -1,3 +1,26 @@
-<div align="left">
- <p>This account is disabled.</p>
+<div>
+ <center>
+ <table cellpadding="2" cellspacing="0" border="1" width="50%">
+ <tr>
+ <td align="center" colspan="3" class="INPUTFORMTITLE">
+ $l10n.LOGIN_TITLE
+ </td>
+ </tr>
+ <tr>
+ <td class="INPUTFORM">
+ <p>$l10n.JLOGINUSER_REQUEST_REJECTED</p>
+ </td>
+ </tr>
+ <tr>
+ <td align="left" colspan="3" class="INPUTFORM">
+ <p>
+ $l10n.LOGINHELP_NOTICE
+ </p>
+ <center>
+ <a
href="mailto:$config.getString("mail.support")">$config.getString("mail.support")</a>
+ </center>
+ </td>
+ </tr>
+ </table>
+ </center>
</div>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
