From b5cf54a6511a711b34e3de8974ad727872ade180 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 | 71 +++++++++++++++++++ web/WEB-INF/faces-config.xml | 12 ++-- web/WEB-INF/templates.dist/login_page.xhtml | 6 +- .../{login_base.tpl => user/user_base.tpl} | 4 +- .../user_enter_current_password.tpl} | 0 .../user_footer.tpl} | 0 .../{login_menu.tpl => user/user_menu.tpl} | 8 +-- .../{generic => user}/user_not_logged_in.tpl | 0 .../{generic => user}/user_profile_link.tpl | 0 .../{generic => user}/userid_error.tpl | 0 web/guest/recruiter/login.xhtml | 22 ------ web/guest/user/show_addressbook.xhtml | 2 +- web/guest/user/show_addressbook_entries.xhtml | 2 +- web/guest/user/user_list.xhtml | 4 +- web/guest/user/user_profile.xhtml | 40 +++++------ web/user/login_add_addressbook.xhtml | 4 +- web/user/login_change_email_address.xhtml | 6 +- web/user/login_change_password.xhtml | 6 +- web/user/login_change_personal_data.xhtml | 6 +- web/user/login_contact_data_saved.xhtml | 4 +- web/user/login_data_saved.xhtml | 4 +- web/user/login_edit_user_data.xhtml | 4 +- web/user/login_index.xhtml | 4 +- web/user/login_own_addressbooks.xhtml | 4 +- web/user/login_user_data_saved.xhtml | 4 +- 25 files changed, 132 insertions(+), 85 deletions(-) rename web/WEB-INF/templates/login/{login_base.tpl => user/user_base.tpl} (81%) 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} (75%) rename web/WEB-INF/templates/{generic => user}/user_not_logged_in.tpl (100%) rename web/WEB-INF/templates/{generic => user}/user_profile_link.tpl (100%) rename web/WEB-INF/templates/{generic => user}/userid_error.tpl (100%) delete mode 100644 web/guest/recruiter/login.xhtml diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 7d967515..62820a70 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -60,3 +61,73 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 1c93d0d... Moved a lot templates areound: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 8ed3d59a..5468e5f7 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -52,7 +52,7 @@ /admin/index.xhtml - login_index + user_index /user/login_index.xhtml @@ -110,7 +110,7 @@ /guest/user/login.xhtml - login_user + user_user /user/login_index.xhtml @@ -131,7 +131,7 @@ /user/login_own_addressbooks.xhtml - login_add_addressbook + user_add_addressbook /user/login_add_addressbook.xhtml @@ -146,15 +146,15 @@ /user/login_edit_user_data.xhtml - login_change_email_address + user_change_email_address /user/login_change_email_address.xhtml - login_change_password + user_change_password /user/login_change_password.xhtml - login_change_personal_data + 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 ef04e61b..dca91f08 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_FOO} - + @@ -23,7 +23,7 @@ - + diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl similarity index 81% rename from web/WEB-INF/templates/login/login_base.tpl rename to web/WEB-INF/templates/login/user/user_base.tpl index 7af8e037..bae64259 100644 --- a/web/WEB-INF/templates/login/login_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -9,7 +9,7 @@ - + @@ -17,6 +17,6 @@ - + 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 75% rename from web/WEB-INF/templates/login/login_menu.tpl rename to web/WEB-INF/templates/login/user/user_menu.tpl index 1b67a2fb..a42e8cf5 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 @@
    • - +
    @@ -37,7 +37,7 @@
    • - +
    @@ -47,7 +47,7 @@
    • - +
    • diff --git a/web/WEB-INF/templates/generic/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl similarity index 100% rename from web/WEB-INF/templates/generic/user_not_logged_in.tpl rename to web/WEB-INF/templates/user/user_not_logged_in.tpl diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl similarity index 100% rename from web/WEB-INF/templates/generic/user_profile_link.tpl rename to web/WEB-INF/templates/user/user_profile_link.tpl diff --git a/web/WEB-INF/templates/generic/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl similarity index 100% rename from web/WEB-INF/templates/generic/userid_error.tpl rename to web/WEB-INF/templates/user/userid_error.tpl diff --git a/web/guest/recruiter/login.xhtml b/web/guest/recruiter/login.xhtml deleted file mode 100644 index 5d07b481..00000000 --- a/web/guest/recruiter/login.xhtml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_RECRUITER_LOGIN} - - - #{msg.CONTENT_TITLE_RECRUITER_LOGIN} - - - - - - - diff --git a/web/guest/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml index 6095ec33..6a1aa0b9 100644 --- a/web/guest/user/show_addressbook.xhtml +++ b/web/guest/user/show_addressbook.xhtml @@ -30,7 +30,7 @@ #{msg.ADDRESSBOOK_OWNER} - + diff --git a/web/guest/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml index 0164c1a5..88472995 100644 --- a/web/guest/user/show_addressbook_entries.xhtml +++ b/web/guest/user/show_addressbook_entries.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index 64b21a7c..e05b336f 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -20,10 +20,10 @@ #{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 fe0a4efa..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 index a3d17464..b29d8459 100644 --- a/web/user/login_add_addressbook.xhtml +++ b/web/user/login_add_addressbook.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK} @@ -44,7 +44,7 @@ - + diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index eeab1da5..5697710a 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 @@ - +
      @@ -76,7 +76,7 @@ - + diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index 183c1b5d..6b88d057 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 @@
      - +
      @@ -64,7 +64,7 @@ - + diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index 9ea912c1..277d4e9f 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 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index b0414b3c..35378eba 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} @@ -23,7 +23,7 @@ - + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index bd6b87e6..67f0642a 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} @@ -23,7 +23,7 @@ - + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 261571cb..5682750c 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} @@ -43,7 +43,7 @@ - + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 92d6b8f7..f8ba5f96 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} @@ -21,7 +21,7 @@ - + diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml index 235cb072..027e17cb 100644 --- a/web/user/login_own_addressbooks.xhtml +++ b/web/user/login_own_addressbooks.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + #{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS} @@ -60,7 +60,7 @@ - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index a98fbcbe..577d0d01 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} @@ -23,7 +23,7 @@ - + -- 2.39.5