]> git.mxchange.org Git - addressbook-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 15 Sep 2017 20:25:57 +0000 (22:25 +0200)
committerRoland Häder <roland@mxchange.org>
Fri, 15 Sep 2017 20:38:14 +0000 (22:38 +0200)
- added "id" as required attribute for widgets:outputMessageBox
- got rid of one template being "abused" as message box, still there are some
  left to be ported
- improved i18n strings by generalizing them, had: _DEACTIVATED, _NOT_ENABLED
  and _DISABLED for the same thing, now only _DISABLED is used

Signed-off-by: Roland Häder <roland@mxchange.org>
52 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/resources/tags/messages/message_box.tpl
web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
web/WEB-INF/templates/login/user/user_base.tpl
web/WEB-INF/templates/user/userid_error.tpl [deleted file]
web/WEB-INF/web.xml
web/WEB-INF/widgets.jsf.taglib.xml
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_show.xhtml
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_edit.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_done.xhtml
web/guest/user/user_resend_link.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml
web/user/login_user_data_saved.xhtml

index da85dcb9804e6d851d25e12a604ea30a8a30aad7..a5f3ec1f9e7f82ee593125331579c61317782609 100644 (file)
@@ -390,7 +390,7 @@ ADMIN_LINK_SHOW_USER_TITLE=Administratives Benutzerprofil anzeigen
 PAGE_TITLE_ADMIN_SHOW_USER=Benutzerprofil anzeigen
 CONTENT_TITLE_ADMIN_SHOW_USER=Profil eines Benutzers anzeigen:
 ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: userId).
-ERROR_USER_ID_NOT_FOUND=Fehler: Benutzereintrag nicht gefunden.
+ERROR_USER_NOT_FOUND=Fehler: Benutzereintrag nicht gefunden.
 ADMIN_TABLE_SUMMARY_SHOW_USER_DATA=Zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an.
 ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}):
 ADMIN_USER_ID=Benutzer-Id:
@@ -499,13 +499,13 @@ ERROR_CONTACT_ID_NOT_FOUND=Fehler: Kontaktdaten nicht gefunden.
 GUEST_REGISTRATION_PAGE1_TITLE=Anmeldeseite 1
 GUEST_REGISTRATION_PAGE2_TITLE=Anmeldeseite 2
 BUTTON_CONTINUE_REGISTER_PAGE2=Weiter zur Anmeldeseite 2
-ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED=Fehler: Mehrfach-Seite f\u00fcr Anmeldung nicht aktiv, bitte Link nicht aufrufen.
+ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED=Fehler: Mehrfach-Seite f\u00fcr Anmeldung nicht aktiv, bitte Link nicht aufrufen.
 PAGE_TITLE_USER_REGISTER_PAGE2=Anmeldeseite 2
 CONTENT_TITLE_USER_REGISTER_PAGE2=Anmeldeseite 2:
-ERROR_GUEST_USER_LOGIN_DEACTIVATED=Fehler: Der Benutzerbereich wurde administrativ deaktiviert (keine Benutzernamen bei Anmeldung).
-ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED=Fehler: Wiederherstellen des Passwortes wurde administrativ deaktiviert.
-ERROR_GUEST_USER_RESEND_CONFIRMATION_DEACTIVATED=Fehler: Erneutes Aussenden des Best\u00e4tigungslinked ist administrativ deaktiviert.
-ERROR_GUEST_USER_PROFILE_DEACTIVATED=Fehler: \u00d6ffentliche Benutzerprofile sind administrativ deaktiviert.
+ERROR_GUEST_USER_LOGIN_DISABLED=Fehler: Der Benutzerbereich wurde administrativ deaktiviert (keine Benutzernamen bei Anmeldung).
+ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED=Fehler: Wiederherstellen des Passwortes wurde administrativ deaktiviert.
+ERROR_GUEST_USER_RESEND_CONFIRMATION_DISABLED=Fehler: Erneutes Aussenden des Best\u00e4tigungslinked ist administrativ deaktiviert.
+ERROR_GUEST_USER_PROFILE_DISABLED=Fehler: \u00d6ffentliche Benutzerprofile sind administrativ deaktiviert.
 EMAIL_ADDRESS_NOT_ENTERED=Bitte geben Sie Ihre Email-Adresse ein.
 EMAIL_ADDRESS_REPEAT_NOT_ENTERED=Bitte wiederholen Sie Ihre Email-Adresse.
 BUTTON_RESEND_CONFIRMATION_LINK=Best\u00e4tigungslink erneut aussenden
