From: Roland Häder <roland@mxchange.org>
Date: Fri, 6 May 2016 08:29:36 +0000 (+0200)
Subject: Moved to own (user) sub-folder to have recruiter's own templates
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7437165298fefc0b7cc6177d25da0adc62dde038;p=jfinancials-war.git

Moved to own (user) sub-folder to have recruiter's own templates

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index bfc4cc1a..5d6be3e1 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 48fd3aaa..89bb140e 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/guest_login_form.tpl
deleted file mode 100644
index 03ca598f..00000000
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<div id="user_login_content">
-		<h:form id="login_form">
-			<div class="table">
-				<div class="table_header">
-					#{msg.GUEST_ENTER_LOGIN_DATA_TITLE}
-				</div>
-
-				<fieldset id="login_data">
-					<legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
-						</div>
-					</div>
-
-					<div class="clear"></div>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
-						</div>
-					</div>
-
-					<div class="clear"></div>
-				</fieldset>
-
-				<div class="table_footer">
-					<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
-				</div>
-			</div>
-		</h:form>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
new file mode 100644
index 00000000..e34ebe30
--- /dev/null
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<div id="user_login_content">
+		<h:form id="login_form">
+			<div class="table">
+				<div class="table_header">
+					#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
+				</div>
+
+				<fieldset id="login_data">
+					<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">
+							<h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+						</div>
+					</div>
+
+					<div class="clear"></div>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+						</div>
+					</div>
+
+					<div class="clear"></div>
+				</fieldset>
+
+				<div class="table_footer">
+					<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
+				</div>
+			</div>
+		</h:form>
+	</div>
+</ui:composition>
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 7c873975..15006b00 100644
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -22,7 +22,7 @@
 			</div>
 
 			<div class="para">
-				<ui:include id="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
+				<ui:include id="login_form" src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
 			</div>
 
 			<div class="para">