-<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
xmlns="http://www.w3.org/1999/xhtml"
- 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:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ >
<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
- <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
+ <ui:define name="guest_title">
+ <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
+ </ui:define>
<ui:define name="content_header">
- #{msg.CONTENT_TITLE_INDEX_RESEND_LINK}
+ <h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
</ui:define>
<ui:define name="content">
- <ui:fragment rendered="#{registerController.isResendConfirmationLinkEnabled()}">
- <h:form id="form_resend_link">
- <div class="table">
- <div class="table_header">
- <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
- </div>
-
- <fieldset id="email_address_notice">
- <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
- <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
- </legend>
+ <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+ <h:panelGroup styleClass="table" layout="block">
+ <div class="table_header">
+ <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
+ </div>
- <div class="table_row">
- <div class="table_left">
- <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
- </div>
+ <fieldset class="fieldset" id="email_address_notice">
+ <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
+ <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
+ </legend>
- <div class="table_right">
- <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{resendController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
- <f:validator validatorId="EmailAddressValidator" />
- </h:inputText>
- </div>
+ <div class="table_row">
+ <div class="table_left">
+ <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
</div>
- </fieldset>
- <div>
- <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+ <div class="table_right">
+ <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{resendController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+ <f:validator validatorId="EmailAddressValidator" />
+ </h:inputText>
+ </div>
</div>
+ </fieldset>
- <div class="table_row">
- <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
- </div>
+ <div class="error_container">
+ <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+ </div>
- <div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
- </div>
+ <div class="table_row">
+ <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
</div>
- </h:form>
- </ui:fragment>
+ <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="#{resendController.doResendLink()}" />
+ </div>
+ </h:panelGroup>
+ </h:form>
+
+ <<<<<<< HEAD
<ui:fragment rendered="#{not registerController.isResendConfirmationLinkEnabled()}">
<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
</ui:fragment>
+ =======
+ <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+ >>>>>>> de7e9f0... Continued a bit: (please cherry-pick)
</ui:define>
</ui:composition>
</html>
projects / jjobs-war.git / blobdiff