From 5b59906908df52d0627dd5a5111e6ebcd52f0ba8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 6 May 2016 13:08:37 +0200 Subject: [PATCH] Moved a lot templates areound: - moved user-related templates out of generic folder - moved "login user" to login/user - moved "login recruiter" to login/recruiter - added missing templarte when recruiter is not logged-in MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 124 +++++++++--------- web/WEB-INF/faces-config.xml | 49 ++++++- web/WEB-INF/templates.dist/login_page.xhtml | 2 +- .../templates/generic/user_profile_link.tpl | 16 --- .../{login_base.tpl => user/user_base.tpl} | 5 +- .../user_enter_current_password.tpl} | 0 .../user_footer.tpl} | 0 .../{login_menu.tpl => user/user_menu.tpl} | 6 +- web/guest/user/user_list.xhtml | 2 +- web/guest/user/user_profile.xhtml | 40 +++--- web/user/login_add_addressbook.xhtml | 51 ------- web/user/login_change_email_address.xhtml | 4 +- web/user/login_change_password.xhtml | 4 +- web/user/login_change_personal_data.xhtml | 4 +- web/user/login_contact_data_saved.xhtml | 2 +- web/user/login_data_saved.xhtml | 2 +- web/user/login_edit_user_data.xhtml | 2 +- web/user/login_index.xhtml | 2 +- web/user/login_own_addressbooks.xhtml | 67 ---------- web/user/login_user_data_saved.xhtml | 2 +- 20 files changed, 145 insertions(+), 239 deletions(-) delete mode 100644 web/WEB-INF/templates/generic/user_profile_link.tpl rename web/WEB-INF/templates/login/{login_base.tpl => user/user_base.tpl} (82%) rename web/WEB-INF/templates/login/{login_enter_current_password.tpl => user/user_enter_current_password.tpl} (100%) rename web/WEB-INF/templates/login/{login_footer.tpl => user/user_footer.tpl} (100%) rename web/WEB-INF/templates/login/{login_menu.tpl => user/user_menu.tpl} (80%) delete mode 100644 web/user/login_add_addressbook.xhtml delete mode 100644 web/user/login_own_addressbooks.xhtml diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 06164247..ddebaa54 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,70 +2,74 @@ - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 68b02092..3814d681 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -47,6 +47,10 @@ admin_product /admin/product/admin_product_list.xhtml + + user_index + /user/login_index.xhtml + admin_category /admin/category/admin_category_list.xhtml @@ -97,7 +101,36 @@ - /basket.xhtml + /guest/user/register.xhtml + + register_done + /guest/user/register_done.xhtml + + + + /admin/admin_logout.xhtml + + index + /index.xhtml + + + + /user/login_own_addressbooks.xhtml + + user_add_addressbook + /user/login_add_addressbook.xhtml + + + user_show_addressbook + /guest/user/show_addressbook.xhtml + + + show_addressbook_entries + /guest/user/show_addressbook_entries.xhtml + + + + /guest/user/user_list.xhtml checkout /customer/checkout.xhtml @@ -118,14 +151,18 @@ - /customer/checkout2.xhtml + /user/login_edit_user_data.xhtml + + user_change_email_address + /user/login_change_email_address.xhtml + - checkout_done - /customer/checkout_done.xhtml + user_change_password + /user/login_change_password.xhtml - empty_basket - /customer/empty_basket.xhtml + user_change_personal_data + /user/login_change_personal_data.xhtml diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index 8c9415be..7330578e 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_FOO} diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/generic/user_profile_link.tpl deleted file mode 100644 index 6188f9c1..00000000 --- a/web/WEB-INF/templates/generic/user_profile_link.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl similarity index 82% rename from web/WEB-INF/templates/login/login_base.tpl rename to web/WEB-INF/templates/login/user/user_base.tpl index cbf690dd..6b88de4d 100644 --- a/web/WEB-INF/templates/login/login_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -9,14 +9,15 @@ - + + - + diff --git a/web/WEB-INF/templates/login/login_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl similarity index 100% rename from web/WEB-INF/templates/login/login_enter_current_password.tpl rename to web/WEB-INF/templates/login/user/user_enter_current_password.tpl diff --git a/web/WEB-INF/templates/login/login_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl similarity index 100% rename from web/WEB-INF/templates/login/login_footer.tpl rename to web/WEB-INF/templates/login/user/user_footer.tpl diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl similarity index 80% rename from web/WEB-INF/templates/login/login_menu.tpl rename to web/WEB-INF/templates/login/user/user_menu.tpl index b91fd2c8..a374a2ff 100644 --- a/web/WEB-INF/templates/login/login_menu.tpl +++ b/web/WEB-INF/templates/login/user/user_menu.tpl @@ -13,7 +13,7 @@
  • - +
  • @@ -27,7 +27,7 @@
    • - +
    @@ -47,7 +47,7 @@
    • - +
    • diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index 7a93e036..e05b336f 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -20,7 +20,7 @@ #{msg.TABLE_HEADER_USER_LIST} - + #{msg.USER_NAME} diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index 1109a02a..59d00852 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -3,10 +3,10 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> @@ -24,25 +24,23 @@ - - - - + + + - -
      - - - #{msg.PUBLIC_USER_PROFILE} - - -
      -       + + #{msg.ERROR_PROFILE_NOT_VISIBLE} + - - #{msg.ERROR_PROFILE_NOT_VISIBLE} - -       + +
      + + + #{msg.PUBLIC_USER_PROFILE} + + +
      +       diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml deleted file mode 100644 index 69043c87..00000000 --- a/web/user/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/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index f86d426e..29748ece 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS} @@ -65,7 +65,7 @@ - +
      diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index ae575a3b..cf7520ea 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD} @@ -53,7 +53,7 @@
      - +
      diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index b8aa7c0d..1aa28639 100644 --- a/web/user/login_change_personal_data.xhtml +++ b/web/user/login_change_personal_data.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA} @@ -25,7 +25,7 @@ - + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index c915c167..fd2a4533 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED} diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 342127c6..dd82a522 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_DATA_SAVED} diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 79cea46e..f65e87c0 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 7d8bc623..db403243 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_HOME} diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml deleted file mode 100644 index 8d0b0381..00000000 --- a/web/user/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/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index f89a0866..86065849 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED} -- 2.39.5