From: Roland Häder <roland@mxchange.org>
Date: Tue, 2 Aug 2016 16:05:10 +0000 (+0200)
Subject: Continued a bit: (please cherry-pick)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aba0f1e27b218a9f0e0fcb335327ce1a583d4424;p=jfinancials-war.git

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/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">
 
-	<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 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">
 
-	<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 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">
 
 	<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 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">
 
 
-	<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 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">
 
-	<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 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">
 
-	<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
index 00000000..34ec868b
--- /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 e203fd2a..0e949e8a 100644
--- 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 bbc2b89d..642dbc8f 100644
--- 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 40f1ff99..b01ffd2e 100644
--- 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 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 @@
 				</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 7124aca2..2e00380a 100644
--- 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 a38e12f9..2ff7f1ec 100644
--- 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 d42ad5a4..f329ea45 100644
--- 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 b275c222..fe0e4036 100644
--- 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 088c5581..0676793f 100644
--- 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 8d8c61f1..3820f96c 100644
--- 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}" />