]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 16 Apr 2017 09:23:47 +0000 (11:23 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 16 Apr 2017 09:51:27 +0000 (11:51 +0200)
- 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 <roland@mxchange.org>
17 files changed:
.gitignore
src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionController.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
web/WEB-INF/templates/login/user/user_menu.tpl
web/user/login_change_email_address.xhtml [deleted file]
web/user/login_change_password.xhtml [deleted file]
web/user/login_change_personal_data.xhtml [deleted file]
web/user/login_contact_data_saved.xhtml [deleted file]
web/user/login_edit_user_data.xhtml [new file with mode: 0644]
web/user/login_user_change_email_address.xhtml [new file with mode: 0644]
web/user/login_user_change_password.xhtml [new file with mode: 0644]
web/user/login_user_change_personal_data.xhtml [new file with mode: 0644]
web/user/login_user_contact_data_saved.xhtml [new file with mode: 0644]

index c3577c9fafddb71b6f64e2ed39da598e61ac3ac2..cf4a7c5b0dae6e64df0a9d42472e823cbac70ce2 100644 (file)
@@ -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/
index d2760b0fc02bdc76d039feb14d4a173fe972caf2..3e0a591e1f86f67d37a998ac169ced1edb5d23ad 100644 (file)
@@ -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
                }
 
index 16c5058509e3e50fd32ac5b9574800edfd0488a5..0c2c36b17025b9a89309ae82995b639155882f8f 100644 (file)
@@ -65,6 +65,6 @@ public interface JobsEmailChangeWebSessionController extends Serializable {
         * <p>
         * @return New target page
         */
-       String doChangeEmailAddress ();
+       String doUserChangeEmailAddress ();
 
 }
index 7f4356826b17f6af51e6770f39d665fa37873476..e7e19ac0c394353dbdfd891323ed6b73aac0430e 100644 (file)
@@ -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:
index cdfbe13e05ec97b4c0f3845b2510a2ef4bf732c0..ea61ed59d2eb607bcdaad41cc80421f943aed63a 100644 (file)
@@ -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:
index 37737aee949c7e3c81463b039cf7877bc4d8a22f..e640f6a73608e10464b40693b65a74e6ed906aad 100644 (file)
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_password.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_password.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_data_saved</from-outcome>
                        <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_email_address.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_email_address.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_contact_data_saved</from-outcome>
                        <to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_personal_data.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_data_saved</from-outcome>
                        <to-view-id>/user/login_data_saved.xhtml</to-view-id>
index d20a2d1e3027e1ffa91f93b74e58b0e6afdbefaa..f138ece7ef0873f32b1439385d714b7607ea695d 100644 (file)
@@ -8,7 +8,7 @@
 
        <div class="table_row">
                <div class="table_left">
-                       <h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
+                       <h:outputLabel for="emailAddress" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL}" />
                </div>
 
                <div class="table_right">
@@ -26,7 +26,7 @@
 
        <div class="table_row">
                <div class="table_left">
-                       <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
+                       <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
                </div>
 
                <div class="table_right">
index 0d478bcb9074a4ffa91706a2cc7a2ea6ec49e76e..de026340a693d238c9b010e13c0824f8680532fd 100644 (file)
                                <ul>
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
                                                <li>
-                                                       <h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
                                                <li>
-                                                       <h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
                                                <li>
-                                                       <h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
                                                </li>
                                        </ui:fragment>
                                </ul>
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
deleted file mode 100644 (file)
index 7db906e..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
-                               </div>
-
-                               <h:form id="form_user_change_email_address">
-                                       <div class="para">
-                                               <fieldset class="fieldset" id="change_email">
-                                                       <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
-                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
-                                                       </legend>
-
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:outputText value="#{contactController.emailAddress}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </div>
-
-                                                       <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
-                                               </fieldset>
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
-                                       </div>
-                               </h:form>
-                       </h:panelGroup>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
deleted file mode 100644 (file)
index dc647b7..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
-                                       </div>
-
-                                       <h:form id="form_user_change_password">
-                                               <div class="para">
-                                                       <fieldset class="fieldset" id="change_password">
-                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
-                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
-                                                               </legend>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
-                                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </h:panelGroup>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
-                                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </h:panelGroup>
-                                                       </fieldset>
-                                               </div>
-
-                                               <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
-
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-                                               </div>
-                                       </h:form>
-                               </h:panelGroup>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
deleted file mode 100644 (file)
index f8ec40b..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
-                               </div>
-
-                               <h:form id="form_login_change_personal">
-                                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
-
-                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
-
-                                       <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-                                       </div>
-                               </h:form>
-                       </h:panelGroup>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
deleted file mode 100644 (file)
index 1eceebd..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
new file mode 100644 (file)
index 0000000..3dde1ed
--- /dev/null
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
+                                       </div>
+
+                                       <div class="para notice">
+                                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+                                       </div>
+
+                                       <div class="para">
+                                               <ul>
+                                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                                                               <li>
+                                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+                                                               </li>
+                                                       </ui:fragment>
+
+                                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                                                               <li>
+                                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+                                                               </li>
+                                                       </ui:fragment>
+
+                                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+                                                               <li>
+                                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+                                                               </li>
+                                                       </ui:fragment>
+                                               </ul>
+                                       </div>
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
new file mode 100644 (file)
index 0000000..ceb7b32
--- /dev/null
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
+                               </div>
+
+                               <h:form id="form_user_change_email_address">
+                                       <div class="para">
+                                               <fieldset class="fieldset" id="change_email">
+                                                       <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+                                                       </legend>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left">
+                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:outputText value="#{contactController.emailAddress}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                                       <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
+                                               </fieldset>
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
+                                       <div class="table_footer">
+                                               <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
+                                       </div>
+                               </h:form>
+                       </h:panelGroup>
+
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
new file mode 100644 (file)
index 0000000..1cd19d2
--- /dev/null
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
+                                       </div>
+
+                                       <h:form id="form_user_change_password">
+                                               <div class="para">
+                                                       <fieldset class="fieldset" id="change_password">
+                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
+                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
+                                                               </legend>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+
+                                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                               </h:panelGroup>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+
+                                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                               </h:panelGroup>
+                                                       </fieldset>
+                                               </div>
+
+                                               <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+                                               </div>
+                                       </h:form>
+                               </h:panelGroup>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
new file mode 100644 (file)
index 0000000..a1fd6f1
--- /dev/null
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
+                               </div>
+
+                               <h:form id="form_login_change_personal">
+                                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+
+                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+
+                                       <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+                                       </div>
+                               </h:form>
+                       </h:panelGroup>
+
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
new file mode 100644 (file)
index 0000000..1eceebd
--- /dev/null
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>