From: Roland Haeder Date: Thu, 5 May 2016 14:03:18 +0000 (+0200) Subject: re-organized pages: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4af0b020794b21aad505d1cc700e2f081a10009;p=jjobs-war.git re-organized pages: - moved /user/ -> /guest/user/ as these are pages for current guest but later users - moved /login/ -> /user/ as these are pages for current (logged-in) users Signed-off-by: Roland Häder --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 599d7838..f4cc90c5 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,62 +2,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 36e24c4a..ab03d890 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -21,15 +21,15 @@ user_register - /user/register.xhtml + /guest/user/register.xhtml user_login - /user/login.xhtml + /guest/user/login.xhtml user_lost_passwd - /user/lost_passwd.xhtml + /guest/user/lost_passwd.xhtml terms @@ -53,11 +53,11 @@ login_index - /login/login_index.xhtml + /user/login_index.xhtml user_resend_link - /user/resend_link.xhtml + /guest/user/resend_link.xhtml admin_logout @@ -89,18 +89,18 @@ login_edit_user_data - /login/login_edit_user_data.xhtml + /user/login_edit_user_data.xhtml user_profile - /user/user_profile.xhtml + /guest/user/user_profile.xhtml - /user/login.xhtml + /guest/user/login.xhtml login - /login/login_index.xhtml + /user/login_index.xhtml admin_add_user @@ -109,20 +109,16 @@ /guest/user/login.xhtml - - login - /user/login_index.xhtml - login_index - /user/index.xhtml + /user/login_index.xhtml - /user/register.xhtml + /guest/user/register.xhtml register_done - /user/register_done.xhtml + /guest/user/register_done.xhtml @@ -133,47 +129,47 @@ - /login/login_own_addressbooks.xhtml + /user/login_own_addressbooks.xhtml login_add_addressbook - /login/login_add_addressbook.xhtml + /user/login_add_addressbook.xhtml user_show_addressbook - /user/show_addressbook.xhtml + /guest/user/show_addressbook.xhtml show_addressbook_entries - /user/show_addressbook_entries.xhtml + /guest/user/show_addressbook_entries.xhtml - /login/login_edit_user_data.xhtml + /user/login_edit_user_data.xhtml login_change_email_address - /login/login_change_email_address.xhtml + /user/login_change_email_address.xhtml login_change_password - /login/login_change_password.xhtml + /user/login_change_password.xhtml login_change_personal_data - /login/login_change_personal_data.xhtml + /user/login_change_personal_data.xhtml - /login/login_change_password.xhtml + /user/login_change_password.xhtml - login_data_saved - /login/login_data_saved.xhtml + user_data_saved + /user/login/login_data_saved.xhtml - /login/login_change_email_address.xhtml + /user/login_change_email_address.xhtml contact_data_saved - /login/login_contact_data_saved.xhtml + /user/login_contact_data_saved.xhtml admin_delete_product @@ -181,10 +177,10 @@ - /login/login_change_personal_data.xhtml + /user/login_change_personal_data.xhtml - login_data_saved - /login/login_data_saved.xhtml + contact_data_saved + /user/login/login_data_saved.xhtml admin_delete_category diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml index 2e7bc380..8a38263b 100644 --- a/web/WEB-INF/templates.dist/guest_login_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml @@ -1,22 +1,22 @@ - - - - - - #{msg.PAGE_TITLE_INDEX_FOO} - - - #{msg.CONTENT_TITLE_INDEX_FOO} - - - - Here goes your content. - - - + + + + + + #{msg.PAGE_TITLE_INDEX_FOO} + + + #{msg.CONTENT_TITLE_INDEX_FOO} + + + + Here goes your content. + + + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 130d20d6..badc92e3 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -1,48 +1,48 @@ - - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT} - - - #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT} - - - - - - -
-
- - - -
- -
- #{msg.ADMIN_DELETE_CONTACT_NOTICE} -
- - - -
- - -
-
- - - - + + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT} + + + #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT} + + + + + + +
+
+ + + +
+ +
+ #{msg.ADMIN_DELETE_CONTACT_NOTICE} +
+ + + +
+ + +
+
+ + + + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 299b3308..0ac502ad 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -1,50 +1,50 @@ - - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT} - - - #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT} - - - - - - -
-
- - - -
- -
- #{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE} -
- - - - - -
- - -
-
- - - - + + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT} + + + #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT} + + + + + + +
+
+ + + +
+ +
+ #{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE} +
+ + + + + +
+ + +
+
+ + + + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index a31a09dc..63cda07c 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -1,70 +1,70 @@ - - - - - - #{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY} - - - #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY} - - - - - - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID} - - - - - - - - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE} - - - - - - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX} - - - - - - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME} - - - - - - -
-
- #{msg.ADMIN_ADD_COUNTRY_TITLE} -
- - - -
- - -
-
- -
- #{msg.ADMIN_ADD_COUNTRY_NOTICES} -
    -
  • #{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}
    • -
