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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index f046ee6d6a8d7bf9457e9f6f7e79f3efc0edd9d9..8cb31c1482e1033764f37a6f59b559c44eaa0db3 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,82 +2,84 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="900" y="1350" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="privacy.xhtml" x="2150" y="600" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="400" y="1500" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="2650" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/index.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="customer/register.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="item_added.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="index.xhtml" x="2400" y="450" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="*" x="900" y="1200" zoom="true"/>
-        <Node id="customer/login.xhtml" x="1400" y="1050" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="1900" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="1500" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_export.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="2900" y="150" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="exception.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="terms.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="1150" y="1200" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="logout.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1650" y="900" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="imprint.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="150" y="1650" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="2150" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="650" y="1500" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1400" y="1050" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="customer/register.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="item_added.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="900" y="1350" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="1150" y="1200" zoom="true"/>
+        <Node id="*" x="400" y="300" zoom="true"/>
+        <Node id="customer/login.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/login.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="1800" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/user/admin_user_export.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="guest/user/resend_done.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="1900" y="750" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="1650" y="900" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="400" y="1650" zoom="true"/>
+        <Node id="basket.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="exception.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="2400" y="450" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="terms.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="logout.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="2650" y="300" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="imprint.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="2900" y="150" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="900" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index d4c9cd22afa01fecd97bf20e355c4d02c40715c3..3fc2383a594ac8646fd09db00768a55128f0024c 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -561,3 +561,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 072794e07a16579492dedd25e1edaf17053d88fa..21d84d9697e5b87650c14cb676ace4c8397b10aa 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -545,3 +545,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 9f933d4b5c1da3ecc53a95e795ec1990aa2c0713..7da31520e71a3ae455086400350192a192f0b616 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -131,6 +131,13 @@
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/guest/user/resend_link.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>resend_done</from-outcome>
+                       <to-view-id>/guest/user/resend_done.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/guest/user/register.xhtml</from-view-id>
                <navigation-case>

diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index e89511e94faa63187a8c3a6a80c55b3ac6f646da..c4e8ab67142ab7bbb45dabdb3bf07791f8a6df16 100644 (file)
--- a/web/guest/user/register_done.xhtml
+++ b/web/guest/user/register_done.xhtml
@@ -16,7 +16,7 @@
 
                <ui:define name="content">
                        <div class="para">
-                               #{msg.GUEST_USER_REGISTRATION_COMPLETED}
+                               <h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
                        </div>
 
                        <div class="registration_form">

diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml
new file mode 100644 (file)
index 0000000..2cf5efe
--- /dev/null
+++ b/web/guest/user/resend_done.xhtml
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_RESEND_DONE}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_RESEND_DONE}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+                       </ui:include>
+               </ui:define>
+       </ui:composition>
+</html>

diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index dca0bc27fdeb55dfb0561e8034936c8f292779e9..0d6c0fc1d9166e9b1d8625929e798cba2b7d78c2 100644 (file)
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -18,7 +18,7 @@
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
-                                               #{msg.LOGIN_EDIT_USER_DATA_TITLE}
+                                               <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
                                        </div>
 
                                        <div class="para notice">