Please cherry-pick:

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

diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index 6686887a9e036ef2b2d448881ed7d8da51caaa03..0ea6f187053f5e1b4ca0cd5876cb21df9dd0d983 100644 (file)
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -1,12 +1,13 @@
 <?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:generic="http://mxchange.org/jsf/core"
+                               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">
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
        </ui:define>
 
@@ -15,45 +16,45 @@
        </ui:define>
 
        <ui:define name="content">
+               <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">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
                                </div>
 
-                               <fieldset class="fieldset" id="email_address_notice">
+                               <fieldset class="fieldset">
                                        <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
                                                <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
                                        </legend>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
+                                                       <p:outputLabel for="emailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
                                                </div>
 
-                                               <div class="table_right">
-                                                       <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                                               <div class="table-right">
+                                                       <p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
                                                                <f:validator validatorId="EmailAddressValidator" />
-                                                       </h:inputText>
+                                                       </p:inputText>
                                                </div>
                                        </h:panelGroup>
                                </fieldset>
 
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:panelGroup styleClass="error-container" layout="block">
+                                       <p:message for="emailAddress" />
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
+                               <h:panelGroup styleClass="table-row" layout="block">
                                        <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
+                               <div class="table-footer">
+                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <p:commandButton styleClass="submit" type="submit" id="submit_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
-
-               <generic:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
        </ui:define>
 </ui:composition>