From e7b85766f51e4a668fd74252ed42bd1e836b54bd 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 | 62 +------------------ web/WEB-INF/faces-config.xml | 10 +-- 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} | 6 +- .../{generic => user}/user_not_logged_in.tpl | 0 .../{generic => user}/user_profile_link.tpl | 0 .../{generic => user}/userid_error.tpl | 0 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 | 8 +-- web/user/login_change_password.xhtml | 6 +- web/user/login_change_personal_data.xhtml | 8 +-- web/user/login_contact_data_saved.xhtml | 6 +- web/user/login_data_saved.xhtml | 6 +- web/user/login_edit_user_data.xhtml | 6 +- web/user/login_index.xhtml | 6 +- .../login_list_sharing_addressbooks.xhtml | 2 +- web/user/login_other_addressbooks.xhtml | 2 +- web/user/login_own_addressbooks.xhtml | 8 +-- web/user/login_shared_addressbooks.xhtml | 2 +- .../login_start_sharing_addressbook.xhtml | 2 +- web/user/login_user_data_saved.xhtml | 6 +- 28 files changed, 73 insertions(+), 135 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} (84%) 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%) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index dd284e9b..298bfc50 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -1,66 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 6cdc5ca9..08df41e1 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -48,7 +48,7 @@ /admin/index.xhtml - login_index + user_index /user/login_index.xhtml @@ -116,7 +116,7 @@ /user/login_own_addressbooks.xhtml - login_add_addressbook + user_add_addressbook /user/login_add_addressbook.xhtml @@ -152,15 +152,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 84% rename from web/WEB-INF/templates/login/login_menu.tpl rename to web/WEB-INF/templates/login/user/user_menu.tpl index 8ed53cbd..71c91836 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 @@
    • - +
    @@ -55,7 +55,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/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 fb0ae512..107705d8 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 0e58740f..ef63b6f7 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..aa953946 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 49e5038e..756c2f44 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 @@ - +
      @@ -75,8 +75,8 @@
      - - + +       diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index 183c1b5d..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 @@ - +
      @@ -64,7 +64,7 @@ - + diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index 72ad05df..56c8e4b3 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 @@ - + @@ -37,8 +37,8 @@
      - - + +       diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index 25b69679..534a11ea 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} @@ -22,8 +22,8 @@       - - + + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 0fd6316a..9b790e21 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} @@ -22,8 +22,8 @@ - - + + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 8cd727cb..8a118005 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} @@ -42,8 +42,8 @@ - - + + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index ef4281d8..81e3a287 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} @@ -20,8 +20,8 @@ Here goes your content. - - + + diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml index 1698cb3d..5e3c94ea 100644 --- a/web/user/login_list_sharing_addressbooks.xhtml +++ b/web/user/login_list_sharing_addressbooks.xhtml @@ -34,7 +34,7 @@ - + diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml index eef9d0bb..84602842 100644 --- a/web/user/login_other_addressbooks.xhtml +++ b/web/user/login_other_addressbooks.xhtml @@ -21,7 +21,7 @@ - + diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml index 48c08973..126fa9f8 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} @@ -59,9 +59,9 @@ - - - + + + diff --git a/web/user/login_shared_addressbooks.xhtml b/web/user/login_shared_addressbooks.xhtml index 2c52fabe..94b3db87 100644 --- a/web/user/login_shared_addressbooks.xhtml +++ b/web/user/login_shared_addressbooks.xhtml @@ -59,7 +59,7 @@ - + diff --git a/web/user/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml index 442610a3..aebbdd02 100644 --- a/web/user/login_start_sharing_addressbook.xhtml +++ b/web/user/login_start_sharing_addressbook.xhtml @@ -63,7 +63,7 @@ - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index e42c555f..eda45b94 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} @@ -22,8 +22,8 @@ - - + + -- 2.39.5