From: Roland Häder Date: Sun, 16 Apr 2017 09:23:47 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d609682df891911a0ec7bb067285354475e4fe3;p=jjobs-war.git Please cherry-pick: - renamed login_change_* to login_user_change_* as these are user-specific changes - also renamed i18n strings - renamed method in email-change controller as it is user-specific, too - deleted left-over index.xhtml Signed-off-by: Roland Häder --- diff --git a/.gitignore b/.gitignore index c3577c9f..cf4a7c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -/nbproject/private/ -/nbproject/faces-config.NavData -/nbproject/genfiles.properties +nbproject/private/ +nbproject/faces-config.NavData +nbproject/genfiles.properties nbproject/*~ /manifest.mf /build/ diff --git a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java index d2760b0f..3e0a591e 100644 --- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java @@ -32,6 +32,7 @@ import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; +import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; import org.mxchange.jusercore.model.email_address.UserEmailChangeSessionBeanRemote; @@ -101,7 +102,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements } @Override - public String doChangeEmailAddress () { + public String doUserChangeEmailAddress () { // This method shall only be called if the user is logged-in if (!this.userLoginController.isUserLoggedIn()) { // Not logged-in @@ -118,7 +119,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements return ""; //NOI18N } else if (!this.userLoginController.ifCurrentPasswordMatches()) { // Password not matching - this.showFacesMessage("form_user_change_email_address:currentPassword", "ERROR_USER_CURRENT_PASSWORD_MISMATCHING"); //NOI18N + this.showFacesMessage("form_login_user_change_email_address:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N return ""; //NOI18N } diff --git a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionController.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionController.java index 16c50585..0c2c36b1 100644 --- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionController.java @@ -65,6 +65,6 @@ public interface JobsEmailChangeWebSessionController extends Serializable { *

* @return New target page */ - String doChangeEmailAddress (); + String doUserChangeEmailAddress (); } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 7f435682..e7e19ac0 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -185,57 +185,56 @@ LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben. LOGIN_NO_USER_NAME_MESSAGE=Sie haben keinen Benutzernamen eingegeben. USER_NOT_LOGGED_IN=Sie sind nicht angemeldet. LOGIN_OWN_PROFILE_INVISIBLE=Ihr Profil ist auf "durchsichtig" gestellt. -ERROR_USER_INSTANCE_NOT_SET=Fehler: Benutzer-Instanz nicht gesetzt. LINK_GUEST_LOGIN_LOST_PASSWORD=Passwort vergessen? LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Passwort wiederherstellen TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=Sie m\u00fcssen angemeldet sein USER_IS_NOT_LOGGED_IN_FULL=Damit diese Funktion nutzen k\u00f6nnen, m\u00fcssen Sie sich anmelden und in Ihren Account eingeloggt sein. LOGIN_EDIT_USER_DATA_TITLE=Was m\u00f6chten Sie \u00e4ndern? LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=Sie k\u00f6nnen hier Ihre pers\u00f6nlichen Daten, Ihre Email-Adresse und Ihr Passwort zum Einloggen \u00e4ndern. -LINK_LOGIN_CHANGE_PERSONAL_DATA=Pers\u00f6nliche Daten, wie Anschrift usw. \u00e4ndern -LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=\u00c4ndern Sie hier Ihre pers\u00f6nlichen Daten, wie Anschrift, Telefonnummer und so weiter. -LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Ihre Email-Adresse \u00e4ndern -LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre Email-Adresse. Dies ben\u00f6tigt eine weitere Best\u00e4tigung und kann jederzeit zur\u00fcckgaengig gemacht werden. -LINK_LOGIN_CHANGE_PASSWORD=Ihr Passwort \u00e4ndern -LINK_LOGIN_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie hier Ihr Passwort, falls Sie ein anderes m\u00f6chten. +LINK_LOGIN_USER_CHANGE_PERSONAL_DATA=Pers\u00f6nliche Daten, wie Anschrift usw. \u00e4ndern +LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=\u00c4ndern Sie hier Ihre pers\u00f6nlichen Daten, wie Anschrift, Telefonnummer und so weiter. +LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Ihre Email-Adresse \u00e4ndern +LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre Email-Adresse. Dies ben\u00f6tigt eine weitere Best\u00e4tigung und kann jederzeit zur\u00fcckgaengig gemacht werden. +LINK_LOGIN_USER_CHANGE_PASSWORD=Ihr Passwort \u00e4ndern +LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie hier Ihr Passwort, falls Sie ein anderes m\u00f6chten. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Bitte derzeitiges Passwort zur Best\u00e4tigung eingeben: LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Bitte geben Sie ihr derzeitiges Passwort zur Best\u00e4tigung der \u00c4nderungen ein. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Derzeitiges Passwort: BUTTON_CHANGE_PERSONAL_DATA=Pers\u00f6nliche Daten \u00e4ndern -LOGIN_CHANGE_PERSONAL_DATA_TITLE=Pers\u00f6nliche Daten \u00e4ndern: +LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Pers\u00f6nliche Daten \u00e4ndern: ERROR_USER_CURRENT_PASSWORD_MISMATCHING=Fehler: Ihr eingegebenes Passwort entspricht nicht dem aktuell gespeicherten Passwort. MESSAGE_BOX_TITLE=Hinweis: MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Fehler: Parameter "message" nicht gesetzt. LOGIN_MESSAGE_DATA_SAVED=Daten wurden gespeichert. PAGE_TITLE_LOGIN_DATA_SAVED=Ihre Daten wurden gespeichert CONTENT_TITLE_LOGIN_DATA_SAVED=Daten wurden gespeichert: -LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse: -LOGIN_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern: -LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen. -LOGIN_CHANGE_EMAIL_OLD_ADDRESS=Ihre derzeitige Email-Adresse: -LOGIN_CHANGE_EMAIL_ENTER_EMAIL=Neue Email-Adresse eingeben: -LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Neue Email-Adresse wiederholen: +LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse: +LOGIN_USER_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern: +LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen. +LOGIN_USER_CHANGE_EMAIL_OLD_ADDRESS=Ihre derzeitige Email-Adresse: +LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL=Neue Email-Adresse eingeben: +LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Neue Email-Adresse wiederholen: BUTTON_CHANGE_EMAIL_ADDRESS=Email-Adresse \u00e4ndern -PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=\u00c4ndern Ihrer Email-Adresse -CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Neue Email-Adresse eingeben: +PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=\u00c4ndern Ihrer Email-Adresse +CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Neue Email-Adresse eingeben: #TODO: Please fix German umlaut! -PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Ihre persoenlichen Daten aendern +PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Ihre persoenlichen Daten aendern #TODO: Please fix German umlaut! -CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Aendern Ihrer Adresse, Telefonnummer usw.: +CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Aendern Ihrer Adresse, Telefonnummer usw.: LOGIN_MESSAGE_DATA_SAVED=Daten wurden gespeichert. PAGE_TITLE_LOGIN_DATA_SAVED=Ihre Daten wurden gespeichert CONTENT_TITLE_LOGIN_DATA_SAVED=Daten wurden gespeichert: -LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse: -LOGIN_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern: -LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen. -LOGIN_CHANGE_EMAIL_OLD_ADDRESS=Ihre derzeitige Email-Adresse: -LOGIN_CHANGE_EMAIL_ENTER_EMAIL=Neue Email-Adresse eingeben: -LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Neue Email-Adresse wiederholen: +LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse: +LOGIN_USER_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern: +LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen. +LOGIN_USER_CHANGE_EMAIL_OLD_ADDRESS=Ihre derzeitige Email-Adresse: +LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL=Neue Email-Adresse eingeben: +LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Neue Email-Adresse wiederholen: BUTTON_CHANGE_EMAIL_ADDRESS=Email-Adresse \u00e4ndern -PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=\u00c4ndern Ihrer Email-Adresse -CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Neue Email-Adresse eingeben: -PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Ihre pers\u00f6nlichen Daten \u00e4ndern -CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA=\u00c4ndern Ihrer Adresse, Telefonnummer usw.: +PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=\u00c4ndern Ihrer Email-Adresse +CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Neue Email-Adresse eingeben: +PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Ihre pers\u00f6nlichen Daten \u00e4ndern +CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=\u00c4ndern Ihrer Adresse, Telefonnummer usw.: SELECT_LANGUAGE=Sprache: DE_DE=Deutsch (DE) EN_US=English (US) @@ -779,12 +778,12 @@ ADMIN_USER_DELETE_REASON=L\u00f6schgrund: (optional) ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Die beiden von Ihnen eingegebenen Passw\u00f6rter stimmen nicht \u00fcberein. ADMIN_USER_NAME_ALREADY_EXISTS=Der von Ihnen eingegebene Benutzername existiert bereits (anderes Benutzeraccount). ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=Sie haben das Passwort nicht ge\u00e4ndert (selibiges wie gespeichertes). -PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD=\u00c4ndern Ihres Zugangspasswortes -CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD=\u00c4ndern Sie hier Ihr Zugangspasswort: +PAGE_TITLE_USER_LOGIN_USER_CHANGE_PASSWORD=\u00c4ndern Ihres Zugangspasswortes +CONTENT_TITLE_USER_LOGIN_USER_CHANGE_PASSWORD=\u00c4ndern Sie hier Ihr Zugangspasswort: USER_MUST_CHANGE_PASSWORD_NOTICE=Sie m\u00fcssen Ihr Passwort \u00e4ndern, da dies vom Administrator so vorgegeben ist. Danach k\u00f6nnen Sie Ihren Account wieder normal verwenden. -LOGIN_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie Ihr Passwort: -LOGIN_CHANGE_PASSWORD_LEGEND=Bitte zweimal das neue Passwort eingeben: -LOGIN_CHANGE_PASSWORD_LEGEND_TITLE=Das neue Passwort muss zweimal eingegeben werden, um Tippfehler auszuschlie\u00dfen. Dabei darf es mit bereits verwendeten Passw\u00f6rtern nicht \u00fcbereinstimmen. +LOGIN_USER_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie Ihr Passwort: +LOGIN_USER_CHANGE_PASSWORD_LEGEND=Bitte zweimal das neue Passwort eingeben: +LOGIN_USER_CHANGE_PASSWORD_LEGEND_TITLE=Das neue Passwort muss zweimal eingegeben werden, um Tippfehler auszuschlie\u00dfen. Dabei darf es mit bereits verwendeten Passw\u00f6rtern nicht \u00fcbereinstimmen. ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Das \u00c4ndern der Email-Adresse ist administrativ deaktiviert worden. ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=Die von Ihnen eingegebene Email-Adresse hatten Sie bereits zum \u00c4ndern eingegeben. Bitte melden Sie sich beim Support. ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Die von Ihnen eingegebenen Email-Adressen stimmen nicht \u00fcberein. @@ -795,3 +794,6 @@ BUTTON_USER_CHANGE_PASSWORD=Passwort \u00e4ndern ADMIN_LINK_SHOW_CONTACT_DATA=Kontaktdaten anzeigen ERROR_USER_PASSWORD_TO_WEAK=Das eingegebene Passwort ist zu schwach. Bitte geben Sie Bustaben, Zahlen und Sonderzeichen ein, um ein sicheres Passwort zu erstellen. ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Fehler: Anmeldeseite ist die Eingangsseite, nicht die Anmeldeseite. +ERROR_ADMIN_BEAN_CELLPHONE_NUMBER_NOT_SET=Fehler: Instanz 'cellPhone' in administrativer Bean nicht gesetzt. +CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=Mobiltelefonnummern auflisten: +LOGIN_ENTER_CURRENT_PASSWORD=Aktuelles Passwort eingeben: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index cdfbe13e..ea61ed59 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -194,34 +194,34 @@ TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=You need to be logged-in USER_IS_NOT_LOGGED_IN_FULL=To use this feature you need to register and be logged-in into your account. LOGIN_EDIT_USER_DATA_TITLE=What do you want to change? LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=You can change your personal data, your email address and your password for login here. -LINK_LOGIN_CHANGE_PERSONAL_DATA=Change personal data such as your address. -LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on. -LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address -LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone. -LINK_LOGIN_CHANGE_PASSWORD=Change your password -LINK_LOGIN_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one. +LINK_LOGIN_USER_CHANGE_PERSONAL_DATA=Change personal data such as your address. +LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on. +LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Change your email address +LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone. +LINK_LOGIN_USER_CHANGE_PASSWORD=Change your password +LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation: LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password: BUTTON_CHANGE_PERSONAL_DATA=Change personal data -LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data: +LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change personal data: ERROR_USER_CURRENT_PASSWORD_MISMATCHING=Error: Your entered password doesn't match the currently stored one. MESSAGE_BOX_TITLE=Notice: MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Error: Parameter "message" not set. LOGIN_MESSAGE_DATA_SAVED=Data has been saved. PAGE_TITLE_LOGIN_DATA_SAVED=Your data has been saved CONTENT_TITLE_LOGIN_DATA_SAVED=Data has been saved: -LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address: -LOGIN_CHANGE_EMAIL_LEGEND=Change email address: -LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Here you can change your email address. You can do this by entering it twice and then confirm the new one. -LOGIN_CHANGE_EMAIL_OLD_ADDRESS=Your current email address: -LOGIN_CHANGE_EMAIL_ENTER_EMAIL=Enter new email address: -LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Repeat new email address: +LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address: +LOGIN_USER_CHANGE_EMAIL_LEGEND=Change email address: +LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE=Here you can change your email address. You can do this by entering it twice and then confirm the new one. +LOGIN_USER_CHANGE_EMAIL_OLD_ADDRESS=Your current email address: +LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL=Enter new email address: +LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Repeat new email address: BUTTON_CHANGE_EMAIL_ADDRESS=Change email address -PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address -CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Enter new email address: -PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Change your personal data -CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Change your address, phone number or others: +PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Change your email address +CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Enter new email address: +PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Change your personal data +CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Change your address, phone number or others: SELECT_LANGUAGE=Language: DE_DE=Deutsch (DE) EN_US=English (US) @@ -477,23 +477,23 @@ GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS=Please enter email address you have used o GUEST_RESEND_CONFIRMATION_LINK_NOTICE=The old confirmation link won't work after this. Please always use the one from newer email. RESEND_CONFIRMATION_LINK_LEGEND=Enter email address: RESEND_CONFIRMATION_LINK_LEGEND_TITLE=Please enter your email address you have used on registration. -LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone. +LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password: LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change. LOGIN_EDIT_USER_DATA_TITLE=What do you want to change? LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=You can change your personal data, your email address and your password for login here. BUTTON_CHANGE_PERSONAL_DATA=Change personal data -LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on. -LINK_LOGIN_CHANGE_PASSWORD=Change your password -LINK_LOGIN_CHANGE_PERSONAL_DATA=Change personal data such as your address. +LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on. +LINK_LOGIN_USER_CHANGE_PASSWORD=Change your password +LINK_LOGIN_USER_CHANGE_PERSONAL_DATA=Change personal data such as your address. LINK_GUEST_LOGIN_LOST_PASSWORD=Forgot your password? SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE=If you choose "Invisible", nobody can share address books with you. SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS=If you choose "Only members", other users can start sharing address books with you. SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC=If you choose "All" the whole Internet can view your profile, including bots. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation: -LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data: -LINK_LOGIN_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one. -LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address +LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change personal data: +LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one. +LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Change your email address LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Restore your password PAGE_TITLE_INDEX_CONFIRM_ACCOUNT=Confirm registration CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT=Confirm user registration: @@ -780,12 +780,12 @@ ADMIN_USER_DELETE_REASON=Delete reason: (optional) ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Your both entered passwords don't match. ADMIN_USER_NAME_ALREADY_EXISTS=Your entered user name does already exist in other user account. ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=You have not changed the password (same as stored entered) -PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD=Change your user account password -CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD=Here you can change your user account password: +PAGE_TITLE_USER_LOGIN_USER_CHANGE_PASSWORD=Change your user account password +CONTENT_TITLE_USER_LOGIN_USER_CHANGE_PASSWORD=Here you can change your user account password: USER_MUST_CHANGE_PASSWORD_NOTICE=You have to change your password as this is requested by the administrator. After successful change, you can use your account as usual. -LOGIN_CHANGE_PASSWORD_TITLE=Change your password: -LOGIN_CHANGE_PASSWORD_LEGEND=Please enter twice the new password: -LOGIN_CHANGE_PASSWORD_LEGEND_TITLE=The new password must be entered twice to avoid typing mistakes. It still must not match older passwords. +LOGIN_USER_CHANGE_PASSWORD_TITLE=Change your password: +LOGIN_USER_CHANGE_PASSWORD_LEGEND=Please enter twice the new password: +LOGIN_USER_CHANGE_PASSWORD_LEGEND_TITLE=The new password must be entered twice to avoid typing mistakes. It still must not match older passwords. ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Changing of user's email address is administratively deactivated. ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=You have already entered the email address for changing. Please report to support. ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Your both entered email addresses are mismatching. @@ -796,3 +796,6 @@ BUTTON_USER_CHANGE_PASSWORD=Change password ADMIN_LINK_SHOW_CONTACT_DATA=Show contact data ERROR_USER_PASSWORD_TO_WEAK=Your entered password is to weak. Please enter letters, numbers and special characters to create a secure password. ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Registration page is index, not the registration page. +ERROR_ADMIN_BEAN_CELLPHONE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in administrative bean not set. +CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List mobile phone numbers: +LOGIN_ENTER_CURRENT_PASSWORD=Enter current password: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 37737aee..e640f6a7 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -222,14 +222,14 @@ - /user/login_change_password.xhtml + /user/login_user_change_password.xhtml user_data_saved /user/login_data_saved.xhtml - /user/login_change_email_address.xhtml + /user/login_user_change_email_address.xhtml user_contact_data_saved /user/login_contact_data_saved.xhtml @@ -240,7 +240,7 @@ - /user/login_change_personal_data.xhtml + /user/login_user_change_personal_data.xhtml user_data_saved /user/login_data_saved.xhtml diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl index d20a2d1e..f138ece7 100644 --- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl @@ -8,7 +8,7 @@

