From c3475ea4227f552785d8e7353014dc99090f8241 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 --- .../contact/JobsContactWebSessionBean.java | 2 +- .../JobsEmailChangeWebSessionBean.java | 2 +- .../login/JobsUserLoginWebSessionBean.java | 11 +++-- ...JobsAdminMobileProviderWebRequestBean.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 | 8 ++-- web/user/login_change_personal_data.xhtml | 2 +- web/user/login_logout.xhtml | 40 +++++++++++++++++++ 21 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 web/admin/admin_logout.xhtml create mode 100644 web/user/login_logout.xhtml diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java index 2643123b..840af12e 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java @@ -542,7 +542,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java index acb23c4e..227f39bf 100644 --- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java @@ -110,7 +110,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N } else if (!this.userLoginController.ifCurrentPasswordMatches()) { // Password not matching - this.showFacesMessage("login_change_email_address_form:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N + this.showFacesMessage("form_login_change_email_address:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N return ""; //NOI18N } diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index bad61103..e2fcec24 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java @@ -144,9 +144,14 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J // 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/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java index f4486b21..c8a2ba85 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java @@ -114,7 +114,7 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsController im // 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 f35299de..1da2f1ab 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 516b5025..ee814a92 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" 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 465fc01f..022de70f 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 d26fd581..d64728e6 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 a6280685..df867ca2 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 1c8c6021..ae17f9f9 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -2,10 +2,10 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > #{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD} diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index 64a62680..6b0f2569 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 new file mode 100644 index 00000000..3820f96c --- /dev/null +++ b/web/user/login_logout.xhtml @@ -0,0 +1,40 @@ + + + + + #{msg.PAGE_TITLE_LOGIN_USER_LOGOUT} + + + #{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT} + + + + +
+
+ +
+ +
+ +
+ +
+ + +
+
+ + + + + + + + -- 2.39.5