From 6a66eb4f1fd445bc8610beaad2a02d89996f1844 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 16 Apr 2017 11:23:47 +0200 Subject: [PATCH] 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 166 +++++++++--------- .../localization/bundle_de_DE.properties | 55 +++--- .../localization/bundle_en_US.properties | 48 +++-- .../PizzaEmailChangeWebSessionBean.java | 4 +- .../PizzaEmailChangeWebSessionController.java | 2 +- web/WEB-INF/faces-config.xml | 6 +- ...ser_change_email_address_repeat_fields.tpl | 4 +- web/user/login_edit_user_data.xhtml | 6 +- ... => login_user_change_email_address.xhtml} | 16 +- ...xhtml => login_user_change_password.xhtml} | 12 +- ... => login_user_change_personal_data.xhtml} | 6 +- 11 files changed, 170 insertions(+), 155 deletions(-) rename web/user/{login_change_email_address.xhtml => login_user_change_email_address.xhtml} (80%) rename web/user/{login_change_password.xhtml => login_user_change_password.xhtml} (90%) rename web/user/{login_change_personal_data.xhtml => login_user_change_personal_data.xhtml} (90%) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 654fe57b..612fb421 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,89 +2,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 9a219cc6..d2043782 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -158,50 +158,50 @@ 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_CURRENT_PASSWORD_MISMATCHING=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) @@ -606,3 +606,4 @@ ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht geset ERROR_BEAN_HELPER_CONTACT_NOT_SET=Fehler: Instanz 'contact' im Bean-Helper nicht gesetzt. 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 51ec80ad..251cad2a 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -152,23 +152,36 @@ USER_NOT_LOGGED_IN=You are not signed in. LOGIN_OWN_PROFILE_INVISIBLE=Your profile is set to "invisible". 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_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_USER_CHANGE_PERSONAL_DATA_TITLE=Change personal data: ERROR_CURRENT_PASSWORD_MISMATCHING=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) @@ -466,23 +479,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: @@ -589,3 +602,4 @@ ERROR_BEAN_HELPER_USER_NOT_SET=Error: Instance 'user' not set in bean helper. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Error: Instance 'contact' not set in bean helper. 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/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java index 3c82045a..fa4f16ba 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java @@ -104,7 +104,7 @@ public class PizzaEmailChangeWebSessionBean extends BasePizzaController implemen } @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 @@ -117,7 +117,7 @@ public class PizzaEmailChangeWebSessionBean extends BasePizzaController implemen throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N } else if (!this.userLoginController.ifCurrentPasswordMatches()) { // Password not matching - this.showFacesMessage("form_login_change_email_address:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N + this.showFacesMessage("form_login_user_change_email_address:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N return ""; //NOI18N } else if (!this.featureController.isFeatureEnabled("edit_user_data")) { //NOI18N // Editing is not allowed diff --git a/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java index 006a823c..056027c0 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java @@ -65,6 +65,6 @@ public interface PizzaEmailChangeWebSessionController extends Serializable { *

* @return New target page */ - String doChangeEmailAddress (); + String doUserChangeEmailAddress (); } diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index dc93c86f..01afd1f1 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -196,15 +196,15 @@ /user/login_edit_user_data.xhtml user_change_email_address - /user/login_change_email_address.xhtml + /user/login_user_change_email_address.xhtml user_change_password - /user/login_change_password.xhtml + /user/login_user_change_password.xhtml user_change_personal_data - /user/login_change_personal_data.xhtml + /user/login_user_change_personal_data.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 685b5bb3..72a423da 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 @@

- +
@@ -22,7 +22,7 @@
- +
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index fbdda7de..3dde1ed8 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -29,19 +29,19 @@
  • - +
  • - +
  • - +
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml similarity index 80% rename from web/user/login_change_email_address.xhtml rename to web/user/login_user_change_email_address.xhtml index f329ea45..1df0b8c3 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -8,29 +8,29 @@ > - #{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} + #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS} - #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} + #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}
- +
- +
- - + +
- +
@@ -48,7 +48,7 @@
- +
diff --git a/web/user/login_change_password.xhtml b/web/user/login_user_change_password.xhtml similarity index 90% rename from web/user/login_change_password.xhtml rename to web/user/login_user_change_password.xhtml index 847c6623..46ce7b4f 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -8,10 +8,10 @@ > - #{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD} + #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PASSWORD} - #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD} + #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD} @@ -19,19 +19,19 @@
- +
- - + +
- +
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml similarity index 90% rename from web/user/login_change_personal_data.xhtml rename to web/user/login_user_change_personal_data.xhtml index 0676793f..9bd33af1 100644 --- a/web/user/login_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -8,17 +8,17 @@ > - #{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA} + #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA} - #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA} + #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}
- +
-- 2.39.5