-
- - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY} + + + #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY} + + + + + + #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID} + + + + + + + + #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE} + + + + + + #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX} + + + + + + #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME} + + + + + + +
+
+ #{msg.ADMIN_ADD_COUNTRY_TITLE} +
+ + + +
+ + +
+
+ +
+ #{msg.ADMIN_ADD_COUNTRY_NOTICES} +
    +
  • #{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}
    • +
+
+ + + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index cda953ca..9d03373c 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -1,78 +1,78 @@ - - - - - - #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST} - - - #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST} - - - - - - #{msg.ADMIN_LIST_MOBILE_PROVIDER_ID} - - - - - - - - #{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME} - - - - - - #{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX} - - - - - - #{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY} - - - - - - #{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED} - - - - - - - - -
-
- #{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE} -
- - - -
- - -
-
- -
- #{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES} -
    -
  • #{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}
    • -
-
- - - - + + + + + + #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST} + + + #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST} + + + + + + #{msg.ADMIN_LIST_MOBILE_PROVIDER_ID} + + + + + + + + #{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME} + + + + + + #{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX} + + + + + + #{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY} + + + + + + #{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED} + + + + + + + + +
+
+ #{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE} +
+ + + +
+ + +
+
+ +
+ #{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES} +
    +
  • #{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}
    • +
