diff --git a/etc/TODO.md b/etc/TODO.md index 2929574d..ce172bd4 100644 --- a/etc/TODO.md +++ b/etc/TODO.md @@ -123,5 +123,5 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d * fixed #265 make release with maven plugin ## 2.3.24 -* issue #277 heroku: Compiled slug size: 617.9M is too large (max is 500M) +* fixed #277 heroku: Compiled slug size: 617.9M is too large (max is 500M) * fixed #279 Formular Layout Errors diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java index 1ad43430..75452e58 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java +++ b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java @@ -73,7 +73,7 @@ public final String registerPost( return "user/register/registerForm"; } else { userRegistrationService.registrationSendEmailTo(userRegistrationForm.getEmail()); - return "user/register/registerSentMail"; + return "registerConfirmSentMail"; } } else { String objectName = "userRegistrationForm"; @@ -106,9 +106,9 @@ public final String registerConfirmGet( UserAccountForm userAccountForm = new UserAccountForm(); userAccountForm.setUserEmail(o.getEmail()); model.addAttribute("userAccountForm", userAccountForm); - return "user/register/registerConfirmed"; + return "registerConfirmForm"; } else { - return "user/register/registerNotConfirmed"; + return "registerConfirmFailed"; } } @@ -137,7 +137,7 @@ public final String registerConfirmPost( if (!result.hasErrors() && passwordsMatch) { userAccountService.createUser(userAccountForm); userRegistrationService.registrationUserCreated(oUserRegistration); - return "user/register/registerDone"; + return "registerConfirmFinished"; } else { if (!passwordsMatch) { String objectName = "userAccountForm"; @@ -146,10 +146,10 @@ public final String registerConfirmPost( FieldError e = new FieldError(objectName, field, defaultMessage); result.addError(e); } - return "user/register/registerConfirmed"; + return "registerConfirmForm"; } } else { - return "user/register/registerNotConfirmed"; + return "registerConfirmFailed"; } } } diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index e4bb96ce..63faf3b7 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -21,7 +21,8 @@ user.registerNotConfirmed.h1=Registration als neuer Benutzer user.registerForm.button=Registrieren user.registerForm.h1=Registration als neuer Benutzer user.registerSentMail.h1=Registration als neuer Benutzer -user.registerSentMail.text=Zur Verifikation Ihrer Email-Adresse haben wir Ihnen eine Email gesendet. Bitte schauen Sie in Ihr Email-Postfach. +user.registerSentMail.text=Zur Verifikation Ihrer Email-Adresse haben wir Ihnen eine Email gesendet. +user.registerSentMail.action= Bitte schauen Sie in Ihr Email-Postfach. user.resetPasswordConfirmed.button=Neues Passwort speichern user.resetPasswordConfirmed.h1=Passwort zurück setzen user.resetPasswordConfirmed.password=Neues Passwort diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index ce7cf555..400baa60 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -266,4 +266,5 @@ user.loginForm.email.label=Email user.loginForm.email.placeholder=Enter your Email user.loginForm.password.label=Password user.loginForm.password.placeholder=Enter your Password +user.registerSentMail.action=Please check the Inbox of your Email-Client. diff --git a/src/main/resources/templates/user/register/registerConfirmFailed.html b/src/main/resources/templates/user/register/registerConfirmFailed.html new file mode 100644 index 00000000..2f469b1a --- /dev/null +++ b/src/main/resources/templates/user/register/registerConfirmFailed.html @@ -0,0 +1,41 @@ + + + + Title + + + +
+

+ Register as new User +

+
+ +
+
+
+ Register as new User +
+
+
+
+

+ Sorry. There is no registration known for your Request. +

+
+
+
+
+
+ back +
+
+
+ + + + diff --git a/src/main/resources/templates/user/register/registerDone.html b/src/main/resources/templates/user/register/registerConfirmFinished.html similarity index 100% rename from src/main/resources/templates/user/register/registerDone.html rename to src/main/resources/templates/user/register/registerConfirmFinished.html diff --git a/src/main/resources/templates/user/register/registerConfirmForm.html b/src/main/resources/templates/user/register/registerConfirmForm.html new file mode 100644 index 00000000..87dd506f --- /dev/null +++ b/src/main/resources/templates/user/register/registerConfirmForm.html @@ -0,0 +1,93 @@ + + + + Title + + + +
+

+ Register as new User +

+
+ +
+
+
+
+ Register as new User +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ + + + diff --git a/src/main/resources/templates/user/register/registerConfirmSentMail.html b/src/main/resources/templates/user/register/registerConfirmSentMail.html new file mode 100644 index 00000000..b009c763 --- /dev/null +++ b/src/main/resources/templates/user/register/registerConfirmSentMail.html @@ -0,0 +1,41 @@ + + + + Title + + + +
+

+ Register as new User +

+
+ +
+
+
+ Register as new User +
+
+
+
+

+ Verification needed. Sent an email to the given address. +

+
+
+
+
+
+ Please check the Inbox of your Email-Client. +
+
+
+
+ + + diff --git a/src/main/resources/templates/user/register/registerConfirmed.html b/src/main/resources/templates/user/register/registerConfirmed.html deleted file mode 100644 index 1df17f4a..00000000 --- a/src/main/resources/templates/user/register/registerConfirmed.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - Title - - - -
-

- Register as new User -

-
- -
-
-
- -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
- -
-
-
- - - - diff --git a/src/main/resources/templates/user/register/registerNotConfirmed.html b/src/main/resources/templates/user/register/registerNotConfirmed.html deleted file mode 100644 index 5b91d89a..00000000 --- a/src/main/resources/templates/user/register/registerNotConfirmed.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - Title - - - -
-

- Register as new User -

-
- -
-
-

- Sorry. There is no registration known for your Request. -

-
-
- - - - \ No newline at end of file diff --git a/src/main/resources/templates/user/register/registerSentMail.html b/src/main/resources/templates/user/register/registerSentMail.html deleted file mode 100644 index acc83357..00000000 --- a/src/main/resources/templates/user/register/registerSentMail.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - Title - - - -
-

- Register as new User -

-
- -
-
-

- Verification needed. Sent an email to the given address. Please check your Inbox. -

-
-
- - - - - \ No newline at end of file