From 06327233d37a442b31351b1eb09a73c261cf5659 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 1 Jun 2016 10:38:54 +0200 Subject: [PATCH] Continued a bit: - added resend_done.xhtml with using message_box.tpl - added navigation rule for above - used more h:outputText (remember that this is a WUI) - removed old-lost index.xhtml (user login area) - added i18n strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 129 +++++++++--------- .../localization/bundle_de_DE.properties | 3 + .../localization/bundle_en_US.properties | 3 + web/WEB-INF/faces-config.xml | 7 + web/guest/user/register_done.xhtml | 2 +- web/guest/user/resend_done.xhtml | 23 ++++ web/user/login_edit_user_data.xhtml | 2 +- 7 files changed, 103 insertions(+), 66 deletions(-) create mode 100644 web/guest/user/resend_done.xhtml diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index c81a6cbb..4efcbdfb 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,71 +2,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index badc84db..2d6a96a3 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -589,3 +589,6 @@ ADMIN_EXPORT_USER_ACCOUNT_STATUS=Accountstatus ADMIN_EXPORT_USERS_TITLE=Export der Benutzerdaten starten: ADMIN_EXPORT_USERS_TIMEOUT_WARNING=Bei sehr gro\u00dfen Datenmengen kann es eventuell zu Zeit\u00fcberschreitungen kommen. Daher sollten Sie besser seitenweise exportieren. BUTTON_ADMIN_EXPORT_USERS_XLS=Benutzerdaten als Excel-Datei +PAGE_TITLE_USER_RESEND_DONE=Neuen Best\u00e4tigungslink verschickt +CONTENT_TITLE_USER_RESEND_DONE=Neuen Best\u00e4tigungslink verschickt: +GUEST_USER_RESEND_LINK_COMPLETED=Es ist ein neuer Best\u00e4tigungslink an Ihre Email-Adresse unterwegs. Bitte kontrollieren Sie Ihr Mail-Postfach. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 54a4c14f..25d1f032 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -587,3 +587,6 @@ ADMIN_EXPORT_USER_ACCOUNT_STATUS=Account status ADMIN_EXPORT_USERS_TITLE=Start export of user data: ADMIN_EXPORT_USERS_TIMEOUT_WARNING=Big data amount may lead to timeouts. You should then try to export each page separately. BUTTON_ADMIN_EXPORT_USERS_XLS=User data as Excel file +PAGE_TITLE_USER_RESEND_DONE=New confirmation link sent +CONTENT_TITLE_USER_RESEND_DONE=New confirmation link sent: +GUEST_USER_RESEND_LINK_COMPLETED=A new confirmation link has been sent out to your email address. Please check your email box. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 8bde2fa7..6d3fcbd0 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -130,6 +130,13 @@ /user/login_index.xhtml + + /guest/user/resend_link.xhtml + + resend_done + /guest/user/resend_done.xhtml + + /guest/user/register.xhtml diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml index e89511e9..c4e8ab67 100644 --- a/web/guest/user/register_done.xhtml +++ b/web/guest/user/register_done.xhtml @@ -16,7 +16,7 @@
- #{msg.GUEST_USER_REGISTRATION_COMPLETED} +
diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml new file mode 100644 index 00000000..2cf5efea --- /dev/null +++ b/web/guest/user/resend_done.xhtml @@ -0,0 +1,23 @@ + + + + + #{msg.PAGE_TITLE_USER_RESEND_DONE} + + + #{msg.CONTENT_TITLE_USER_RESEND_DONE} + + + + + + + + + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index f0ff3779..1bd39597 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -18,7 +18,7 @@
- #{msg.LOGIN_EDIT_USER_DATA_TITLE} +
-- 2.39.5