paulsp 01/12/17 14:55:22
Modified: src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization.properties
JetspeedLocalization_de.properties
JetspeedLocalization_en.properties
JetspeedLocalization_es.properties
JetspeedLocalization_fr.properties
webapp/WEB-INF/templates/vm/screens/html NewAccount.vm
Log:
o Return NewAccount.vm to 1.3a1 look and feel
o General cleanup of NewAccount.vm including:
Indenting the HTML for readability
Fixing the the velocity syntax around account approvals
o Removed English version of NEWACCOUNT_xxx properties. They are the
same as the default, so why maintain both.
o Updates default values for some NEWACCOUNT_xxx properties
o Removed "Jespeed - " from CONFIRMREGISTRATION_TITLE property
Revision Changes Path
1.5 +4 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization.properties
Index: JetspeedLocalization.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedLocalization.properties 2001/12/16 07:11:31 1.4
+++ JetspeedLocalization.properties 2001/12/17 22:55:22 1.5
@@ -44,7 +44,7 @@
UPDATEACCOUNT_NOUSER=Could not find correct user.
UPDATEACCOUNT_NEWEMAILCONFIRM=You have changed your email address. You must
re-confirm in order to continue using the system. Please check your email account.
-CONFIRMREGISTRATION_TITLE=Jetspeed - Confirm Registration
+CONFIRMREGISTRATION_TITLE=Confirm Registration
CONFIRMREGISTRATION_NOUSERNAME=Sorry, a username must be available.
CONFIRMREGISTRATION_MESSAGE=Please check your email and enter your secret key to
confirm your registration:
CONFIRMREGISTRATION_SECRETKEYTITLE=Secret Key:
@@ -67,9 +67,8 @@
NEWACCOUNT_TITLE=Create a new Jetspeed account
NEWACCOUNT_NOTICE=To create a new account, please fill in all of the fields below.
-NEWACCOUNT_CONFIRMATION=After your account has been created, you will receive an
email with a confirmation key. <br />\
-Enter the confirmation key that you received in the email on the next screen in
order to confirm your registration with the system. <br />
-NEWACCOUNT_APPROVAL=After your account has been created it will be passed to
someone to deal with.
+NEWACCOUNT_CONFIRMATION=After your account has been created, you will receive an
email with a Secret Key. Enter the Secret Key on the next screen to enable the
account.
+NEWACCOUNT_APPROVAL=The account creation process include an approval step. An
email will be sent when you account is aproved or rejected.
#Text before user's full name, i.e. Welcome Joe Smith
TOP_USERWELCOMEMSG=Welcome
@@ -88,7 +87,7 @@
MAINMENU_WELCOMEMSG=Welcome
-NEWACCOUNT_TITLE=Jetspeed - Create New Account
+NEWACCOUNT_TITLE=Create New Account
NEWACCOUNT_INFOMSG1=To create a new account, please fill in all of the fields
below.
NEWACCOUNT_INFOMSG2=After your account has been created, you will receive an email
with a confirmation key.
NEWACCOUNT_INFOMSG3=Enter the confirmation key that you received in the email on
the next screen in order to confirm your registration with the system.
1.4 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties
Index: JetspeedLocalization_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedLocalization_de.properties 2001/12/16 07:11:31 1.3
+++ JetspeedLocalization_de.properties 2001/12/17 22:55:22 1.4
@@ -47,7 +47,7 @@
UPDATEACCOUNT_NOUSER=Es konnte kein Nutzer gefunden werden.
UPDATEACCOUNT_NEWEMAILCONFIRM=Sie haben Ihre E-Mail Adresse ge�ndert. Sie m�ssen
Sie nochmal best�tigen um dieses System weiter benutzen zu k�nnen. Bitte �berpr�fen
Sie Ihren E-Mail Account.
-CONFIRMREGISTRATION_TITLE=Jyve - Registrierung best�tigen
+CONFIRMREGISTRATION_TITLE= Registrierung best\u00E4tigen
CONFIRMREGISTRATION_NOUSERNAME=Sie m�ssen einen Benutzernamen haben.
CONFIRMREGISTRATION_MESSAGE=Bitte rufen Sie Ihre E-Mails ab und tragen Sie Ihren
Authorisierungscode ein um Ihre Registrierung zu best�tigen:
CONFIRMREGISTRATION_SECRETKEYTITLE=Authorisierungs-code:
1.3 +1 -23
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalization_en.properties 2001/12/16 07:11:31 1.2
+++ JetspeedLocalization_en.properties 2001/12/17 22:55:22 1.3
@@ -44,7 +44,7 @@
UPDATEACCOUNT_NOUSER=Could not find correct user.
UPDATEACCOUNT_NEWEMAILCONFIRM=You have changed your email address. You must
re-confirm in order to continue using the system. Please check your email account.
-CONFIRMREGISTRATION_TITLE=Jetspeed - Confirm Registration
+CONFIRMREGISTRATION_TITLE=Confirm Registration
CONFIRMREGISTRATION_NOUSERNAME=Sorry, a username must be available.
CONFIRMREGISTRATION_MESSAGE=Please check your email and enter your secret key to
confirm your registration:
CONFIRMREGISTRATION_SECRETKEYTITLE=Secret Key:
@@ -65,12 +65,6 @@
USERFORM_UPDATE=Update Account
USERFORM_CREATE=Create New Account
-NEWACCOUNT_TITLE=Create a new Jetspeed account
-NEWACCOUNT_NOTICE=To create a new account, please fill in all of the fields below.
-NEWACCOUNT_CONFIRMATION=After your account has been created, you will receive an
email with a confirmation key. <br />\
-Enter the confirmation key that you received in the email on the next screen in
order to confirm your registration with the system. <br />
-NEWACCOUNT_APPROVAL=After your account has been created it will be passed to
someone to deal with.
-
TOP_TITLE=Welcome to Jetspeed
TOP_USERNAMEMSG=Username:
TOP_PASSWORDMSG=Password:
@@ -83,19 +77,3 @@
LEFT_DOCUMENTATION=Documentation
HOME=Home
-
-MAINMENU_WELCOMEMSG=Welcome
-
-NEWACCOUNT_TITLE=Jetspeed - Create New Account
-NEWACCOUNT_INFOMSG1=To create a new account, please fill in all of the fields
below.
-NEWACCOUNT_INFOMSG2=After your account has been created, you will receive an email
with a confirmation key.
-NEWACCOUNT_INFOMSG3=Enter the confirmation key that you received in the email on
the next screen in order to confirm your registration with the system.
-NEWACCOUNT_INFOEMAILMSG=A valid email address is required!
-NEWACCOUNT_USERNAMEMSG=Username:
-NEWACCOUNT_PASSWORDMSG=Password:
-NEWACCOUNT_PASSWORDCONFIRMMSG=Password (confirm):
-NEWACCOUNT_FIRSTNAMEMSG=First Name:
-NEWACCOUNT_LASTNAMEMSG=Last Name:
-NEWACCOUNT_EMAILMSG=Email:
-NEWACCOUNT_CANCEL=Cancel
-NEWACCOUNT_CREATE=Create New Account
\ No newline at end of file
1.3 +3 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties
Index: JetspeedLocalization_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalization_es.properties 2001/12/16 07:11:31 1.2
+++ JetspeedLocalization_es.properties 2001/12/17 22:55:22 1.3
@@ -1,4 +1,4 @@
-# $Id: JetspeedLocalization_es.properties,v 1.2 2001/12/16 07:11:31 paulsp Exp $
+# $Id: JetspeedLocalization_es.properties,v 1.3 2001/12/17 22:55:22 paulsp Exp $
#
[EMAIL PROTECTED]
@@ -7,7 +7,7 @@
CONFIRMREGISTRATION_MESSAGE=Please check your email and enter your secret key to
confirm your registration:
CONFIRMREGISTRATION_NOUSERNAME=Sorry, a username must be available.
CONFIRMREGISTRATION_SECRETKEYTITLE=Secret Key:
-CONFIRMREGISTRATION_TITLE=Jetspeed - Confirm Registration
+CONFIRMREGISTRATION_TITLE=Confirm Registration
CREATENEWUSERANDCONFIRM_CHOOSENEWNAME=Sorry, that username already exists. Please
choose another.
CREATENEWUSERANDCONFIRM_CREATE=Your new account has been created!
@@ -70,8 +70,7 @@
NEWACCOUNT_TITLE=Crear una cuenta de Jetspeed
NEWACCOUNT_NOTICE=Para crear una nueva cuenta, por favor, rellene todos los campos.
-NEWACCOUNT_CONFIRMATION=Cuando su cuenta haya sido generada, recibir� un correo con
un clave de confirmaci�n <br />\
-Introduzca la clave de confirmaci�n que recibio en el correo en la siguiente p�gina
para confirmar su cuenta en Jetspeed. <br />
+NEWACCOUNT_CONFIRMATION=Cuando su cuenta haya sido generada, recibir\u00E1 un
correo con un clave de confirmaci\u00F3n Introduzca la clave de confirmaci\u00F3n que
recibio en el correo en la siguiente p\u00E1gina para confirmar su cuenta en Jetspeed.
<br />
NEWACCOUNT_APPROVAL=Cuando su cuenta haya sido creada, se informar� a alguien para
su aprobaci�n.
SENDCONFIRMATIONEMAIL_BODY1=Bienvenido a Jetspeed Portal de Apache. Su nueva cuenta
ha sido\n\
1.5 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties
Index: JetspeedLocalization_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedLocalization_fr.properties 2001/12/16 07:11:31 1.4
+++ JetspeedLocalization_fr.properties 2001/12/17 22:55:22 1.5
@@ -46,7 +46,7 @@
UPDATEACCOUNT_NOUSER=Impossible de trouver un utilisateur correct.
UPDATEACCOUNT_NEWEMAILCONFIRM=Vous avez chang� d'adresse email. Vous devez
re-confirmer afin de pouvoir continuer � utiliser le syst�me. Merci de regarder votre
courrier.
-CONFIRMREGISTRATION_TITLE=Jyve - Confirmation d'Enregistrement
+CONFIRMREGISTRATION_TITLE=Confirmation d'Enregistrement
CONFIRMREGISTRATION_NOUSERNAME=D�sol�, un identifiant doit �tre fourni.
CONFIRMREGISTRATION_MESSAGE=Merci de v�rifier votre email et de fournir votre clef
secr�te pour confirmer votre enregistrement :
CONFIRMREGISTRATION_SECRETKEYTITLE=Clef Secr�te:
@@ -75,7 +75,7 @@
TOP_LOGINBTN=Identification
MAINMENU_WELCOMEMSG=Bienvenue
-NEWACCOUNT_TITLE=Jetspeed - Cr�er un Nouveau Compte
+NEWACCOUNT_TITLE=Cr\u00E9er un Nouveau Compte
NEWACCOUNT_INFOMSG1=Afin de cr�er un nouveau compte, merci de remplir tous les
champs suivants.
NEWACCOUNT_INFOMSG2=Apr�s la cr�ation de votre compte, vous recevrez un email avec
une clef de confirmation.
NEWACCOUNT_INFOMSG3=Entrez la clef de confirmation que vous devez avoir re�u par
email dans l'�cran suivant pour confirmer votre enregistrement dans le syst�me.
1.9 +91 -62
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm
Index: NewAccount.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NewAccount.vm 2001/12/10 03:42:26 1.8
+++ NewAccount.vm 2001/12/17 22:55:22 1.9
@@ -1,67 +1,96 @@
-<div align="left">
- <center>
- <table cellpadding="4" cellspacing="0" border="1" class=INPUTFORM>
- <tr>
- <td>
- <p>
- <h2>$l10n.NEWACCOUNT_TITLE</h2>
- <p>$l10n.NEWACCOUNT_NOTICE<br />
- #if ( $config.getBoolean("newuser.approval.enable") == "false" )
- #if ( $config.getBoolean("newuser.confirm.enable") == "true" )
- $l10n.NEWACCOUNT_CONFIRMATION
+<div>
+ <center>
+ <h1>$l10n.NEWACCOUNT_TITLE</h1>
+ </center>
+ <br>
+ <center>
+ <table cellpadding="0" cellspacing="0" border="1" width="50%">
+ <tr>
+ <td>
+ <p>$l10n.NEWACCOUNT_NOTICE</p>
+ #if ( $config.getBoolean("newuser.approval.enable") == false )
+ #if ( $config.getBoolean("newuser.confirm.enable") == true )
+ <p>$l10n.NEWACCOUNT_CONFIRMATION</p>
#end
#else
- $l10n.NEWACCOUNT_APPROVAL<br />
+ <p>$l10n.NEWACCOUNT_APPROVAL</p>
#end
- <b>$l10n.NEWACCOUNT_INFOEMAILMSG</b>
- </p>
-#if ($data.Message)
- <b>$data.Message</b>
- <p />
-#end
- <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="CreateNewUserAndConfirm" />
-
- <center>
- <table cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td> $l10n.USERFORM_USERNAMEMSG </td>
- <td align=right><input name="username" type="TEXT"
value="$!data.Parameters.getString("username")" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_PASSWORDMSG </td>
- <td align=right><input name="password" type="PASSWORD" value="" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
- <td align=right><input name="password_confirm" type="PASSWORD" value=""
/> </td>
- </tr>
- <tr>
- <td colspan="2"> <hr size="1" noshade /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_FIRSTNAMEMSG </td>
- <td align=right><input name="firstname" type="TEXT"
value="$!data.Parameters.getString("firstname")" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_LASTNAMEMSG </td>
- <td align=right><input name="lastname" type="TEXT"
value="$!data.Parameters.getString("lastname")" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_EMAILMSG </td>
- <td align=right><input name="email" type="TEXT"
value="$!data.Parameters.getString("email")" /> </td>
- </tr>
- <tr>
- <td colspan=2> </td>
- </tr>
- <tr>
- <td align=left><input name="submit1" type="reset"
value="$l10n.USERFORM_RESET" class="BUTON"/></td>
- <td align=right><input name="submit2" type="submit"
value="$l10n.USERFORM_CREATE" class="BUTON"/></td>
- </tr>
- </table>
- </center>
- </td>
+ #if ($data.Message)
+ ## Message include account creation failure messages.
+ <p><b>$data.Message</b></p>
+ #end
+ <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="CreateNewUserAndConfirm">
+ <center>
+ <table cellpadding="0" cellspacing="1" border="0">
+ <tr>
+ <td>$l10n.USERFORM_USERNAMEMSG</td>
+ <td> </td>
+ <td align="right">
+ <input name="username" type="TEXT"
value="$!data.Parameters.getString("username")">
+ </td>
+ </tr>
+ <tr>
+ <td>$l10n.USERFORM_PASSWORDMSG</td>
+ <td> </td>
+ <td align="right">
+ <input name="password" type="PASSWORD" value="">
+ </td>
+ </tr>
+ <tr>
+ <td>$l10n.USERFORM_PASSWORDCONFIRMMSG</td>
+ <td> </td>
+ <td align="right">
+ <input name="password_confirm" type="PASSWORD" value="">
+ </td>
+ </tr>
+ <tr>
+ <td>$l10n.USERFORM_FIRSTNAMEMSG</td>
+ <td> </td>
+ <td align="right">
+ <input name="firstname" type="TEXT"
value="$!data.Parameters.getString("firstname")">
+ </td>
+ </tr>
+ <tr>
+ <td>$l10n.USERFORM_LASTNAMEMSG</td>
+ <td> </td>
+ <td align="right">
+ <input name="lastname" type="TEXT"
value="$!data.Parameters.getString("lastname")">
+ </td>
+ </tr>
+ <tr>
+ <td>$l10n.USERFORM_EMAILMSG</td>
+ <td> </td>
+ <td align="right">
+ <input name="email" type="TEXT"
value="$!data.Parameters.getString("email")">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">$l10n.NEWACCOUNT_INFOEMAILMSG</td>
+ </tr>
+ <tr>
+ <td colspan="3"> </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <table width="100%">
+ <tr>
+ <td align="right" width="40%">
+ <input name="submit1" type="reset"
value="$l10n.USERFORM_RESET">
+ </td>
+ <td width="10%"> </td>
+ <td align="left" width="40%">
+ <input name="submit2" type="submit"
value="$l10n.USERFORM_CREATE">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </center>
+ </form>
+ </td>
+ </tr>
</table>
- </center>
- </form>
+ </center>
</div>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
