<to-view-id>/index.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>user_lost_passwd</from-outcome>
- <to-view-id>/customer/lost_passwd.xhtml</to-view-id>
+ <from-outcome>user_lost_password</from-outcome>
+ <to-view-id>/customer/user_lost_passwordord.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>customer_login</from-outcome>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/guest/user/resend_link.xhtml</from-view-id>
+ <from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
<navigation-case>
<from-outcome>resend_done</from-outcome>
- <to-view-id>/guest/user/resend_done.xhtml</to-view-id>
+ <to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/guest/user/register.xhtml</from-view-id>
+ <from-view-id>/guest/user/user_register.xhtml</from-view-id>
<navigation-case>
<from-outcome>register_done</from-outcome>
- <to-view-id>/guest/user/register_done.xhtml</to-view-id>
+ <to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>register_page2</from-outcome>
- <to-view-id>/guest/user/register_page2.xhtml</to-view-id>
+ <to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
+++ /dev/null
-<!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"
- >
-
- <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
- <ui:define name="guest_title">
- <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
- </ui:define>
-
- <ui:define name="content_header">
- <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
- </ui:define>
-
- <ui:define name="content">
- <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
- <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
- <div class="para">
- <h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
- <h:outputText value=" " />
- <h:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
- </div>
- </ui:fragment>
-
- <div class="para">
- <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
- </div>
-
- <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
- <div class="para">
- <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
- </div>
- </ui:fragment>
- </ui:fragment>
-
- <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
- <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
- </ui:fragment>
- </ui:define>
- </ui:composition>
-</html>
+++ /dev/null
-<!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"
- >
-
- <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
- <ui:define name="guest_title">
- <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
- </ui:define>
-
- <ui:define name="content_header">
- <h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
- </ui:define>
-
- <ui:define name="content">
- <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
- <div class="para" id="user_lost_password_content">
- <h:form id="form_lost_password">
- <h:panelGroup styleClass="table" layout="block">
- <div class="table_header">
- <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
- </div>
-
- <fieldset class="fieldset" id="login_data">
- <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
- <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
- </legend>
-
- <div class="table_row">
- <div class="table_left">
- <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
- </div>
-
- <div class="table_right">
- <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
- </div>
-
- <div class="clear"></div>
- </div>
-
- <div class="table_header">
- <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
- </div>
-
- <div class="table_row">
- <div class="table_left">
- <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
- </div>
-
- <div class="table_right">
- <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
- </div>
-
- <div class="clear"></div>
- </div>
-
- </fieldset>
-
- <div class="table_footer">
- <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
- </div>
- </h:panelGroup>
- </h:form>
- </div>
- </ui:fragment>
-
- <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
- <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
- <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
- <ui:param name="styleClass" value="errors" />
- </ui:include>
- </ui:fragment>
- </ui:define>
- </ui:composition>
-</html>
--- /dev/null
+<!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"
+ >
+
+ <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+ <ui:define name="guest_title">
+ <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
+ </ui:define>
+
+ <ui:define name="content_header">
+ <h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
+ </ui:define>
+
+ <ui:define name="content">
+ <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
+ <div class="para" id="user_lost_password_content">
+ <h:form id="form_lost_password">
+ <h:panelGroup styleClass="table" layout="block">
+ <div class="table_header">
+ <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
+ </div>
+
+ <fieldset class="fieldset" id="login_data">
+ <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
+ <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
+ </legend>
+
+ <div class="table_row">
+ <div class="table_left">
+ <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+ </div>
+
+ <div class="table_right">
+ <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+ </div>
+
+ <div class="clear"></div>
+ </div>
+
+ <div class="table_header">
+ <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
+ </div>
+
+ <div class="table_row">
+ <div class="table_left">
+ <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+ </div>
+
+ <div class="table_right">
+ <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+ </div>
+
+ <div class="clear"></div>
+ </div>
+
+ </fieldset>
+
+ <div class="table_footer">
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+ </div>
+ </h:panelGroup>
+ </h:form>
+ </div>
+ </ui:fragment>
+
+ <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
+ <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+ <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+ <ui:param name="styleClass" value="errors" />
+ </ui:include>
+ </ui:fragment>
+ </ui:define>
+ </ui:composition>
+</html>
projects / pizzaservice-war.git / commitdiff