From aba0f1e27b218a9f0e0fcb335327ce1a583d4424 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 2 Aug 2016 18:05:10 +0200 Subject: [PATCH] Continued a bit: (please cherry-pick) - all form ids now start with form_, fixed (maybe?) all occurrences MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AddressbookContactWebSessionBean.java | 2 +- .../AddressbookEmailChangeWebSessionBean.java | 2 +- .../AddressbookUserLoginWebSessionBean.java | 11 ++++-- ...bookAdminMobileProviderWebRequestBean.java | 2 +- .../admin_form_contact_cellphone.tpl | 2 +- .../generic/locale_selection_box.tpl | 2 +- .../templates/guest/user/guest_login_form.tpl | 2 +- .../register/guest_form_register_page1.tpl | 2 +- .../register/guest_form_register_page2.tpl | 2 +- .../register/guest_form_register_single.tpl | 2 +- web/admin/admin_logout.xhtml | 36 +++++++++++++++++++ web/admin/contact/admin_contact_delete.xhtml | 2 +- web/admin/contact/admin_contact_edit.xhtml | 2 +- web/admin/contact/admin_contact_list.xhtml | 2 +- .../admin_mobile_provider_list.xhtml | 2 +- web/admin/user/admin_user_unlock.xhtml | 4 ++- web/guest/user/lost_passwd.xhtml | 2 +- web/user/login_change_email_address.xhtml | 2 +- web/user/login_change_password.xhtml | 2 +- web/user/login_change_personal_data.xhtml | 2 +- web/user/login_logout.xhtml | 2 +- 21 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 web/admin/admin_logout.xhtml diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index bcf3acc1..3d1f284b 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -577,7 +577,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController throw new FaceletException("Not all required fields are set."); //NOI18N } else if (!this.userLoginController.ifCurrentPasswordMatches()) { // Password not matching - this.showFacesMessage("login_change_personal_form:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N + this.showFacesMessage("form_login_change_personal:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N return ""; //NOI18N } diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java index 15589bd0..13bc6bae 100644 --- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java @@ -117,7 +117,7 @@ public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookControl throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N } else if (!this.loginController.ifCurrentPasswordMatches()) { // Password not matching - this.showFacesMessage("login_change_email_address_form:currentPassword", new UserPasswordMismatchException(this.loginController.getLoggedInUser())); //NOI18N + this.showFacesMessage("form_login_change_email_address:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N return ""; //NOI18N } else if (!this.featureController.isFeatureEnabled("edit_user_data")) { //NOI18N // Editing is not allowed diff --git a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java index 50beb849..224255aa 100644 --- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java @@ -186,9 +186,14 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle // All fine return "login"; //NOI18N - } catch (final UserNotFoundException | UserStatusLockedException | UserStatusUnconfirmedException | UserPasswordMismatchException ex) { - // Throw again - throw new FaceletException(ex); + } catch (final UserNotFoundException | UserStatusLockedException | UserStatusUnconfirmedException ex) { + // Show JSF message + this.showFacesMessage("form_user_login:userName", ex); //NOI18N + return ""; //NOI18N + } catch (final UserPasswordMismatchException ex) { + // Show JSF message + this.showFacesMessage("form_user_login:userPassword", ex); //NOI18N + return ""; //NOI18N } } diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java index 0b54fdca..fc273d2e 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java @@ -114,7 +114,7 @@ public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressboo // Is the provider already created? if (this.isMobileProviderCreated(mobileProvider)) { // Then throw exception - this.showFacesMessage("add_mobile_provider_form:providerDialPrefix", new MobileProviderAlreadyAddedException(mobileProvider)); //NOI18N + this.showFacesMessage("form_add_mobile_provider:providerDialPrefix", new MobileProviderAlreadyAddedException(mobileProvider)); //NOI18N return ""; //NOI18N } diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl index 25dd7b39..914e9683 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl @@ -5,6 +5,6 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl index 142e73b4..3da8dafc 100644 --- a/web/WEB-INF/templates/generic/locale_selection_box.tpl +++ b/web/WEB-INF/templates/generic/locale_selection_box.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl index fc12202e..5bf518db 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- +
#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE} diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl index 42a0d452..870c4ffa 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
#{msg.GUEST_REGISTRATION_PAGE1_TITLE} diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl index 1e7e0a89..74f3291e 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
#{msg.GUEST_REGISTRATION_PAGE2_TITLE} diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl index e3e3b3a8..dc3cd180 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml new file mode 100644 index 00000000..34ec868b --- /dev/null +++ b/web/admin/admin_logout.xhtml @@ -0,0 +1,36 @@ + + + + + #{msg.PAGE_TITLE_ADMIN_LOGOUT} + + + #{msg.CONTENT_TITLE_ADMIN_LOGOUT} + + + + +
+
+ +
+ +
+ +
+ +
+ + +
+
+ + + + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index e203fd2a..0e949e8a 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -22,7 +22,7 @@ - +
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index bbc2b89d..642dbc8f 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -22,7 +22,7 @@ - +
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 40f1ff99..b01ffd2e 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -70,7 +70,7 @@
- +
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index d1480294..ba052003 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -61,7 +61,7 @@ - +
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index 7124aca2..2e00380a 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -22,7 +22,9 @@ - Here goes your content. + + + diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml index a38e12f9..2ff7f1ec 100644 --- a/web/guest/user/lost_passwd.xhtml +++ b/web/guest/user/lost_passwd.xhtml @@ -17,7 +17,7 @@
- +
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index d42ad5a4..f329ea45 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -21,7 +21,7 @@
- +
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index b275c222..fe0e4036 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -22,7 +22,7 @@
- +
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index 088c5581..0676793f 100644 --- a/web/user/login_change_personal_data.xhtml +++ b/web/user/login_change_personal_data.xhtml @@ -21,7 +21,7 @@
- + diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index 8d8c61f1..3820f96c 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -15,7 +15,7 @@ - +
-- 2.39.2