From: Roland Häder <roland@mxchange.org>
Date: Tue, 30 Aug 2016 15:11:12 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8239d07593a0ca0ebc60aa64f6d343721c66f4c6;p=jjobs-war.git

Please cherry-pick:
- moved to new location + updated faces-config.xml

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index ee336973..21738b76 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -26,15 +26,15 @@
 		</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>
+			<to-view-id>/guest/user/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>
+			<to-view-id>/guest/user/user_lost_passwd.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>terms</from-outcome>
@@ -62,7 +62,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>user_change_email_address</from-outcome>
@@ -149,7 +149,7 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_login.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>user_login</from-outcome>
 			<to-view-id>/user/login_index.xhtml</to-view-id>
@@ -183,10 +183,10 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>user_user</from-outcome>
-			<to-view-id>/user/login_index.xhtml</to-view-id>
+			<from-outcome>resend_done</from-outcome>
+			<to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -197,28 +197,28 @@
 		</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>
-		<from-view-id>/admin/admin_logout.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_register_page2.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>index</from-outcome>
-			<to-view-id>/index.xhtml</to-view-id>
+			<from-outcome>register_done</from-outcome>
+			<to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>user_add_addressbook</from-outcome>
-			<to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
+			<from-outcome>register_page2</from-outcome>
+			<to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
deleted file mode 100644
index f394d378..00000000
--- a/web/guest/user/confirm_account.xhtml
+++ /dev/null
@@ -1,58 +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">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="confirmKey" value="#{confirmationLinkController.confirmationKey}" />
-				<f:viewAction onPostback="true" action="#{confirmationLinkController.maybeConfirmUserAccount()}" />
-			</f:metadata>
-		</ui:define>
-
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{not empty confirmationLinkController.confirmationKey}">
-				<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-					<div class="table_header">
-						<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
-					</div>
-
-					<div class="table_row">
-						<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
-							<f:param value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
-							<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
-							<f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
-						</h:outputFormat>
-					</div>
-				</h:panelGroup>
-
-				<ui:fragment rendered="#{empty beanHelper.user}">
-					<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-						<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
-						<ui:param name="styleClass" value="errors" />
-					</ui:include>
-				</ui:fragment>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
deleted file mode 100644
index 1419666b..00000000
--- a/web/guest/user/login.xhtml
+++ /dev/null
@@ -1,48 +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="&#160;" />
-						<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')}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml
deleted file mode 100644
index 03d80839..00000000
--- a/web/guest/user/login_error.xhtml
+++ /dev/null
@@ -1,24 +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:c="http://xmlns.jcp.org/jsp/jstl/core"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_ERROR}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_ERROR}" />
-		</ui:define>
-
-		<ui:define name="content">
-			Hier kommt die Fehlermeldung hin.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
deleted file mode 100644
index 2d6a6a06..00000000
--- a/web/guest/user/lost_passwd.xhtml
+++ /dev/null
@@ -1,80 +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">
-		<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>
diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
deleted file mode 100644
index 340b6981..00000000
--- a/web/guest/user/register.xhtml
+++ /dev/null
@@ -1,50 +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">
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
-				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-					<div class="para">
-						<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-						<h:outputText value="&nbsp;" />
-						<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-						<h:outputText value="&nbsp;" />
-						<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
-					</div>
-				</ui:fragment>
-
-				<div class="registration_form">
-					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
-						<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
-					</ui:fragment>
-
-					<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-						<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
-					</ui:fragment>
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
deleted file mode 100644
index 65b3bda1..00000000
--- a/web/guest/user/register_done.xhtml
+++ /dev/null
@@ -1,29 +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">
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<div class="para">
-				<h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
-			</div>
-
-			<div class="registration_form">
-				<h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
-			</div>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml
deleted file mode 100644
index 35557e62..00000000
--- a/web/guest/user/register_page2.xhtml
+++ /dev/null
@@ -1,42 +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">
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
-				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-					<div class="para">
-						#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
-						<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-						#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
-					</div>
-				</ui:fragment>
-
-				<div class="registration_form">
-					<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl" />
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml
deleted file mode 100644
index c062782f..00000000
--- a/web/guest/user/resend_done.xhtml
+++ /dev/null
@@ -1,25 +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">
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_USER_RESEND_DONE}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-				<ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
-			</ui:include>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
deleted file mode 100644
index c4da123a..00000000
--- a/web/guest/user/resend_link.xhtml
+++ /dev/null
@@ -1,67 +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">
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<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>
-
-					<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_row">
-							<div class="table_left">
-								<h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
-							</div>
-
-							<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>
-
-					<h:panelGroup styleClass="error_container" layout="block">
-						<h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-					</h:panelGroup>
-
-					<div class="table_row">
-						<h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
-					</div>
-
-					<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>
-
-			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
new file mode 100644
index 00000000..f394d378
--- /dev/null
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -0,0 +1,58 @@
+<!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="metadata">
+			<f:metadata>
+				<f:viewParam name="confirmKey" value="#{confirmationLinkController.confirmationKey}" />
+				<f:viewAction onPostback="true" action="#{confirmationLinkController.maybeConfirmUserAccount()}" />
+			</f:metadata>
+		</ui:define>
+
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{not empty confirmationLinkController.confirmationKey}">
+				<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
+					<div class="table_header">
+						<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
+					</div>
+
+					<div class="table_row">
+						<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
+							<f:param value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+							<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
+							<f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
+						</h:outputFormat>
+					</div>
+				</h:panelGroup>
+
+				<ui:fragment rendered="#{empty beanHelper.user}">
+					<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+						<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
+						<ui:param name="styleClass" value="errors" />
+					</ui:include>
+				</ui:fragment>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
new file mode 100644
index 00000000..1419666b
--- /dev/null
+++ b/web/guest/user/user_login.xhtml
@@ -0,0 +1,48 @@
+<!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="&#160;" />
+						<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')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_login_error.xhtml b/web/guest/user/user_login_error.xhtml
new file mode 100644
index 00000000..03d80839
--- /dev/null
+++ b/web/guest/user/user_login_error.xhtml
@@ -0,0 +1,24 @@
+<!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:c="http://xmlns.jcp.org/jsp/jstl/core"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_ERROR}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_ERROR}" />
+		</ui:define>
+
+		<ui:define name="content">
+			Hier kommt die Fehlermeldung hin.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_lost_passwd.xhtml b/web/guest/user/user_lost_passwd.xhtml
new file mode 100644
index 00000000..2d6a6a06
--- /dev/null
+++ b/web/guest/user/user_lost_passwd.xhtml
@@ -0,0 +1,80 @@
+<!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>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
new file mode 100644
index 00000000..340b6981
--- /dev/null
+++ b/web/guest/user/user_register.xhtml
@@ -0,0 +1,50 @@
+<!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_REGISTER}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
+				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+					<div class="para">
+						<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
+						<h:outputText value="&nbsp;" />
+						<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+						<h:outputText value="&nbsp;" />
+						<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
+					</div>
+				</ui:fragment>
+
+				<div class="registration_form">
+					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+						<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
+					</ui:fragment>
+
+					<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
+						<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
+					</ui:fragment>
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
new file mode 100644
index 00000000..65b3bda1
--- /dev/null
+++ b/web/guest/user/user_register_done.xhtml
@@ -0,0 +1,29 @@
+<!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_REGISTER_DONE}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para">
+				<h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
+			</div>
+
+			<div class="registration_form">
+				<h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+			</div>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
new file mode 100644
index 00000000..35557e62
--- /dev/null
+++ b/web/guest/user/user_register_page2.xhtml
@@ -0,0 +1,42 @@
+<!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_REGISTER_PAGE2}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+					<div class="para">
+						#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+						<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+						#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+					</div>
+				</ui:fragment>
+
+				<div class="registration_form">
+					<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl" />
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml
new file mode 100644
index 00000000..c062782f
--- /dev/null
+++ b/web/guest/user/user_resend_done.xhtml
@@ -0,0 +1,25 @@
+<!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_RESEND_DONE}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_RESEND_DONE}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+				<ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+			</ui:include>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
new file mode 100644
index 00000000..c4da123a
--- /dev/null
+++ b/web/guest/user/user_resend_link.xhtml
@@ -0,0 +1,67 @@
+<!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_INDEX_RESEND_LINK}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<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>
+
+					<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_row">
+							<div class="table_left">
+								<h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
+							</div>
+
+							<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>
+
+					<h:panelGroup styleClass="error_container" layout="block">
+						<h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+					</h:panelGroup>
+
+					<div class="table_row">
+						<h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
+					</div>
+
+					<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>
+
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>