@@ -590,7 +590,7 @@ ERROR_GUEST_REGISTRATION_DISABLED=Fehler: Die Anmeldung ist administrativ deakti
 ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Fehler: Editieren von Benutzerdaten wurde administrativ deaktiviert.
 LINK_USER_LOGOUT=Ausloggen
 LINK_USER_LOGOUT_TITLE=Aus dem Mitgliedsbereich ausloggen.
-ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Fehler: Erneutes Aussenden des Best\u00e4tigungslink wurde administrativ deaktiviert.
+ERROR_GUEST_USER_RESEND_LINK_DISABLED=Fehler: Erneutes Aussenden des Best\u00e4tigungslink wurde administrativ deaktiviert.
 PAGE_TITLE_LOGIN_USER_LOGOUT=Ausloggen aus dem Benutzerbereich
 CONTENT_TITLE_LOGIN_USER_LOGOUT=Aus dem Benutzerbereich ausloggen:
 LOGIN_USER_LOGOUT_TITLE=Aus Benutzerbereich ausloggen?
index 47b3113db129fea91ce0cb096650b93266415820..4493449d769c4c6711502f9f2587ea526e6716fa 100644 (file)
@@ -369,7 +369,7 @@ ADMIN_LINK_SHOW_USER_TITLE=Show administrative user profile
 PAGE_TITLE_ADMIN_SHOW_USER=Show user profile
 CONTENT_TITLE_ADMIN_SHOW_USER=Show profile of a user:
 ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId).
-ERROR_USER_ID_NOT_FOUND=Error: User entry not found.
+ERROR_USER_NOT_FOUND=Error: User entry not found.
 ADMIN_TABLE_SUMMARY_SHOW_USER_DATA=Shows a single user profile for administrative purposes.
 ADMIN_HEADER_SHOW_USER=User {0} (id {1}):
 ADMIN_USER_ID=User id:
@@ -477,13 +477,13 @@ ERROR_CONTACT_ID_NOT_FOUND=Error: contact data not found
 GUEST_REGISTRATION_PAGE1_TITLE=Registration page 1
 GUEST_REGISTRATION_PAGE2_TITLE=Registration page 2
 BUTTON_CONTINUE_REGISTER_PAGE2=Continue to registration page 2
-ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED=Error: Multiple registration page not active, please don't call this page.
+ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED=Error: Multiple registration page not active, please don't call this page.
 PAGE_TITLE_USER_REGISTER_PAGE2=Register page 2
 CONTENT_TITLE_USER_REGISTER_PAGE2=Register page 2:
-ERROR_GUEST_USER_LOGIN_DEACTIVATED=Error: User area is deactivated by administrators, no user name while registration.
-ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED=Error: password recovery is deactivated by administrators.
-ERROR_GUEST_USER_RESEND_CONFIRMATION_DEACTIVATED=Error: Resending confirmation link is deactivated by administrators.
-ERROR_GUEST_USER_PROFILE_DEACTIVATED=Error: Public user profiles are deactivated by administrators.
+ERROR_GUEST_USER_LOGIN_DISABLED=Error: User area is deactivated by administrators, no user name while registration.
+ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED=Error: password recovery is deactivated by administrators.
+ERROR_GUEST_USER_RESEND_CONFIRMATION_DISABLED=Error: Resending confirmation link is deactivated by administrators.
+ERROR_GUEST_USER_PROFILE_DISABLED=Error: Public user profiles are deactivated by administrators.
 EMAIL_ADDRESS_NOT_ENTERED=Please enter your email address.
 EMAIL_ADDRESS_REPEAT_NOT_ENTERED=Please repeat your email address.
 BUTTON_RESEND_CONFIRMATION_LINK=Resend confirmation link
@@ -581,7 +581,7 @@ ERROR_GUEST_REGISTRATION_DISABLED=Error: Registration has been administratively
 ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Error: Editing of user data has been disabled by administrators.
 LINK_USER_LOGOUT=Logout
 LINK_USER_LOGOUT_TITLE=Logout from user area.
-ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Error: Sending out confirmation link has been deactivated.
+ERROR_GUEST_USER_RESEND_LINK_DISABLED=Error: Sending out confirmation link has been deactivated.
 PAGE_TITLE_LOGIN_USER_LOGOUT=Logout from user area
 CONTENT_TITLE_LOGIN_USER_LOGOUT=Logout from user area:
 LOGIN_USER_LOGOUT_TITLE=Logout from user area?
