From: Roland Haeder Date: Thu, 5 May 2016 14:04:57 +0000 (+0200) Subject: re-organized pages: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6bd4606f00ad1b35a873dc18dc7836c41f396bb8;p=pizzaservice-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 --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index b63f5899..48acfd5e 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -18,34 +18,33 @@ - + - + + - - + - - + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 13317a99..a0e81346 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -93,7 +93,7 @@ login_index - /login/index.xhtml + /user/index.xhtml @@ -139,7 +139,7 @@ /admin/product/admin_product_list.xhtml contact_data_saved - /login/login_contact_data_saved.xhtml + /user/login_contact_data_saved.xhtml admin_delete_product 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/login/login_add_addressbook.xhtml b/web/login/login_add_addressbook.xhtml deleted file mode 100644 index 8df345f9..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 2f0541fd..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 1d873882..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 10985be3..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 b0414b3c..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 bd6b87e6..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 261571cb..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 92d6b8f7..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 235cb072..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 a98fbcbe..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/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml new file mode 100644 index 00000000..8df345f9 --- /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..2f0541fd --- /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..1d873882 --- /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..10985be3 --- /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_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/show_addressbook.xhtml b/web/user/show_addressbook.xhtml deleted file mode 100644 index 3b02ff9d..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/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 fe0a4efa..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} - - - - -