Please cherry-pick:

[jjobs-war.git] / web / guest / user / user_confirm_account.xhtml

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index da804aa4f528ea01abe4bdd1740b999fcf6cb0cd..2582c34965a47bc4a219fac60cdbac6ca10e4701 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -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">
@@ -23,11 +24,11 @@
        <ui:define name="content">
                <ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
                        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
                                </div>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
+                               <h:panelGroup styleClass="table-row" layout="block">
                                        <h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
                                                <f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                                <f:param value="#{beanHelper.user.userContact.contactFirstName}" />
@@ -36,19 +37,9 @@
                                </h:panelGroup>
                        </h:panelGroup>
 
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+                       <widgets:outputMessageBox id="error-helper-user" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
                </ui:fragment>
 
-               <ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <widgets:outputMessageBox id="error-confirmation-key" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>