index 7d04f1353a973293e0debd3c35a1db10488ed46a..0450cf5ca1f0e8c2b07d8c6f57448e4dae52d7c0 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <h:panelGroup id="#{empty id ? 'message' : id}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
+       <h:panelGroup id="#{id}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
                <div class="message-header">
                        <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
                </div>
index 90283cea0cd555cf9c1a29ba3aecc51a022ad241..38a6f1bb9ec3a84d065a1fa79e74e86d6b8fdce6 100644 (file)
@@ -7,7 +7,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <widgets:outputMessageBox message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+       <widgets:outputMessageBox id="nonpublic-user-profile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
        <p:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
                <h:outputText value="#{user.userName}" />
index 80250d12493d4d6836a8226887aed1647b5ac188..2492f9daed47e01ac749beadc43145302bdfbd18 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-helper-contact-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
index 859622a502982f0689d7d51653754594646385cc..e8bfe048242f6aaecb05f7fc4cb85d22e1c4e523 100644 (file)
@@ -7,7 +7,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-helper-contact-add-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table table-medium" layout="block">
index e211f8c6ea2de0369e05d722eeafbf61943479f1..d2357275f8d4d25a221593f0d37b7a3fa4625919 100644 (file)
@@ -7,7 +7,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table table-medium" layout="block">
index bac827a834c362672bb3cf7906821740e9a117f1..4b0d7b4046495a75b78b8fc79cfa854a4c329a48 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
index 6e72a273c66328caf2bbbc530053416a9bba7695..0659db911bb4b3ccef80af0ee676eed73f3773b1 100644 (file)
@@ -7,7 +7,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table table-medium" layout="block">
index abe6b12ddd8759ab2c729b3102bd005f04691f0a..14306965a75f3ea4c0baa4cf56e436276ebb043e 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
index 9732eb92dc62fe923813bbff2e0764c7fc58e574..510d485edb80f88fffa01fa9adb0666d884afd10 100644 (file)
@@ -15,7 +15,7 @@
        </ui:define>
 
        <ui:define name="menu">
-               <widgets:outputMessageBox message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
+               <widgets:outputMessageBox id="error-guest-forbidden" message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
deleted file mode 100644 (file)
index 9bd37bc..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
-
-       <h:panelGroup styleClass="table" layout="block">
-               <div class="table-header">
-                       <h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
-               </div>
-
-               <div class="para">
-                       <p:messages autoUpdate="true" redisplay="false" showDetail="true" />
-               </div>
-       </h:panelGroup>
-</ui:composition>
index 28da4635d56c51be07ee8a5bc4290479ab9d2fd4..67fc999474583a56fbbd1d2f17ee53856fb5539a 100644 (file)
@@ -5,7 +5,7 @@
     <context-param>
         <description>Name of this project.</description>
         <param-name>project_title</param-name>
-        <param-value>JFinancials</param-value>
+        <param-value>Addressbook</param-value>
     </context-param>
     <context-param>
         <description>Primefaces theme</description>
index 9982d9cefcec647a3ac0106d7017a34f0d6587fc..bfc829d973227effc9faaa8ced052062ed6ef5d7 100644 (file)
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                <attribute>
                        <name>id</name>
                        <description>Id of the JSF component.</description>
-                       <required>false</required>
+                       <required>true</required>
                        <type>java.lang.String</type>
                </attribute>
                <attribute>
index e7da3c35d0cf231d0d6bb7251bf9a5ed3c94e54b..fef9073c7ec4159d2def19fe7f4085dd98a1054b 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="table" layout="block">
index 5f21c730460d07bb6ac4f3225c33bf3f54c087ce..1ed811d45bcf05bc00bcb31900f5e740438c0c56 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
index 6014cdc5a2f81f6ed4b48c9eb33649999ae1f9f4..6e0efd048c4dc1e2388227d2a76159e53006a0e3 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="para" layout="block">
index 491b59bac539771d21860d998eb39bea97c4b325..b661ed8c93febccfd7a6305404029b5bfc12c89a 100644 (file)
@@ -23,9 +23,9 @@
        </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 id="error-handler-fax-number" 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}" />
+               <widgets:outputMessageBox id="error-handler-contact" 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">
index 1c7b629fd396772ba87e08a6de5c42de64ef7f36..9848232e77bbf294beef9e6be9715d331957ba68 100644 (file)
@@ -23,9 +23,9 @@
        </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}" />
