From 1aa79eafd6394610a3e0bc582cabdb1fda98ec7b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 6 May 2016 10:29:36 +0200
Subject: [PATCH] Moved to own (user) sub-folder to have recruiter's own
 templates
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../localization/bundle_de_DE.properties      |  6 ++--
 .../localization/bundle_en_US.properties      |  6 ++--
 .../guest/{ => user}/guest_login_form.tpl     |  4 +--
 web/guest/user/login.xhtml                    | 33 +++++++++++++++++++
 4 files changed, 41 insertions(+), 8 deletions(-)
 rename web/WEB-INF/templates/guest/{ => user}/guest_login_form.tpl (90%)
 create mode 100644 web/guest/user/login.xhtml

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 3ebaa15d..13a5475d 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -30,9 +30,9 @@ BUTTON_RESET_FORM=Formular zur\u00fccksetzen
 ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern
 ADMIN_BUTTON_DELETE_ENTRIES=L\u00f6schen
 PLEASE_FILL_ALL_FIELDS=Bitte alle Felder ausf\u00fcllen:
-GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ein:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein.
-GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
+GUEST_ENTER_USER_LOGIN_DATA_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ein:
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein.
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
 ENTER_PASSWORD=Passwort:
 LINK_GUEST_HOME_TITLE=Eingangsseite aufrufen
 LINK_GUEST_HOME=Home
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index b2161fbc..5829e49d 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -30,9 +30,9 @@ BUTTON_RESET_FORM=Reset form
 ADMIN_BUTTON_EDIT_ENTRIES=Edit
 ADMIN_BUTTON_DELETE_ENTRIES=Delete
 PLEASE_FILL_ALL_FIELDS=Please fill out all fields:
-GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your agent name and password:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned agent name and password.
-GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data:
+GUEST_ENTER_USER_LOGIN_DATA_TITLE=Please enter your user name and password:
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned user name and password.
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND=Please enter your login data:
 ENTER_PASSWORD=Password:
 LINK_GUEST_HOME_TITLE=Go to home page
 LINK_GUEST_HOME=Home
diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
similarity index 90%
rename from web/WEB-INF/templates/guest/guest_login_form.tpl
rename to web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 03ca598f..e34ebe30 100644
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -9,11 +9,11 @@
 		<h:form id="login_form">
 			<div class="table">
 				<div class="table_header">
-					#{msg.GUEST_ENTER_LOGIN_DATA_TITLE}
+					#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
 				</div>
 
 				<fieldset id="login_data">
-					<legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>
+					<legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}</legend>
 
 					<div class="table_row">
 						<div class="table_left">
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
new file mode 100644
index 00000000..e52d2790
--- /dev/null
+++ b/web/guest/user/login.xhtml
@@ -0,0 +1,33 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_USER_LOGIN}
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para">
+				<!-- TODO Internatialize this somehow //-->
+				Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
+			</div>
+
+			<div class="para">
+				<ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
+			</div>
+
+			<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:define>
+	</ui:composition>
+</html>
-- 
2.39.5