From 9624a17d27db19fd863646ed4226ce5bb8307278 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 +-
 .../generic/gender_selection_box.tpl          | 32 +++---
 .../generic/mobile_selection_box.tpl          | 40 ++++----
 .../guest/{ => user}/guest_login_form.tpl     | 98 +++++++++----------
 web/guest/user/login.xhtml                    |  2 +-
 6 files changed, 92 insertions(+), 92 deletions(-)
 rename web/WEB-INF/templates/guest/{ => user}/guest_login_form.tpl (88%)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index b2902e22..b5a95077 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 eb41d8e8..2a06f495 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 user name and password:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned user 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/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index 682b9409..4a5919f1 100644
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -1,16 +1,16 @@
-<?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">
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}">
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
-		</h:selectOneMenu>
-	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>
+<?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">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}">
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
+		</h:selectOneMenu>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index cf46430b..14515170 100644
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -1,20 +1,20 @@
-<?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">
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{mobileController.allMobileProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
-			<f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>
+<?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">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItems value="#{mobileController.allMobileProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
+		</h:selectOneMenu>
+
+		<h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
+			<f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
+		</h:inputText>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
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 88%
rename from web/WEB-INF/templates/guest/guest_login_form.tpl
rename to web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 5a5ca1bc..fb8b6d00 100644
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -1,49 +1,49 @@
-<?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>
+<?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">
-- 
2.39.5