+               <widgets:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
index 1fe61ff99107c688e5f8ae34e1c9cf75abce95f9..a06815a072cdd623b3fadee4ebb599d603f83d19 100644 (file)
@@ -23,9 +23,9 @@
        </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 id="error-handler-mobile-number" 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}" />
+               <widgets:outputMessageBox id="error-handler-contact" 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">
index 76768ec8893f9670b0f50b1196cf9223b122f54e..bc93bad29993d9867265093d74f4a0bcb8c8e761 100644 (file)
@@ -23,7 +23,7 @@
        </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 id="error-handler-fax-number" 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">
index 80b5894a744ac689956204c944db51d0db45ede3..0b677bae6f6bea00c9ff06c4e232aa0ce2501461 100644 (file)
@@ -23,7 +23,7 @@
        </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 id="error-handler-fax-number" 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">
index eaa968e0559619069caf364900f9d88499b3ad39..32b8a8b5bbb852df23c99748535d546608a8fab2 100644 (file)
@@ -23,7 +23,7 @@
        </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}" />
+               <widgets:outputMessageBox id="error-handler-landline-number" 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">
index 294d7884a694a8e7d7810065e340def01cbdf531..2032670eb097e51d9b1e2c65f36c487b1b231d6f 100644 (file)
@@ -23,7 +23,7 @@
        </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}" />
+               <widgets:outputMessageBox id="error-handler-landline-number" 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">
index a06e7a10abbb586df7f7a23c4f61be2d2df97e72..958b5fac775a641892d0f5be5b88085c669567e8 100644 (file)
@@ -23,7 +23,7 @@
        </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 id="error-handler-mobile-number" 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">
index 8be236f7d5f94d7a2890d6a66bfd831904d9dd59..fbf2f156e2a18c5ae4c99efe344c1014c4000c52 100644 (file)
@@ -23,7 +23,7 @@
        </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 id="error-handler-mobile-number" 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">
index 514583fdefcab84595da8f3e494affdd40655535..877ab54276b52c1dba1c841ff558f54f124db2fb 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
                        <p:column>
index 6702250d559073b2150482933837365382a66958..1438a2a93ee09c425fc420ce3cdde4b6ea8942d5 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
index f0448afa423748a0bd0a93bbd0cbb8071414395f..9d4f909f9a02629c933c9ad5b2a91b30ad2362cc 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
index a1ee97785fb0ac6161af6a55b9d16ae45b7b77e7..0921f74a57d5f87bd748dc2734976856cd9b1236 100644 (file)
@@ -16,7 +16,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
+               <widgets:outputMessageBox id="admin-user-list-empty" message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
                <h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
                        <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
index 23db1d95d283998e3e4c34a2f8ac9f8b628c4b47..be6bf16e33391d0949493c0f4a5ea5bbccb398e6 100644 (file)
@@ -17,9 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
-
-               <p:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
+               <p:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" emptyMessage="#{msg.ADMIN_USER_LIST_EMPTY}">
                        <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_USER_ID}" />
index 6e9d3c688d943a55a2c3f0d76b625b2a3d5512a0..b488e4f73965dcb1084ab9d2efa4d1ccd9a2a515 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
index aee86a0176a9544151b7ca2f4c9eb0135062b661..5afc35d2f87a0314161aabaf37240bb99ad05f00 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
index f7bc6033f411cfd37522b299ec3f0f50abc5c2c6..b29b13532e00c45ad4b7223cd7774c961378d0c9 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
index e72a5b89c0fb1813709203e1b7bc12eca8ffba53..517db8c361d2884d734ec8f25b35b95ced762a41 100644 (file)
@@ -23,7 +23,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
index cd128315a7b223b771a3d2417e2459b925fd508c..2582c34965a47bc4a219fac60cdbac6ca10e4701 100644 (file)
@@ -37,9 +37,9 @@
                                </h:panelGroup>
                        </h:panelGroup>
 
-                       <widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+                       <widgets:outputMessageBox id="error-helper-user" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
+               <widgets:outputMessageBox id="error-confirmation-key" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>
index c2c81347d998898e58839d99b2967fa95bb8d89c..2848da6229edf99de49346ab332184e1cf872631 100644 (file)
@@ -17,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+               <widgets:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
 
                <h:panelGroup styleClass="table table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
                        <div class="table-header">
index 3191943d4c84f2d9571c067df7c0a89905db3f60..dd47190df76266fa2a1c229acc89c0019a258efc 100644 (file)
@@ -16,7 +16,7 @@
        </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')}" />
