From 66839273cf252094db0e5669659789eaf954a56c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 23 Apr 2017 14:11:41 +0200 Subject: [PATCH] no recruiter here MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../helper/FinancialsWebRequestHelperBean.java | 2 +- .../beans/user/FinancialsUserWebSessionBean.java | 14 +++++++------- .../mxchange/localization/bundle_de_DE.properties | 5 +---- .../mxchange/localization/bundle_en_US.properties | 5 +---- .../login/user/user_enter_current_password.tpl | 2 +- web/resources/css/cssLayout.css | 4 ++-- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java index 7d39f004..a14f4e52 100644 --- a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java @@ -311,7 +311,7 @@ public class FinancialsWebRequestHelperBean implements FinancialsWebRequestHelpe // 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/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java index 6b573a60..9f2cf942 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java @@ -550,23 +550,23 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple // 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_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index c0b47a08..c05e55c1 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -453,11 +453,8 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_1=Ja, ich habe die GUEST_AGREE_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit an. LINK_GUEST_TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen LINK_GUEST_PRIVACY_STATEMENTS=Datenschutzbestimmungen -ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie die Kontaktdaten des Recruiters ein: +ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie die Kontaktdaten des Benutzers ein: ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email-Adresse: -MENU_RECRUIITER_TITLE=F\u00fcr Recruiter -LINK_RERUITER_LOGIN=Einloggen -LINK_RERUITER_LOGIN_TITLE=Zum Recruiter-Bereich einloggen ERROR_CONTACT_ID_NOT_FOUND=Fehler: Kontaktdaten nicht gefunden. GUEST_REGISTRATION_PAGE1_TITLE=Anmeldeseite 1 GUEST_REGISTRATION_PAGE2_TITLE=Anmeldeseite 2 diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index ec37daf9..1f274a5d 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -432,11 +432,8 @@ 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: -MENU_RECRUIITER_TITLE=For recruiter -LINK_RERUITER_LOGIN=Login -LINK_RERUITER_LOGIN_TITLE=Login to recruiter area ERROR_CONTACT_ID_NOT_FOUND=Error: contact data not found GUEST_REGISTRATION_PAGE1_TITLE=Registration page 1 GUEST_REGISTRATION_PAGE2_TITLE=Registration page 2 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 06ce59b3..e132b6c7 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 @@
- +
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 69402ba6..457d841a 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -280,7 +280,7 @@ ul.footer_nav li.footer_copyright { color: #00aa00; } -.user_status_confirmed, .customer_status_confirmed, .recruiter_status_confirmed { +.user_status_confirmed, .customer_status_confirmed { color: #00aa00; } @@ -288,7 +288,7 @@ ul.footer_nav li.footer_copyright { color: #00aaaa; } -.user_status_locked, .customer_status_locked, .recruiter_status_locked { +.user_status_locked, .customer_status_locked { color: #aa0000; } -- 2.39.5