]> git.mxchange.org Git - pizzaservice-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:32:19 +0000 (11:32 +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>
14 files changed:
nbproject/faces-config.NavData
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java
src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java
web/WEB-INF/faces-config.xml
web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.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_edit_user_data.xhtml
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]

index 654fe57b708e2f8fcd49d19df085fdd7159fc52d..612fb42120ec5ac41778adb9006b1a08a372c28c 100644 (file)
@@ -2,89 +2,89 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="900" y="1350" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="user/login_logout.xhtml" x="1900" y="750" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_delete.xhtml" x="3150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/index.xhtml" x="150" y="1800" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="customer/register.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_show.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="item_added.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="2150" y="750" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_edit.xhtml" x="1150" y="1200" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="400" y="1650" zoom="true"/>
-        <Node id="*" x="900" y="150" zoom="true"/>
-        <Node id="customer/login.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/login.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="400" y="1500" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="2400" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_export.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="guest/user/resend_done.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="2900" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2900" y="150" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="2150" y="600" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="1400" y="1050" zoom="true"/>
-        <Node id="basket.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="exception.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="1500" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_lock.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="150" y="1650" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="logout.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="2650" y="300" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="imprint.xhtml" x="2650" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="2400" y="600" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="2650" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_logout.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_delete.xhtml" x="2900" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="privacy.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="2900" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="2400" y="600" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="customer/register.xhtml" x="2650" y="450" zoom="true"/>
+        <Node id="item_added.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="2400" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_show.xhtml" x="3150" y="150" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_edit.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1900" y="750" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="customer/login.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="*" x="650" y="1350" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2150" y="600" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="user/login.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="2150" y="750" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_export.xhtml" x="1150" y="1200" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="guest/user/resend_done.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/login_user_change_password.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="basket.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="exception.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="1400" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="1350" zoom="true"/>
+        <Node id="admin/user/admin_user_lock.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1650" y="900" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="logout.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="400" y="1650" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="user/login_user_change_personal_data.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="650" y="1500" zoom="true"/>
+        <Node id="imprint.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="1800" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/login_user_change_email_address.xhtml" x="2650" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
index 9a219cc6b6da7540b6379aa9342a069392086627..d2043782d85f32dc85081d78faa32a317b7a4537 100644 (file)
@@ -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:
index 51ec80ad973565c3b1d9c80101f1fec069ca483d..251cad2a9525c5719b4ba2bd6a78505646d9c984 100644 (file)
@@ -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:
index 3c82045ae2bb2cf1f319871a8c39d58082894702..fa4f16ba3721b3fdb245a6c4d98879a51e852b6f 100644 (file)
@@ -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
index 006a823cf06caab8be62b2358598a6fa0c75443d..056027c0f5f9200f462e58f6663d6c9b180a765f 100644 (file)
@@ -65,6 +65,6 @@ public interface PizzaEmailChangeWebSessionController extends Serializable {
         * <p>
         * @return New target page
         */
-       String doChangeEmailAddress ();
+       String doUserChangeEmailAddress ();
 
 }
index dc93c86fcd82529f9e60606a59718676f08cbf60..01afd1f1e1b66a02ccf431ba7f2599455c4f26c1 100644 (file)
                <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_change_email_address</from-outcome>
