Continued a bit: (please cherry-pick)

- all form ids now start with form_, fixed (maybe?) all occurrences

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

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
index 7af3f8523b497a6bc0f8cddb1a27f81736e0915c..0660eb0b755aea538d1405f2654cea742ef80269 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
@@ -568,7 +568,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                        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/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java
index a72fbd55dad47496a731fb14a7c24a9b41928de5..513473670b7fca31fc1c39a2ad2871e5b078971b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java
@@ -117,7 +117,7 @@ public class PizzaEmailChangeWebSessionBean extends BasePizzaController implemen
                        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/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
index d0b04b2274c271f3ab7e99ac8237c9ddcfa1ec78..d7f75db77851ac318adc0e03ec44ae185ca5c672 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
@@ -185,9 +185,14 @@ public class PizzaUserLoginWebSessionBean extends BasePizzaController implements
 
                        // 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/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java
index d384acce65e51c41c3dc4d32187ccef8b4aadf65..15e56bbb7d4f35b6ea5aeb8dc65f177d7b6878d2 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java
@@ -114,7 +114,7 @@ public class PizzaAdminMobileProviderWebRequestBean extends BasePizzaController
                // 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 25dd7b39f01c3701425ea50f14ffcf77a7eb5f13..914e968340c751a6946744ac211cf3511e5d6d2f 100644 (file)
--- 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">
 
-       <h:form id="add_contact_cellphone">
+       <h:form id="form_add_contact_cellphone">
        </h:form>
 </ui:composition>

diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl
index 142e73b4ae6bb8b4b448f26b0dacf1c5a66a3874..3da8dafc39ed3cd8041a63d61593cdb5ea31f308 100644 (file)
--- 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">
 
-       <h:form id="locale_selection">
+       <h:form id="form_locale_selection">
                <h:selectOneMenu id="language_selection" value="#{localizationController.language}" onchange="submit()">
                        <f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" />
                        <f:selectItems value="#{localizationController.selectableLocalizations}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />

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 fc12202ea7486a91ac8bb4bb2f92c83d9e275764..5bf518db02f551d08de9c4e30f964dd6dcbeb996 100644 (file)
--- 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">
 
        <div id="user_login_content">
-               <h:form id="login_form">
+               <h:form id="form_user_login">
                        <div class="table">
                                <div class="table_header">
                                        #{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 42a0d45240c7f019f952d9c7305f5aa3f7eb1153..870c4ffaf4892b984ebc5c63f5c087b9497d7221 100644 (file)
--- 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">
 
 
-       <h:form id="register_page1_form">
+       <h:form id="form_register_page1">
                <div class="table">
                        <div class="table_header">
                                #{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 1e7e0a89c5975bb5e890bc45a188746c6d2c9c47..74f3291ebceb1bb1fc750db8e09bc515eccc2e90 100644 (file)
--- 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">
 
-       <h:form id="register_page2_form">
+       <h:form id="form_register_page2">
                <div class="table">
                        <div class="table_header">
                                #{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 e3e3b3a81f18bc6b3f06a29110db8c0565fd9ce1..dc3cd1805b4dc4403d0c79402e5f9d2afc5d4601 100644 (file)
--- 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">
 
-       <h:form id="register_single_form">
+       <h:form id="form_register_single">
                <div class="table">
                        <div class="table_header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
new file mode 100644 (file)
index 0000000..34ec868
--- /dev/null
+++ b/web/admin/admin_logout.xhtml
@@ -0,0 +1,36 @@
+<!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/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_LOGOUT}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:form id="form_admin_logout">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
+                                       </div>
+
+                                       <div class="para">
+                                               <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
+                                       </div>
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
+                                       </div>
+                               </div>
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index e203fd2a882aa01adda7a5deb4ec36785a479916..0e949e8a5391d46f957f2d49f5d48b50d8972d18 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -22,7 +22,7 @@
                <ui:define name="content">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
-                       <h:form id="admin_edit_user" rendered="#{not empty beanHelper.contact}">
+                       <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index bbc2b89d5898939d004d39b420f13bedafb2e9b9..642dbc8fec33a137868e972057a72ad199fda139 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -22,7 +22,7 @@
                <ui:define name="content">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
-                       <h:form id="admin_edit_user" rendered="#{not empty beanHelper.contact}">
+                       <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 40f1ff996a7f862ce32651c00c26348b954a4b7a..b01ffd2ebaf115b3dbcba2419b41ad72b97806ed 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -70,7 +70,7 @@
                        </h:dataTable>
 
                        <div class="table_medium">
-                               <h:form id="admin_add_contact">
+                               <h:form id="form_admin_add_contact">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
                                        </div>

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index d14802947373b9d28080f61fecabc0545e4d08b1..ba05200373e17e54599b871adb7cbe729ca51ba0 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -61,7 +61,7 @@
                                </h:column>
                        </h:dataTable>
 
-                       <h:form id="add_mobile_provider_form">
+                       <h:form id="form_add_mobile_provider">
                                <div class="table_medium">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 7124aca2126c50b8e92036af6131cf0401dbf100..2e00380a255a0163b15e2280bcabd908c1c39611 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -22,7 +22,9 @@
                <ui:define name="content">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
-                       Here goes your content.
+                       <h:form id="form_admin_user_unlock">
+                               
+                       </h:form>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index 267b61f02c220382490d75500c0bcfa45ba6f171..8a10e83896636f1eca2dafdd92e76eb10139c4d8 100644 (file)
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -17,7 +17,7 @@
                <ui:define name="content">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
                                <div class="para" id="user_lost_password_content">
-                                       <h:form id="lost_password_form">
+                                       <h:form id="form_lost_password">
                                                <div class="table">
                                                        <div class="table_header">
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index d42ad5a4a962cc6f8a80b9791512a68a707aa746..f329ea456e25c7147a37c948a76c182da53d12e5 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -21,7 +21,7 @@
                                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                                        </div>
 
-                                       <h:form id="login_change_email_address_form">
+                                       <h:form id="form_login_change_email_address">
                                                <div class="para">
                                                        <fieldset id="change_email">
                                                                <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index b275c22212878462513752c053a7e91f495a6834..fe0e40369bc8f39fa87504466cbf47857ffca77f 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -22,7 +22,7 @@
                                                        <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
                                                </div>
 
-                                               <h:form id="login_form">
+                                               <h:form id="form_user_change_password">
                                                        <div class="para">
                                                                <fieldset id="change_password">
                                                                        <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">

diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index 088c5581c62d22614f171cd209305366917a837f..0676793faac5563a30f18c262fb27035019e4346 100644 (file)
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -21,7 +21,7 @@
                                                <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
                                        </div>
 
-                                       <h:form id="login_change_personal_form">
+                                       <h:form id="form_login_change_personal">
                                                <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
                                                <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />

diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index 8d8c61f18466de5f4eee73e99892bf2f07f2cf87..3820f96cba9a42077b39228a5aa703afbc0f7c8a 100644 (file)
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -15,7 +15,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
+                       <h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />