From a527111a5add3a17c1f06610313f949bfb17bc0d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 21:54:14 +0200
Subject: [PATCH] fixed targets, removed obsolete login.xhtml, as
user_login.xhtml is around
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
web/WEB-INF/faces-config.xml | 33 ++++----------
web/guest/user/login.xhtml | 45 -------------------
..._passwd.xhtml => user_lost_password.xhtml} | 0
3 files changed, 9 insertions(+), 69 deletions(-)
delete mode 100644 web/guest/user/login.xhtml
rename web/guest/user/{user_lost_passwd.xhtml => user_lost_password.xhtml} (100%)
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 9d8871b5..3d4420a6 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -17,15 +17,11 @@
</navigation-case>
<navigation-case>
<from-outcome>user_register</from-outcome>
- <to-view-id>/guest/user/register.xhtml</to-view-id>
+ <to-view-id>/guest/user/user_register.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>user_login</from-outcome>
- <to-view-id>/guest/user/login.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>user_lost_passwd</from-outcome>
- <to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
+ <from-outcome>user_lost_password</from-outcome>
+ <to-view-id>/guest/user/user_lost_passwordord.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>terms</from-outcome>
@@ -53,7 +49,7 @@
</navigation-case>
<navigation-case>
<from-outcome>user_resend_link</from-outcome>
- <to-view-id>/guest/user/resend_link.xhtml</to-view-id>
+ <to-view-id>/guest/user/user_resend_link.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>login_own_addressbooks</from-outcome>
@@ -120,32 +116,21 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/guest/user/login.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>login</from-outcome>
- <to-view-id>/user/login_index.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>login_user</from-outcome>
- <to-view-id>/user/login_index.xhtml</to-view-id>
- </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>
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
deleted file mode 100644
index ffe5e525..00000000
--- a/web/guest/user/login.xhtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!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>
diff --git a/web/guest/user/user_lost_passwd.xhtml b/web/guest/user/user_lost_password.xhtml
similarity index 100%
rename from web/guest/user/user_lost_passwd.xhtml
rename to web/guest/user/user_lost_password.xhtml
--
2.39.5