]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Moved a lot templates areound:
authorRoland Häder <roland@mxchange.org>
Fri, 6 May 2016 11:08:37 +0000 (13:08 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 7 May 2016 10:35:16 +0000 (12:35 +0200)
- 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>
35 files changed:
nbproject/faces-config.NavData
web/WEB-INF/faces-config.xml
web/WEB-INF/templates.dist/login_page.xhtml
web/WEB-INF/templates/generic/user_not_logged_in.tpl [deleted file]
web/WEB-INF/templates/generic/user_profile_link.tpl [deleted file]
web/WEB-INF/templates/generic/userid_error.tpl [deleted file]
web/WEB-INF/templates/login/login_base.tpl [deleted file]
web/WEB-INF/templates/login/login_enter_current_password.tpl [deleted file]
web/WEB-INF/templates/login/login_footer.tpl [deleted file]
web/WEB-INF/templates/login/login_menu.tpl [deleted file]
web/WEB-INF/templates/login/user/user_base.tpl [new file with mode: 0644]
web/WEB-INF/templates/login/user/user_enter_current_password.tpl [new file with mode: 0644]
web/WEB-INF/templates/login/user/user_footer.tpl [new file with mode: 0644]
web/WEB-INF/templates/login/user/user_menu.tpl [new file with mode: 0644]
web/WEB-INF/templates/user/user_not_logged_in.tpl [new file with mode: 0644]
web/WEB-INF/templates/user/user_profile_link.tpl [new file with mode: 0644]
web/WEB-INF/templates/user/userid_error.tpl [new file with mode: 0644]
web/guest/user/show_addressbook.xhtml
web/guest/user/show_addressbook_entries.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_profile.xhtml
web/user/login_add_addressbook.xhtml
web/user/login_change_email_address.xhtml
web/user/login_change_password.xhtml
web/user/login_change_personal_data.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_index.xhtml
web/user/login_list_sharing_addressbooks.xhtml
web/user/login_other_addressbooks.xhtml
web/user/login_own_addressbooks.xhtml
web/user/login_shared_addressbooks.xhtml
web/user/login_start_sharing_addressbook.xhtml
web/user/login_user_data_saved.xhtml

index dd284e9b7840f43f4d5e275a144da32187644b2e..298bfc50a82fc997caae5cb3a3a53656c24b7570 100644 (file)
@@ -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>
index 6cdc5ca96da676493fb5e33d25435bd049dced76..08df41e1f8a52aee4123e89be332c8bbf27d92ad 100644 (file)
@@ -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>
        <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>
        <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>
index ef04e61b4ae8e671582978ccdb5a696d99e73858..dca91f086a686cfc39ac84fa5cafa8a7f8647f0b 100644 (file)
@@ -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 (file)
index d4a9658..0000000
+++ /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 (file)
index 6188f9c..0000000
+++ /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 (file)
index b013dea..0000000
+++ /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 (file)
index 7af8e03..0000000
+++ /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 (file)
index 9a732b3..0000000
+++ /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 (file)
index bafe6e1..0000000
+++ /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 (file)
index 8ed53cb..0000000
+++ /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 (file)
index 0000000..bae6425
--- /dev/null
@@ -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 (file)
index 0000000..9a732b3
--- /dev/null
@@ -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 (file)
index 0000000..bafe6e1
--- /dev/null
@@ -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 (file)
index 0000000..71c9183
--- /dev/null
@@ -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 (file)
index 0000000..d4a9658
--- /dev/null
@@ -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 (file)
index 0000000..6188f9c
--- /dev/null
@@ -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 (file)
index 0000000..b013dea
--- /dev/null
@@ -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>
index 6095ec33f5b7cee6f2dfc51f026efdc57f11731f..6a1aa0b9de33d7d625a48ec07abb21c9698c0d0b 100644 (file)
@@ -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>
 
index 0164c1a5bcd87d758e6b774d4c62cc1cb88259ea..88472995a77bac735cee2fe9b1ddb436b707044b 100644 (file)
@@ -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">
index fb0ae512c734ddd65850c799eadc6db70be13954..107705d80e624c5ca37aa99f952b0d8e76d9c319 100644 (file)
                                        #{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>
index 0e58740f74be2d62b7ab4408ad718016186c0287..ef63b6f7e55e7c47532972733b1b8d729a0cc6b8 100644 (file)
@@ -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}">
                </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>
index a3d17464bc386a4c3e2334f5256197f6dcc6bdab..aa953946a22720ffb22ec9fdaf0ae1c03f96af12 100644 (file)
@@ -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>
index 49e5038e699b0f19a7da570f4cb989457d7c3721..756c2f44869d01fc04590f299c5ca488b87c4bf2 100644 (file)
@@ -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>
index 183c1b5d820383eef3f0f320730c55f8829915f7..cf7520ea36ebf42405bc62ed3bdba156a1f58011 100644 (file)
@@ -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>
index 72ad05df787f59d504bdcf67b09331d0da9df726..56c8e4b3c981c09d2c4fb28239de0448acbb70c1 100644 (file)
@@ -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>
index 25b69679991123806b0d98f19cbf3307395c208f..534a11ea7d4d7e75b2c35118935ebbe229773cb7 100644 (file)
@@ -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>
index 0fd6316a08ad40c7d5595c0376007e18b5ce4e06..9b790e21bb73e575f0b2463cf40851876bb35a71 100644 (file)
@@ -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>
index 8cd727cbbea7285a88ecce46ae21c27d7c69603f..8a11800580c1ef2248cefd25541b1d2956b06418 100644 (file)
@@ -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>
index ef4281d86e9add780d9be0fd84a13ceb557263fa..81e3a287f2518c09a77c7e7b57a134e11cddd8a2 100644 (file)
@@ -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>
index 1698cb3de6480336d837a5fb7fc9876e203659b4..5e3c94ea962e7661c4aa9e4e6c3e5f39c4572bbe 100644 (file)
@@ -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>
index eef9d0bb997629f560bf2bf033aa765998aa2528..84602842ab73cfb8b2b80102ffaea67f155d367e 100644 (file)
@@ -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>
index 48c089735b5959dfd0b6da5382ad139c200de007..126fa9f89634710dc53c90de1ca98bf557c93e95 100644 (file)
@@ -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>
index 2c52fabefe65b3e35f53c6b160c935cefa1e53cb..94b3db870dec20b62c8305f4fd1f7ec37a48ee25 100644 (file)
@@ -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>
index 442610a32eb4c41f9ab71fffba942dbca07c5509..aebbdd021e628a596daad1c495ddcef99cd5c99f 100644 (file)
@@ -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>
index e42c555fdb1a25dad37bb18457fd9e61899923ba..eda45b9400abc3db1afac5ec0861d145267927af 100644 (file)
@@ -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>