From bcd81ec284fd29db59131fa0de98fabba412f5b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 27 Aug 2017 15:23:58 +0200
Subject: [PATCH] Please cherry-pick: - convention: always have error messages
 above "normal tags" (in case of   error-free operation)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../unlink/admin_contact_fax_unlink.xhtml     |  8 ++++----
 .../unlink/admin_contact_mobile_unlink.xhtml  |  8 ++++----
 web/admin/fax/admin_fax_delete.xhtml          |  4 ++--
 web/admin/fax/admin_fax_edit.xhtml            |  4 ++--
 .../landline/admin_landline_delete.xhtml      |  4 ++--
 web/admin/landline/admin_landline_edit.xhtml  |  4 ++--
 web/admin/mobile/admin_mobile_delete.xhtml    |  4 ++--
 web/admin/mobile/admin_mobile_edit.xhtml      |  4 ++--
 web/guest/user/user_list.xhtml                |  4 ++--
 web/guest/user/user_login.xhtml               |  4 ++--
 web/guest/user/user_lost_password.xhtml       |  4 ++--
 web/guest/user/user_register.xhtml            |  8 ++++----
 web/guest/user/user_resend_link.xhtml         |  4 ++--
 web/user/login_user_change_password.xhtml     | 12 +++++------
 .../login_user_change_personal_data.xhtml     | 20 +++++++++----------
 15 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index fa547e08..34f45fa8 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -24,6 +24,10 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+
 		<h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -50,10 +54,6 @@
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
 		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
 			<f:param value="#{adminContactPhoneController.phoneId}" />
 			<f:param value="#{adminContactPhoneController.contact.contactId}" />
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 141c49f9..9113e569 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -22,6 +22,10 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+
 		<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -48,10 +52,6 @@
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
 		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
 			<f:param value="#{beanHelper.mobileNumber.phoneId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 00fa4ff5..2c1c1a1c 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -22,6 +22,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
 		<h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -41,7 +43,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index a4107367..d7bc6b63 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -22,6 +22,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
 		<h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table table-medium" layout="block">
 				<div class="table-header">
@@ -38,7 +40,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index faf3f12b..285284e6 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -22,6 +22,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
 		<h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -41,7 +43,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 02715dc7..a005ef8c 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -22,6 +22,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
 		<h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
 			<h:panelGroup styleClass="table table-medium" layout="block">
 				<div class="table-header">
@@ -38,7 +40,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 35eb312f..212490de 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -22,6 +22,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+
 		<h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -41,7 +43,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index ab3381bf..0cd35719 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -22,6 +22,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+
 		<h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table table-medium" layout="block">
 				<div class="table-header">
@@ -38,7 +40,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index f6b71d86..ba2287d6 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -15,6 +15,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+
 		<h:panelGroup styleClass="table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
 			<div class="table-header">
 				<h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
@@ -38,7 +40,5 @@
 				</h:column>
 			</h:dataTable>
 		</h:panelGroup>>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index 6e744173..b65b7cf3 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -15,6 +15,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
 				<h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
@@ -32,7 +34,5 @@
 				<h:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
 			</h:panelGroup>
 		</ui:fragment>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index cfbada39..1ece54b4 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -15,6 +15,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
 			<div id="user_lost_password_content">
 				<h:form id="form_lost_password">
@@ -61,7 +63,5 @@
 				</h:form>
 			</div>
 		</ui:fragment>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 25eee963..f37ff331 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -15,6 +15,10 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
+
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
+
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
@@ -34,9 +38,5 @@
 				</ui:fragment>
 			</h:panelGroup>
 		</ui:fragment>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
-
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index ca1280e3..bface6f7 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -15,6 +15,8 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+
 		<h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -53,7 +55,5 @@
 				</div>
 			</h:panelGroup>
 		</h:form>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 829bb87e..032ac788 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -17,6 +17,12 @@
 	<ui:define name="content">
 		<widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+		</ui:fragment>
+
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 			<h:form id="form_user_change_password">
 				<h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
@@ -70,11 +76,5 @@
 				</h:panelGroup>
 			</h:form>
 		</ui:fragment>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
-
-		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-		</ui:fragment>
 	</ui:define>
 </ui:composition>
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index f77c383e..94530db2 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -15,6 +15,16 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+
+		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+		</ui:fragment>
+
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+		</ui:fragment>
+
 		<h:panelGroup styleClass="table table-medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
 			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
@@ -33,15 +43,5 @@
 				</div>
 			</h:form>
 		</h:panelGroup>
-
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
-
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
-
-		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-		</ui:fragment>
 	</ui:define>
 </ui:composition>
-- 
2.39.5