+
+ + + + diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml new file mode 100644 index 00000000..7c873975 --- /dev/null +++ b/web/guest/user/login.xhtml @@ -0,0 +1,33 @@ + + + + + + #{msg.PAGE_TITLE_USER_LOGIN} + + + #{msg.CONTENT_TITLE_USER_LOGIN} + + + +
+ + Noch kein Benutzerkonto? Einfach hier anmelden. +
+ +
+ +
+ +
+ +
+ + + diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml new file mode 100644 index 00000000..85361e74 --- /dev/null +++ b/web/guest/user/login_error.xhtml @@ -0,0 +1,23 @@ + + + + + + #{msg.PAGE_TITLE_USER_LOGIN_ERROR} + + + #{msg.CONTENT_TITLE_USER_LOGIN_ERROR} + + + + Hier kommt die Fehlermeldung hin. + + + diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml new file mode 100644 index 00000000..103e070c --- /dev/null +++ b/web/guest/user/lost_passwd.xhtml @@ -0,0 +1,68 @@ + + + + + + #{msg.PAGE_TITLE_USER_LOST_PASSWORD} + + + #{msg.CONTENT_TITLE_USER_LOST_PASSWORD} + + + +
+ +
+
+ #{msg.GUEST_LOST_PASSWORD_TITLE} +
+ +
+ #{msg.GUEST_LOST_PASSWORD_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+ #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL} +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ + + diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml new file mode 100644 index 00000000..b03c31e9 --- /dev/null +++ b/web/guest/user/register.xhtml @@ -0,0 +1,30 @@ + + + + + + #{msg.PAGE_TITLE_USER_REGISTER} + + + #{msg.CONTENT_TITLE_USER_REGISTER} + + + +
+ #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} + + #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2} +
+ +
+ +
+ + + diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml new file mode 100644 index 00000000..ddffa7e7 --- /dev/null +++ b/web/guest/user/register_done.xhtml @@ -0,0 +1,30 @@ + + + + + + #{msg.PAGE_TITLE_USER_REGISTER_DONE} + + + #{msg.CONTENT_TITLE_USER_REGISTER_DONE} + + + +
+ #{msg.GUEST_USER_REGISTRATION_COMPLETED} +
+ +
+ + + +
+ + + diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml new file mode 100644 index 00000000..89da7508 --- /dev/null +++ b/web/guest/user/resend_link.xhtml @@ -0,0 +1,22 @@ + + + + + + #{msg.PAGE_TITLE_INDEX_RESEND_LINK} + + + #{msg.CONTENT_TITLE_INDEX_RESEND_LINK} + + + + Here goes your content. + + + diff --git a/web/guest/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml new file mode 100644 index 00000000..6095ec33 --- /dev/null +++ b/web/guest/user/show_addressbook.xhtml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK} + #{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK} + + + #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK} + + + + + #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK} + + #{msg.ADDRESSBOOK_NAME} + + + #{msg.ADDRESSBOOK_OWNER} + + + + + #{msg.ADDRESSBOOK_CREATED} + + + + + #{msg.ADDRESSBOOK_STATUS} + + + + + + + + + + + + + + diff --git a/web/guest/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml new file mode 100644 index 00000000..0164c1a5 --- /dev/null +++ b/web/guest/user/show_addressbook_entries.xhtml @@ -0,0 +1,22 @@ + + + + + + #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} + + + #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} + + + + Here goes your content. + + + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml new file mode 100644 index 00000000..64b21a7c --- /dev/null +++ b/web/guest/user/user_list.xhtml @@ -0,0 +1,39 @@ + + + + + + #{msg.PAGE_TITLE_USER_LIST} + + + #{msg.CONTENT_TITLE_USER_LIST} + + + +
+
+ #{msg.TABLE_HEADER_USER_LIST} +
+ + + + #{msg.USER_NAME} + + + + + + + #{msg.USER_CREATED} + + + +
+ + + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml new file mode 100644 index 00000000..fe0a4efa --- /dev/null +++ b/web/guest/user/user_profile.xhtml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + #{msg.PAGE_TITLE_LOGIN_USER_PROFILE} + #{msg.PAGE_TITLE_INDEX_USER_PROFILE} + + + #{msg.CONTENT_TITLE_INDEX_USER_PROFILE} + + + + + + + + + +
+ + + #{msg.PUBLIC_USER_PROFILE} + + +
+ + + + #{msg.ERROR_PROFILE_NOT_VISIBLE} + + + + + diff --git a/web/imprint.xhtml b/web/imprint.xhtml index fea80343..25c8180f 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -1,22 +1,22 @@ - - - - - - #{msg.PAGE_TITLE_INDEX_IMPRINT} - - - #{msg.CONTENT_TITLE_INDEX_IMPRINT} - - - - TODO: Hier kommt das Impressum hin! - - - + + + + + + #{msg.PAGE_TITLE_INDEX_IMPRINT} + + + #{msg.CONTENT_TITLE_INDEX_IMPRINT} + + + + TODO: Hier kommt das Impressum hin! + + + diff --git a/web/login/login_add_addressbook.xhtml b/web/login/login_add_addressbook.xhtml deleted file mode 100644 index f93fd7fd..00000000 --- a/web/login/login_add_addressbook.xhtml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK} - - - #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK} - - - - - -
-
- #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE} -
- -
-
- -
- -
- - - -
-
- -
- - -
-
- - - - - - - - - diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml deleted file mode 100644 index eeab1da5..00000000 --- a/web/login/login_change_email_address.xhtml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} - - - #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} - - - - -
-
- #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE} -
- - -
-
- #{msg.LOGIN_CHANGE_EMAIL_LEGEND} - -
-
- #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS} -
- -
- #{userController.emailAddress} -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
-
-
- - - -
- - -
- -
- - - - - - - - diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml deleted file mode 100644 index be8d7dbe..00000000 --- a/web/login/login_change_password.xhtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD} - - - #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD} - - - - -
-
- #{msg.LOGIN_CHANGE_PASSWORD_TITLE} -
- - -
-
- #{msg.LOGIN_CHANGE_PASSWORD_LEGEND} - -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
-
-
- - - -
- - -
- -
- - - - - - - - diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml deleted file mode 100644 index 9ea912c1..00000000 --- a/web/login/login_change_personal_data.xhtml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA} - - - #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA} - - - - -
-
- #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE} -
- - - - - - - - -
- - -
- -
- - - - - - - - diff --git a/web/login/login_contact_data_saved.xhtml b/web/login/login_contact_data_saved.xhtml deleted file mode 100644 index 8f52ddfe..00000000 --- a/web/login/login_contact_data_saved.xhtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED} - - - #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED} - - - - - - - - - - - - - - - diff --git a/web/login/login_data_saved.xhtml b/web/login/login_data_saved.xhtml deleted file mode 100644 index 53ca4ea3..00000000 --- a/web/login/login_data_saved.xhtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_DATA_SAVED} - - - #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED} - - - - - - - - - - - - - - - diff --git a/web/login/login_edit_user_data.xhtml b/web/login/login_edit_user_data.xhtml deleted file mode 100644 index 661befae..00000000 --- a/web/login/login_edit_user_data.xhtml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} - - - #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA} - - - - -
-
- #{msg.LOGIN_EDIT_USER_DATA_TITLE} -
- -
- -
- -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
-
- - - - - - - - diff --git a/web/login/login_index.xhtml b/web/login/login_index.xhtml deleted file mode 100644 index d0c5d23e..00000000 --- a/web/login/login_index.xhtml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_HOME} - - - #{msg.CONTENT_TITLE_LOGIN_HOME} - - - - - Here goes your content. - - - - - - - - diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml deleted file mode 100644 index e8b26389..00000000 --- a/web/login/login_own_addressbooks.xhtml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS} - - - #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS} - - - - -
-
- #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS} -
- -
- - - #{msg.ADDRESSBOOK_NAME} - - - - - - - - - #{msg.ADDRESSBOOK_TOTAL_ENTRIES} - - - - - - - - - #{msg.ADDRESSBOOK_CREATED} - - - - - - -
- -
- - -
-
- - - - - - - - diff --git a/web/login/login_user_data_saved.xhtml b/web/login/login_user_data_saved.xhtml deleted file mode 100644 index da199456..00000000 --- a/web/login/login_user_data_saved.xhtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED} - - - #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED} - - - - - - - - - - - - - - - diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 4d211283..86df2feb 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -1,22 +1,22 @@ - - - - - - #{msg.PAGE_TITLE_INDEX_PRIVACY} - - - #{msg.CONTENT_TITLE_INDEX_PRIVACY} - - - - Hier kommen die Datenschutzbestimmungen hin. - - - + + + + + + #{msg.PAGE_TITLE_INDEX_PRIVACY} + + + #{msg.CONTENT_TITLE_INDEX_PRIVACY} + + + + Hier kommen die Datenschutzbestimmungen hin. + + + diff --git a/web/terms.xhtml b/web/terms.xhtml index a7a2ac9c..f46e4cf8 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -1,22 +1,22 @@ - - - - - - #{msg.PAGE_TITLE_INDEX_TERMS} - - - #{msg.CONTENT_TITLE_INDEX_TERMS} - - - - Hier kommen die allgemeinen Geschäftsbedingungen hin. - - - + + + + + + #{msg.PAGE_TITLE_INDEX_TERMS} + + + #{msg.CONTENT_TITLE_INDEX_TERMS} + + + + Hier kommen die allgemeinen Geschäftsbedingungen hin. + + + diff --git a/web/user/login.xhtml b/web/user/login.xhtml deleted file mode 100644 index 7c873975..00000000 --- a/web/user/login.xhtml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_LOGIN} - - - #{msg.CONTENT_TITLE_USER_LOGIN} - - - -
- - Noch kein Benutzerkonto? Einfach hier anmelden. -
- -
- -
- -
- -
- - - diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml new file mode 100644 index 00000000..a3d17464 --- /dev/null +++ b/web/user/login_add_addressbook.xhtml @@ -0,0 +1,51 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK} + + + #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK} + + + + + +
+
+ #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE} +
+ +
+
+ +
+ +
+ + + +
+
+ +
+ + +
+
+ + + + + + + + + diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml new file mode 100644 index 00000000..eeab1da5 --- /dev/null +++ b/web/user/login_change_email_address.xhtml @@ -0,0 +1,83 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} + + + #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} + + + + +
+
+ #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE} +
+ + +
+
+ #{msg.LOGIN_CHANGE_EMAIL_LEGEND} + +
+
+ #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS} +
+ +
+ #{userController.emailAddress} +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+ + + +
+ + +
+ +
+ + + + + + + + diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml new file mode 100644 index 00000000..183c1b5d --- /dev/null +++ b/web/user/login_change_password.xhtml @@ -0,0 +1,71 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD} + + + #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD} + + + + +
+
+ #{msg.LOGIN_CHANGE_PASSWORD_TITLE} +
+ + +
+
+ #{msg.LOGIN_CHANGE_PASSWORD_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+ + + +
+ + +
+ +
+ + + + + + + + diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml new file mode 100644 index 00000000..9ea912c1 --- /dev/null +++ b/web/user/login_change_personal_data.xhtml @@ -0,0 +1,45 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA} + + + #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA} + + + + +
+
+ #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE} +
+ + + + + + + + +
+ + +
+ +
+ + + + + + + + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml new file mode 100644 index 00000000..b0414b3c --- /dev/null +++ b/web/user/login_contact_data_saved.xhtml @@ -0,0 +1,30 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED} + + + #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED} + + + + + + + + + + + + + + + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml new file mode 100644 index 00000000..bd6b87e6 --- /dev/null +++ b/web/user/login_data_saved.xhtml @@ -0,0 +1,30 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_DATA_SAVED} + + + #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED} + + + + + + + + + + + + + + + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml new file mode 100644 index 00000000..261571cb --- /dev/null +++ b/web/user/login_edit_user_data.xhtml @@ -0,0 +1,50 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} + + + #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA} + + + + +
+
+ #{msg.LOGIN_EDIT_USER_DATA_TITLE} +
+ +
+ +
+ +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+
+ + + + + + + + diff --git a/web/user/login_error.xhtml b/web/user/login_error.xhtml deleted file mode 100644 index 85361e74..00000000 --- a/web/user/login_error.xhtml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_LOGIN_ERROR} - - - #{msg.CONTENT_TITLE_USER_LOGIN_ERROR} - - - - Hier kommt die Fehlermeldung hin. - - - diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml new file mode 100644 index 00000000..92d6b8f7 --- /dev/null +++ b/web/user/login_index.xhtml @@ -0,0 +1,28 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_HOME} + + + #{msg.CONTENT_TITLE_LOGIN_HOME} + + + + + Here goes your content. + + + + + + + + diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml new file mode 100644 index 00000000..235cb072 --- /dev/null +++ b/web/user/login_own_addressbooks.xhtml @@ -0,0 +1,67 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS} + + + #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS} + + + + +
+
+ #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS} +
+ +
+ + + #{msg.ADDRESSBOOK_NAME} + + + + + + + + + #{msg.ADDRESSBOOK_TOTAL_ENTRIES} + + + + + + + + + #{msg.ADDRESSBOOK_CREATED} + + + + + + +
+ +
+ + +
+
+ + + + + + + + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml new file mode 100644 index 00000000..a98fbcbe --- /dev/null +++ b/web/user/login_user_data_saved.xhtml @@ -0,0 +1,30 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED} + + + #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED} + + + + + + + + + + + + + + + diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml deleted file mode 100644 index 94b9f73b..00000000 --- a/web/user/lost_passwd.xhtml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_LOST_PASSWORD} - - - #{msg.CONTENT_TITLE_USER_LOST_PASSWORD} - - - -
- -
-
- #{msg.GUEST_LOST_PASSWORD_TITLE} -
- -
- #{msg.GUEST_LOST_PASSWORD_LEGEND} - -
-
- -
- -
- -
- -
-
- -
- #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL} -
- -
-
- -
- -
- -
- -
-
- -
- -
- - -
-
- -
- - - diff --git a/web/user/register.xhtml b/web/user/register.xhtml deleted file mode 100644 index b03c31e9..00000000 --- a/web/user/register.xhtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_REGISTER} - - - #{msg.CONTENT_TITLE_USER_REGISTER} - - - -
- #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} - - #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2} -
- -
- -
- - - diff --git a/web/user/register_done.xhtml b/web/user/register_done.xhtml deleted file mode 100644 index ddffa7e7..00000000 --- a/web/user/register_done.xhtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_REGISTER_DONE} - - - #{msg.CONTENT_TITLE_USER_REGISTER_DONE} - - - -
- #{msg.GUEST_USER_REGISTRATION_COMPLETED} -
- -
- - - -
- - - diff --git a/web/user/resend_link.xhtml b/web/user/resend_link.xhtml deleted file mode 100644 index 89da7508..00000000 --- a/web/user/resend_link.xhtml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_INDEX_RESEND_LINK} - - - #{msg.CONTENT_TITLE_INDEX_RESEND_LINK} - - - - Here goes your content. - - - diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml deleted file mode 100644 index ad10b3f0..00000000 --- a/web/user/show_addressbook.xhtml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK} - #{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK} - - - #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK} - - - - - #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK} - - #{msg.ADDRESSBOOK_NAME} - - - #{msg.ADDRESSBOOK_OWNER} - - - - - #{msg.ADDRESSBOOK_CREATED} - - - - - #{msg.ADDRESSBOOK_STATUS} - - - - - - - - - - - - - - diff --git a/web/user/show_addressbook_entries.xhtml b/web/user/show_addressbook_entries.xhtml deleted file mode 100644 index 0164c1a5..00000000 --- a/web/user/show_addressbook_entries.xhtml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - - - #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - - - - Here goes your content. - - - diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml deleted file mode 100644 index 64b21a7c..00000000 --- a/web/user/user_list.xhtml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_LIST} - - - #{msg.CONTENT_TITLE_USER_LIST} - - - -
-
- #{msg.TABLE_HEADER_USER_LIST} -
- - - - #{msg.USER_NAME} - - - - - - - #{msg.USER_CREATED} - - - -
- - - diff --git a/web/user/user_profile.xhtml b/web/user/user_profile.xhtml deleted file mode 100644 index b6936170..00000000 --- a/web/user/user_profile.xhtml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - #{msg.PAGE_TITLE_LOGIN_USER_PROFILE} - #{msg.PAGE_TITLE_INDEX_USER_PROFILE} - - - #{msg.CONTENT_TITLE_INDEX_USER_PROFILE} - - - - - - - - - -
- - - #{msg.PUBLIC_USER_PROFILE} - - -
- - - - #{msg.ERROR_PROFILE_NOT_VISIBLE} - - - - -