]> git.mxchange.org Git - jfinancials-war.git/commitdiff
no recruiter here
authorRoland Häder <roland@mxchange.org>
Sun, 23 Apr 2017 12:11:41 +0000 (14:11 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 23 Apr 2017 12:11:41 +0000 (14:11 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java
src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/login/user/user_enter_current_password.tpl
web/resources/css/cssLayout.css

index 7d39f004b3f533a0968868e72312ec3a601b7ae6..a14f4e5247a0316de73af295f9a038f07ba98087 100644 (file)
@@ -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
index 6b573a60d2df10c35fe7255ab29ce1558a64bea8..9f2cf9423e355e0a7a57b58656541cfcbd51765f 100644 (file)
@@ -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
index c0b47a08340abacff673749417c88e109a347650..c05e55c19ee58189a79dc796dcb93660bd287d9b 100644 (file)
@@ -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
index ec37daf91355fe9c79c9d3017ec7951537309c17..1f274a5dfea617718e82918138c06a66fa170e0f 100644 (file)
@@ -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
index 06ce59b3cafa990b6ca8cf25edf6106e82b96d99..e132b6c785c732bc25f8181b003b46fbb84c9ce3 100644 (file)
@@ -18,7 +18,7 @@
 
                                <div class="table_right">
                                        <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
-                                               <!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
+                                               <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
                                        </h:inputSecret>
                                </div>
 
index 69402ba6e784205d8de2de1e27fa60746c08311f..457d841aa312e2e4df3b19ede3fe988819c943f4 100644 (file)
@@ -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;
 }