- +
@@ -26,7 +26,7 @@
- +
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl index 0d478bcb..de026340 100644 --- a/web/WEB-INF/templates/login/user/user_menu.tpl +++ b/web/WEB-INF/templates/login/user/user_menu.tpl @@ -35,19 +35,19 @@
  • - +
  • - +
  • - +
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml deleted file mode 100644 index 7db906ed..00000000 --- a/web/user/login_change_email_address.xhtml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - -
- -
- - -
-
- - - - -
-
- -
- -
- -
- -
-
- - -
-
- - - -
- - -
- - - - - - - - - - - - - - - - diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml deleted file mode 100644 index dc647b75..00000000 --- a/web/user/login_change_password.xhtml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
-
- - - - -
-
- -
- -
- -
- -
-
- - - - - -
-
- -
- -
- -
- -
-
- - - - -
-
- - - -
- - -
- - - - - - - - - - - - - - - - - diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml deleted file mode 100644 index f8ec40bb..00000000 --- a/web/user/login_change_personal_data.xhtml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - -
- -
- - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml deleted file mode 100644 index 1eceebde..00000000 --- a/web/user/login_contact_data_saved.xhtml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml new file mode 100644 index 00000000..3dde1ed8 --- /dev/null +++ b/web/user/login_edit_user_data.xhtml @@ -0,0 +1,57 @@ + + + + + #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} + + + #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA} + + + + +
+
+ +
+ +
+ +
+ +
+
    + +
  • + +
    • +     + + +
  • + +
    • +     + + +
  • + +
    • +     +
+
+
+ + + + + + + + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml new file mode 100644 index 00000000..ceb7b32c --- /dev/null +++ b/web/user/login_user_change_email_address.xhtml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + +
+ +
+ + +
+
+ + + + +
+
+ +
+ +
+ +
+ +
+
+ + +
+
+ + + +
+ + +
+ + + + + + + + + + + + + + + + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml new file mode 100644 index 00000000..1cd19d20 --- /dev/null +++ b/web/user/login_user_change_password.xhtml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+
+ + + + +
+
+ +
+ +
+ +
+ +
+
+ + + + + +
+
+ +
+ +
+ +
+ +
+
+ + + + +
+
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml new file mode 100644 index 00000000..a1fd6f19 --- /dev/null +++ b/web/user/login_user_change_personal_data.xhtml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml new file mode 100644 index 00000000..1eceebde --- /dev/null +++ b/web/user/login_user_contact_data_saved.xhtml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +