From: Roland Häder <roland@mxchange.org>
Date: Sun, 23 Apr 2017 12:09:55 +0000 (+0200)
Subject: no recruiter here
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a3f25a789cc25b8ccb3863de6e2a274b49030a3c;p=jjobs-war.git

no recruiter here

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

diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java
index f6b7b1e3..5cd85ba4 100644
--- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java
+++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java
@@ -312,7 +312,7 @@ public class JobsWebRequestHelperBean extends BaseJobsController implements Jobs
 		// Default key is "unused"
 		String messageKey = "CONTACT_IS_UNUSED"; //NOI18N
 
-		// Check user/recruiter
+		// Check user contact
 		boolean isUserContact = this.userController.isContactFound(contact);
 
 		// Check user first
diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
index bcdb7a98..1759cd86 100644
--- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
@@ -550,23 +550,23 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs
 		// Is all data set?
 		if (this.getUserName() == null) {
 			// Throw NPE
-			throw new NullPointerException("recruiterName is null"); //NOI18N
+			throw new NullPointerException("userName is null"); //NOI18N
 		} else if (this.getUserName().isEmpty()) {
 			// Is empty
-			throw new IllegalStateException("recruiterName is empty."); //NOI18N
+			throw new IllegalStateException("userName is empty."); //NOI18N
 		}
 
-		// Create new recruiter instance
-		User recruiter = new LoginUser();
+		// Create new user instance
+		User user = new LoginUser();
 
 		// Update all data ...
-		recruiter.setUserName(this.getUserName());
+		user.setUserName(this.getUserName());
 
 		// Trace message
-		//* NOISY-DEBUG */ System.out.println(MessageFormat.format("{0}.createUserLogin: recruiter={1} - EXIT!", this.getClass().getSimpleName(), recruiter));
+		//* NOISY-DEBUG */ System.out.println(MessageFormat.format("{0}.createUserLogin: user={1} - EXIT!", this.getClass().getSimpleName(), user));
 
 		// Return the new instance
-		return recruiter;
+		return user;
 	}
 
 	@Override
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 7391b0d5..a57eecd8 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -455,7 +455,7 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_1=Yes, I have read and understand the
 GUEST_AGREE_READ_TERMS_CONDITIONS_2=and I accept them with this.
 LINK_GUEST_TERMS_CONDITIONS=Terms & Conditions
 LINK_GUEST_PRIVACY_STATEMENTS=privacy statements
-ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the recruiter's contact data:
+ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the user's contact data:
 ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email address:
 ERROR_CONTACT_ID_NOT_FOUND=Error: contact data not found
 GUEST_REGISTRATION_PAGE1_TITLE=Registration page 1
diff --git a/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl b/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl
index 7ae3ace4..a2c8e79c 100644
--- a/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl
@@ -4,23 +4,22 @@
 	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="recruiter_login_content">
 		<h:form id="login_form">
 			<div class="table">
 				<div class="table_header">
-					<h:outputText value="#{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_TITLE}" />
+					<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
 				</div>
 
 				<fieldset id="login_data">
-					<legend title="#{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_RECRUITER_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">
-							<h:outputLabel for="recruiterName" value="#{msg.ENTER_RECRUITER_NAME}" />
+							<h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputText styleClass="input" id="recruiterName" value="#{recruiterController.recruiterName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_RECRUITER_NAME_MESSAGE}" />
+							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</div>
 					</div>
 
@@ -28,11 +27,11 @@
 
 					<div class="table_row">
 						<div class="table_left">
-							<h:outputLabel for="recruiterPassword" value="#{msg.ENTER_PASSWORD}" />
+							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret styleClass="input" id="recruiterPassword" value="#{recruiterController.recruiterPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</div>
 					</div>
 
@@ -41,7 +40,7 @@
 
 				<div class="table_footer">
 					<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" action="#{recruiterLoginController.doUserLogin()}" value="#{msg.BUTTON_RECRUITER_LOGIN}" />
+					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
 			</div>
 		</h:form>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 15dda796..db264d56 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -18,7 +18,7 @@
 
 					<div class="table_right">
 						<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-							<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
+							<!-- <f:validator for="currentPassword" validatorId="JobsUserPasswordValidator" /> //-->
 						</h:inputSecret>
 					</div>