+               <widgets:outputMessageBox id="error-user-login-disabled" message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}" 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')}">
index 92c4fd4c4bb7d99636c51f4a666b84ab0069de92..dc0694576303df98201b5d5dfbac1c437a0697ec 100644 (file)
@@ -16,7 +16,7 @@
        </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')}" />
+               <widgets:outputMessageBox id="error-user-recovery-disabled" message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}" 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">
index a021c3ea88c1b1f94187cb405e426abc38791949..d490c8ed153d82df6807d53c7d4aa04b0ebec8ce 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-                       <ui:fragment rendered="#{userController.isUserIdEmpty()}">
-                               <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
-                       </ui:fragment>
+               <widgets:outputMessageBox id="error-user-profile-disabled" message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
 
-                       <widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+               <widgets:outputMessageBox id="error-user-id-empty" message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" rendered="#{userController.isUserIdEmpty()}" />
+
+               <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
+                       <widgets:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                <div align="center">
@@ -44,7 +44,5 @@
                                </div>
                        </ui:fragment>
                </ui:fragment>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
        </ui:define>
 </ui:composition>
index e285b365d0f209809b0d7e1e45dd6ea2c215bfe0..7364c6ab712ebe11996b26b40ed552a3f3f4db8d 100644 (file)
@@ -16,9 +16,9 @@
        </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 id="error-user-registration-disabled" 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')}" />
+               <widgets:outputMessageBox id="error-user-registration-index" 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')}">
index f26df5498e499e46e67f98f81584c3fe1ea6d14a..c34301d4f7af8a1ff4965fb1f9fe6059be0ff95d 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -11,7 +12,7 @@
        </ui:define>
 
        <ui:define name="content_header">
-               <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
+               <widgets:outputMessageBox id="user-registration-completed" message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
        </ui:define>
 
        <ui:define name="content">
index 394b73e270cca1007c3eb33e6440d58f0993c83d..f8bf7a6be15c493ad80c9fcaca3ab9efdb390703 100644 (file)
@@ -16,7 +16,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+               <widgets:outputMessageBox id="error-user-registration-multi-disabled" message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
index 005bddb515ee190e55850ed273124c2b47cbed11..a0f18d0ff0ede68e9157db1fa40305d96ead8892 100644 (file)
@@ -15,6 +15,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+               <widgets:outputMessageBox id="guest-user-resend-link-completed" message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
        </ui:define>
 </ui:composition>
index 76d7b1e2966908f317689c58563920f35eabd58e..faf4f2b7ec75eb216a96f978260737a9c5b8722c 100644 (file)
@@ -16,7 +16,7 @@
        </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')}" />
+               <widgets:outputMessageBox id="error-user-resend-link-disabled" message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}" 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">
index 300c586d9b7d840eed1255471940a6415f8b9a53..0ce16dad16861a7ba90436b870c55965eedc954b 100644 (file)
@@ -16,9 +16,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
index 511e0e894a98df4f252683aeda08cf495e57119d..7af8f136ccc8652b89826bff2e7dc6d3a7415cc2 100644 (file)
@@ -15,7 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
+               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index a019ba7d310c733af2202fc4026a2ed04daee8e2..8f0a3bbb93cbc41e6210a82b78f5c24843372835 100644 (file)
@@ -16,7 +16,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+               <widgets:outputMessageBox id="error-user-change-email-disabled" message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
 
                <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
                        <div class="table-header">
index ab920063c8fabac44fbb8e3aad87d4148f254ff2..caa792126caa4b34c1d6dcbc92fcb4475b62a2c2 100644 (file)
@@ -16,9 +16,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
+               <widgets:outputMessageBox id="login-user-must-change-password" 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')}" />
+               <widgets:outputMessageBox id="error-user-edit-data-disabled" 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" />
index 252a3486460b1a413c6599159cbce97ab06573d9..b5c1a72e6d543bf7907554dca43d8e157a482bf5 100644 (file)
@@ -16,7 +16,7 @@
        </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')}" />
+               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
index a5fda2ee64f5335fa6568018886fe1a03cf94bd2..ab88c830476999c5e0bb8679e82128a6731cb3fe 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" rendered="#{userLoginController.ifUserMustChangePassword()}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 014da48ab9f370d00e8fc78a705bf3b853cad6e9..531068f43ee0119bca66a1052d0e22c561cbee5a 100644 (file)
@@ -16,7 +16,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />