From: Roland Häder <roland@mxchange.org>
Date: Fri, 6 May 2016 11:08:37 +0000 (+0200)
Subject: Moved a lot templates areound:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e7b85766f51e4a668fd74252ed42bd1e836b54bd;p=jfinancials-war.git

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

Signed-off-by: Roland Häder <roland@mxchange.org>
---

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
-    <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="guest/recruiter/login.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="user/index.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/login_other_addressbooks.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="user/login_start_sharing_addressbook.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="index.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="*" x="1900" y="450" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="guest/user/login_error.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="basket.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/login_list_sharing_addressbooks.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="exception.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="terms.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="imprint.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="user/login_shared_addressbooks.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="150" y="1350" zoom="true"/>
-    </Scope>
+    <Scope Scope="Project"/>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
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 @@
 			<to-view-id>/admin/index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>login_index</from-outcome>
+			<from-outcome>user_index</from-outcome>
 			<to-view-id>/user/login_index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -116,7 +116,7 @@
 	<navigation-rule>
 		<from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>login_add_addressbook</from-outcome>
+			<from-outcome>user_add_addressbook</from-outcome>
 			<to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -152,15 +152,15 @@
 	<navigation-rule>
 		<from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>login_change_email_address</from-outcome>
+			<from-outcome>user_change_email_address</from-outcome>
 			<to-view-id>/user/login_change_email_address.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>login_change_password</from-outcome>
+			<from-outcome>user_change_password</from-outcome>
 			<to-view-id>/user/login_change_password.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>login_change_personal_data</from-outcome>
+			<from-outcome>user_change_personal_data</from-outcome>
 			<to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
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"
 	>
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
 		<ui:define name="menu">
-			<ui:include id="menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+			<ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
 		</ui:define>
 
 		<ui:define name="content_header">
@@ -23,7 +23,7 @@
 		</ui:define>
 
 		<ui:define name="footer">
-			<ui:include id="footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+			<ui:include id="footer" src="/WEB-INF/templates/login/user/user_footer.tpl" />
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/WEB-INF/templates/generic/user_not_logged_in.tpl b/web/WEB-INF/templates/generic/user_not_logged_in.tpl
deleted file mode 100644
index d4a9658c..00000000
--- a/web/WEB-INF/templates/generic/user_not_logged_in.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<div class="table">
-		<div class="table_header">
-			#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}
-		</div>
-
-		<div class="para errors">
-			<h:outputText value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
-		</div>
-	</div>
-</ui:composition>
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 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="notice" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
-
-	<h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
-
-	<h:link id="userProfileLink" outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
-		<h:outputText id="userName" value="#{user.userName}" />
-		<f:param name="userId" value="#{user.userId}" />
-	</h:link>
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/userid_error.tpl b/web/WEB-INF/templates/generic/userid_error.tpl
deleted file mode 100644
index b013deae..00000000
--- a/web/WEB-INF/templates/generic/userid_error.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<div class="table">
-		<div class="table_header">
-			#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
-		</div>
-
-		<div class="para">
-			<h:messages errorClass="errors" fatalClass="fatals" infoClass="infos" warnClass="warnings" showDetail="true" />
-		</div>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl
deleted file mode 100644
index 7af8e037..00000000
--- a/web/WEB-INF/templates/login/login_base.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	template="/WEB-INF/templates/base.tpl"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html">
-
-	<ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
-
-	<ui:define name="menu">
-		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-			<ui:include id="menu" src="/WEB-INF/templates/login/login_menu.tpl" />
-		</ui:fragment>
-		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
-		</ui:fragment>
-	</ui:define>
-
-	<ui:define name="footer">
-		<ui:include id="footer" src="/WEB-INF/templates/login/login_footer.tpl" />
-	</ui:define>
-</ui:composition>
diff --git a/web/WEB-INF/templates/login/login_enter_current_password.tpl b/web/WEB-INF/templates/login/login_enter_current_password.tpl
deleted file mode 100644
index 9a732b38..00000000
--- a/web/WEB-INF/templates/login/login_enter_current_password.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<div class="para">
-		<fieldset id="current_password">
-			<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
-						<h:message for="currentPassword" styleClass="errors" />
-						<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
-					</h:inputSecret>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-		</fieldset>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/login/login_footer.tpl b/web/WEB-INF/templates/login/login_footer.tpl
deleted file mode 100644
index bafe6e1b..00000000
--- a/web/WEB-INF/templates/login/login_footer.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-	<div class="footer">
-		<ul class="footer_nav">
-			<li class="footer_link">
-				<h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
-			</li>
-
-			<li class="footer_link">
-				<h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
-			</li>
-
-			<li class="footer_link">
-				<h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
-			</li>
-
-			<li class="footer_link">
-				<h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
-			</li>
-
-			<li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
-		</ul>
-	</div>
-
-	<div class="clear"></div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl
deleted file mode 100644
index 8ed53cbd..00000000
--- a/web/WEB-INF/templates/login/login_menu.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<div class="menu_outer">
-		<div class="menu">
-			<div class="menu_header">
-				#{msg.MENU_HOME_TITLE}
-			</div>
-
-			<ul>
-				<li>
-					<h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_LOGIN_HOME}" />
-				</li>
-
-				<li>
-					<h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
-				</li>
-			</ul>
-
-			<div class="menu_header">
-				#{msg.MENU_EDIT_PROFILE_TITLE}
-			</div>
-
-			<ul>
-				<li>
-					<h:link title="#{msg.LINK_LOGIN_EDIT_USER_DATA_TITLE}" outcome="login_edit_user_data" value="#{msg.LINK_LOGIN_EDIT_USER_DATA}" />
-				</li>
-			</ul>
-
-			<div class="menu_header">
-				#{msg.MENU_ADDRESSBOOKS_TITLE}
-			</div>
-
-			<ul>
-				<li>
-					<h:link title="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE}" outcome="login_own_addressbooks" value="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS}" />
-				</li>
-
-				<li>
-					<h:link title="#{msg.LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE}" outcome="login_other_addressbooks" value="#{msg.LINK_LOGIN_OTHER_ADDRESSBOOKS}" />
-				</li>
-
-				<li>
-					<h:link title="#{msg.LINK_LOGIN_SHARED_ADDRESS_BOOKS_TITLE}" outcome="login_shared_addressbooks" value="#{msg.LINK_LOGIN_SHARED_ADDRESS_BOOKS}" />
-				</li>
-			</ul>
-
-			<div class="menu_header">
-				#{msg.MENU_LOGOUT_TITLE}
-			</div>
-
-			<ul>
-				<li>
-					<h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_GUEST_HOME}" />
-				</li>
-
-				<li>
-					<h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
-				</li>
-			</ul>
-		</div>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
new file mode 100644
index 00000000..bae64259
--- /dev/null
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	template="/WEB-INF/templates/base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html">
+
+	<ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
+
+	<ui:define name="menu">
+		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+			<ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
+		</ui:fragment>
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
+		</ui:fragment>
+	</ui:define>
+
+	<ui:define name="footer">
+		<ui:include id="footer" src="/WEB-INF/templates/login/user/user_footer.tpl" />
+	</ui:define>
+</ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
new file mode 100644
index 00000000..9a732b38
--- /dev/null
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<div class="para">
+		<fieldset id="current_password">
+			<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
+						<h:message for="currentPassword" styleClass="errors" />
+						<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
+					</h:inputSecret>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
new file mode 100644
index 00000000..bafe6e1b
--- /dev/null
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	<div class="footer">
+		<ul class="footer_nav">
+			<li class="footer_link">
+				<h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
+			</li>
+
+			<li class="footer_link">
+				<h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+			</li>
+
+			<li class="footer_link">
+				<h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+			</li>
+
+			<li class="footer_link">
+				<h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+			</li>
+
+			<li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
+		</ul>
+	</div>
+
+	<div class="clear"></div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
new file mode 100644
index 00000000..71c91836
--- /dev/null
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<div class="menu_outer">
+		<div class="menu">
+			<div class="menu_header">
+				#{msg.MENU_HOME_TITLE}
+			</div>
+
+			<ul>
+				<li>
+					<h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="user_index" value="#{msg.LINK_LOGIN_HOME}" />
+				</li>
+
+				<li>
+					<h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+				</li>
+			</ul>
+
+			<div class="menu_header">
+				#{msg.MENU_EDIT_PROFILE_TITLE}
+			</div>
+
+			<ul>
+				<li>
+					<h:link title="#{msg.LINK_LOGIN_EDIT_USER_DATA_TITLE}" outcome="user_edit_user_data" value="#{msg.LINK_LOGIN_EDIT_USER_DATA}" />
+				</li>
+			</ul>
+
+			<div class="menu_header">
+				#{msg.MENU_ADDRESSBOOKS_TITLE}
+			</div>
+
+			<ul>
+				<li>
+					<h:link title="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE}" outcome="login_own_addressbooks" value="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS}" />
+				</li>
+
+				<li>
+					<h:link title="#{msg.LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE}" outcome="login_other_addressbooks" value="#{msg.LINK_LOGIN_OTHER_ADDRESSBOOKS}" />
+				</li>
+
+				<li>
+					<h:link title="#{msg.LINK_LOGIN_SHARED_ADDRESS_BOOKS_TITLE}" outcome="login_shared_addressbooks" value="#{msg.LINK_LOGIN_SHARED_ADDRESS_BOOKS}" />
+				</li>
+			</ul>
+
+			<div class="menu_header">
+				#{msg.MENU_LOGOUT_TITLE}
+			</div>
+
+			<ul>
+				<li>
+					<h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="user_index" value="#{msg.LINK_GUEST_HOME}" />
+				</li>
+
+				<li>
+					<h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+				</li>
+			</ul>
+		</div>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl
new file mode 100644
index 00000000..d4a9658c
--- /dev/null
+++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<div class="table">
+		<div class="table_header">
+			#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}
+		</div>
+
+		<div class="para errors">
+			<h:outputText value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
+		</div>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
new file mode 100644
index 00000000..6188f9c1
--- /dev/null
+++ b/web/WEB-INF/templates/user/user_profile_link.tpl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="notice" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
+
+	<h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+
+	<h:link id="userProfileLink" outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
+		<h:outputText id="userName" value="#{user.userName}" />
+		<f:param name="userId" value="#{user.userId}" />
+	</h:link>
+</ui:composition>
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
new file mode 100644
index 00000000..b013deae
--- /dev/null
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<div class="table">
+		<div class="table_header">
+			#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
+		</div>
+
+		<div class="para">
+			<h:messages errorClass="errors" fatalClass="fatals" infoClass="infos" warnClass="warnings" showDetail="true" />
+		</div>
+	</div>
+</ui:composition>
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 @@
 				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
 
 				<h:outputLabel for="userProfileLink" styleClass="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
-				<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
+				<ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
 					<ui:param name="user" value="#{addressbookController.addressbookUser}" />
 				</ui:include>
 
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
 
 		<ui:define name="content_header">
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}
 				</div>
 
-				<h:dataTable id="userList" var="user" value="#{adminUserController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{adminUserController.isVisibleUserFound()}">
+				<h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
 					<h:column>
 						<f:facet name="header">#{msg.USER_NAME}</f:facet>
-						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
+						<ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
 							<ui:param name="user" value="#{user}" />
 						</ui:include>
 					</h:column>
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 @@
 <html
 	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
 	xmlns="http://www.w3.org/1999/xhtml"
-	  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">
+	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">
 
 	<f:metadata>
 		<f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
@@ -24,25 +24,23 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<c:choose>
-				<c:when test="#{userController.isUserIdEmpty()}">
-					<ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
-				</c:when>
+			<ui:fragment rendered="#{userController.isUserIdEmpty()}">
+				<ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
+			</ui:fragment>
 
-				<c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-					<div align="center">
-						<h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
-							<f:facet name="header">
-								#{msg.PUBLIC_USER_PROFILE}
-							</f:facet>
-						</h:panelGrid>
-					</div>
-				</c:when>
+			<ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
+				#{msg.ERROR_PROFILE_NOT_VISIBLE}
+			</ui:fragment>
 
-				<c:otherwise>
-					#{msg.ERROR_PROFILE_NOT_VISIBLE}
-				</c:otherwise>
-			</c:choose>
+			<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
+				<div align="center">
+					<h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
+						<f:facet name="header">
+							#{msg.PUBLIC_USER_PROFILE}
+						</f:facet>
+					</h:panelGrid>
+				</div>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>
 
 		<ui:define name="content_header">
@@ -44,7 +44,7 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
 
 		<ui:define name="content_header">
@@ -65,7 +65,7 @@
 							</fieldset>
 						</div>
 
-						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
 						<div class="table_footer">
 							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
@@ -75,8 +75,8 @@
 				</div>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
 
 		<ui:define name="content_header">
@@ -53,7 +53,7 @@
 							</fieldset>
 						</div>
 
-						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
 						<div class="table_footer">
 							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
@@ -64,7 +64,7 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA}</ui:define>
 
 		<ui:define name="content_header">
@@ -25,7 +25,7 @@
 					<h:form id="login_change_personal_form">
 						<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
 						<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
@@ -37,8 +37,8 @@
 				</div>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>
 
 		<ui:define name="content_header">
@@ -22,8 +22,8 @@
 				</ui:include>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>
 
 		<ui:define name="content_header">
@@ -22,8 +22,8 @@
 				</ui:include>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
 
 		<ui:define name="content_header">
@@ -42,8 +42,8 @@
 				</div>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>
 
 		<ui:define name="content_header">
@@ -20,8 +20,8 @@
 				Here goes your content.
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>
 
 		<ui:define name="content_header">
@@ -59,9 +59,9 @@
 				</div>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
+			<h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+			</h:outputText>
 		</ui:define>
 	</ui:composition>
 </html>
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 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
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"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
 
 		<ui:define name="content_header">
@@ -22,8 +22,8 @@
 				</ui:include>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>