Please cherry-pick:

- convention: always have error messages above "normal tags" (in case of
  error-free operation)

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

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index fa547e081b9d0becbae56392f5d57c085884a0a4..34f45fa81fabf11f6624c4418ea60440ba71e300 100644 (file)
--- 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 141c49f964826c1a4b935720b15114d03e41514d..9113e5692a0d69acc2cd8d3b938c0eb47377a467 100644 (file)
--- 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 00fa4ff512871fad1fde34addc78f62ad1458f18..2c1c1a1c85cdc9bc6917051fd2e65fa643fe6d29 100644 (file)
--- 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 a4107367204efca78fc0ba6aa1e131870c228f1c..d7bc6b63cd744e558d9643fedf448e8c3a6804f2 100644 (file)
--- 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 faf3f12b79f6d49abf3f1ea4848255b7a4c9334b..285284e6882aabc4699977613d257b73e31d259f 100644 (file)
--- 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 02715dc740124206cb2691fc0ddf37b9fc6cb7c7..a005ef8c287ed4b7534a0960ff05b543eacfc232 100644 (file)
--- 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 35eb312f10c6d702094ebe3c9bcda8323e22e23f..212490de98be02dfdae66771ae1595437d1815f7 100644 (file)
--- 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 ab3381bf059d7edc928558b5ec9552b3167495af..0cd357198028b7b17ebf7c916475c5f87d1f6573 100644 (file)
--- 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 f6b71d867b8861c3037f86c409f578aa06eed6f4..ba2287d61941bb8dd3b9f8c506302df963d29cc1 100644 (file)
--- 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 6e744173a2ec39c4fde0d931a240cf97721754b6..b65b7cf338bc3f27b3a1e4b951ec9fc3efa65fe8 100644 (file)
--- 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 cfbada39537d9779e69583a35a8864a66631f6b2..1ece54b446f3583f04742bc6145c1531f9cc767c 100644 (file)
--- 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 25eee9631654acde1097e505a8759dcad01a7966..f37ff3311bb0135d8f1c2ea620ea8850f1d32ed1 100644 (file)
--- 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 ca1280e3f2a675ef160b1350a0523cecc3956e02..bface6f7f1eb3a5e9eeb3e5f8ff18633e439b64c 100644 (file)
--- 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 829bb87eebb1c13bdc011be7557bd3eb2a6b1e2f..032ac788c3bd1d0cc5a229c141a4d5636529904d 100644 (file)
--- 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 f77c383eee03fc1a5aa7572718fcc7d1db98e91c..94530db2180d2c5f21ddda712c102d17f5e9a1e2 100644 (file)
--- 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>