-                       <to-view-id>/user/login_change_email_address.xhtml</to-view-id>
+                       <to-view-id>/user/login_user_change_email_address.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_change_password</from-outcome>
-                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
+                       <to-view-id>/user/login_user_change_password.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_change_personal_data</from-outcome>
-                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
+                       <to-view-id>/user/login_user_change_personal_data.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
index 685b5bb3879a0d87a2a993c9b30783c1a67e580b..72a423dac72726e0a1afdeadc52de52e2120798d 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">
@@ -22,7 +22,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">
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
deleted file mode 100644 (file)
index f329ea4..0000000
+++ /dev/null
@@ -1,68 +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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
-                                       </div>
-
-                                       <h:form id="form_login_change_email_address">
-                                               <div class="para">
-                                                       <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" 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>
-                               </div>
-                       </ui:fragment>
-
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
-
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/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 847c662..0000000
+++ /dev/null
@@ -1,99 +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">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
-                                               </div>
-
-                                               <h:form id="form_user_change_password">
-                                                       <div class="para">
-                                                               <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="userCurrentPassword" value="#{msg.GUEST_REGISTRATION_ENTER_CURRENT_PASSWORD}" />
-                                                                               </div>
-
-                                                                               <div class="table_right">
-                                                                                       <h:inputSecret styleClass="input" id="userCurrentPassword" size="10" maxlength="255" value="#{userPasswordController.userCurrentPassword}" required="true" requiredMessage="#{msg.USER_CURRENT_PASSWORD_REQUIRED}" />
-                                                                               </div>
-
-                                                                               <div class="clear"></div>
-                                                                       </div>
-
-                                                                       <div class="error_container">
-                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
-
-                                                                       <div class="table_row">
-                                                                               <div class="table_left">
-                                                                                       <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_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>
-
-                                                                       <div class="error_container">
-                                                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
-
-                                                                       <div class="table_row">
-                                                                               <div class="table_left">
-                                                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_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>
-
-                                                                       <div class="error_container">
-                                                                               <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
-                                                               </fieldset>
-                                                       </div>
-
-                                                       <div class="table_footer">
-                                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                               <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-                                                       </div>
-                                               </h:form>
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
-
-                                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_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_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
deleted file mode 100644 (file)
index 0676793..0000000
+++ /dev/null
@@ -1,50 +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">#{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <div class="table">
-                                       <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" 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>
-                               </div>
-                       </ui:fragment>
-
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
-
-                       <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>
index fbdda7de93081e58ca35155b3add9edb773d2203..3dde1ed82053d3e945082f23b0bb1ec94e15c1b7 100644 (file)
                                                <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_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_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_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_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_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+                                                                       <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>
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..1df0b8c
--- /dev/null
@@ -0,0 +1,68 @@
+<!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/login_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" />
+                                       </div>
+
+                                       <h:form id="form_login_user_change_email_address">
+                                               <div class="para">
+                                                       <fieldset id="change_email">
+                                                               <legend title="#{msg.LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE}">
+                                                                       <h:outputText value="#{msg.LOGIN_USER_CHANGE_EMAIL_LEGEND}" />
+                                                               </legend>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputText value="#{msg.LOGIN_USER_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" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doUserChangeEmailAddress()}" />
+                                               </div>
+                                       </h:form>
+                               </div>
+                       </ui:fragment>
+
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+
+                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/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..46ce7b4
--- /dev/null
@@ -0,0 +1,99 @@
+<!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_USER_CHANGE_PASSWORD}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_password')}">
+                                       <div class="table">
+                                               <div class="table_header">
+                                                       <h:outputText value="#{msg.LOGIN_USER_CHANGE_PASSWORD_TITLE}" />
+                                               </div>
+
+                                               <h:form id="form_user_change_password">
+                                                       <div class="para">
+                                                               <fieldset id="change_password">
+                                                                       <legend title="#{msg.LOGIN_USER_CHANGE_PASSWORD_LEGEND_TITLE}">
+                                                                               <h:outputText value="#{msg.LOGIN_USER_CHANGE_PASSWORD_LEGEND}" />
+                                                                       </legend>
+
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
+                                                                                       <h:outputLabel for="userCurrentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD}" />
+                                                                               </div>
+
+                                                                               <div class="table_right">
+                                                                                       <h:inputSecret styleClass="input" id="userCurrentPassword" size="10" maxlength="255" value="#{userPasswordController.userCurrentPassword}" required="true" requiredMessage="#{msg.USER_CURRENT_PASSWORD_REQUIRED}" />
+                                                                               </div>
+
+                                                                               <div class="clear"></div>
+                                                                       </div>
+
+                                                                       <div class="error_container">
+                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
+
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
+                                                                                       <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_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>
+
+                                                                       <div class="error_container">
+                                                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
+
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
+                                                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_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>
+
+                                                                       <div class="error_container">
+                                                                               <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
+                                                               </fieldset>
+                                                       </div>
+
+                                                       <div class="table_footer">
+                                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                               <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+                                                       </div>
+                                               </h:form>
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+
+                                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_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_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
new file mode 100644 (file)
index 0000000..9bd33af
--- /dev/null
@@ -0,0 +1,50 @@
+<!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_USER_CHANGE_PERSONAL_DATA}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.LOGIN_USER_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" 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>
+                               </div>
+                       </ui:fragment>
+
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+
+                       <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>