]> git.mxchange.org Git - pizzaservice-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 14:28:54 +0000 (16:28 +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>
24 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_profile_link.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/guest/user/user_list.xhtml
web/guest/user/user_profile.xhtml
web/user/login_add_addressbook.xhtml [deleted file]
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_own_addressbooks.xhtml [deleted file]
web/user/login_user_data_saved.xhtml

index 06164247ee89cc15f6a17b09dae104b71dbb136e..ddebaa54d25bfeeb7203e3e6d5e22065a9758065 100644 (file)
@@ -2,70 +2,74 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="650" y="150" zoom="true"/>
         <Node id="admin/index.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="customer/register.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="item_added.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="customer/register.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="2650" y="300" zoom="true"/>
+        <Node id="item_added.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="admin/category/admin_category_list.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="index.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="*" x="1150" y="600" zoom="true"/>
-        <Node id="customer/login.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="*" x="2400" y="150" zoom="true"/>
+        <Node id="customer/login.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="1400" y="300" zoom="true"/>
         <Node id="admin/product/admin_product_edit.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="terms.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="basket.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="exception.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="terms.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="2900" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="1150" y="450" zoom="true"/>
         <Node id="admin/country/admin_country_edit.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="imprint.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="150" y="600" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
index 68b020925168ac7fade5c0496dad673cc6323a7e..3814d681c968070ed6df8479a2c1883b546fc618 100644 (file)
                        <from-outcome>admin_product</from-outcome>
                        <to-view-id>/admin/product/admin_product_list.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_index</from-outcome>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_category</from-outcome>
                        <to-view-id>/admin/category/admin_category_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/basket.xhtml</from-view-id>
+               <from-view-id>/guest/user/register.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>register_done</from-outcome>
+                       <to-view-id>/guest/user/register_done.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/admin_logout.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>index</from-outcome>
+                       <to-view-id>/index.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>user_add_addressbook</from-outcome>
+                       <to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_show_addressbook</from-outcome>
+                       <to-view-id>/guest/user/show_addressbook.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>show_addressbook_entries</from-outcome>
+                       <to-view-id>/guest/user/show_addressbook_entries.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/guest/user/user_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>checkout</from-outcome>
                        <to-view-id>/customer/checkout.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/customer/checkout2.xhtml</from-view-id>
+               <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
+               <navigation-case>
+                       <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>checkout_done</from-outcome>
-                       <to-view-id>/customer/checkout_done.xhtml</to-view-id>
+                       <from-outcome>user_change_password</from-outcome>
+                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>empty_basket</from-outcome>
-                       <to-view-id>/customer/empty_basket.xhtml</to-view-id>
+                       <from-outcome>user_change_personal_data</from-outcome>
+                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
index 8c9415bea3b53a56812a84b8756f26dbd5aa064c..7330578e9e6ee26a4e4033d8a05b3205bd0150fb 100644 (file)
@@ -7,7 +7,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_FOO}</ui:define>
 
                <ui:define name="content_header">
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/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl
deleted file mode 100644 (file)
index cbf690d..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 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 b91fd2c..0000000
+++ /dev/null
@@ -1,59 +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://java.sun.com/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_APPLICATIONS_TITLE}
-                       </div>
-
-                       <ul>
-                               <li>
-                                       <h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="login_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
-                               </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..6b88de4
--- /dev/null
@@ -0,0 +1,23 @@
+<?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 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..a374a2f
--- /dev/null
@@ -0,0 +1,59 @@
+<?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://java.sun.com/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_APPLICATIONS_TITLE}
+                       </div>
+
+                       <ul>
+                               <li>
+                                       <h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="login_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
+                               </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>
index 7a93e03675b7ccb21d1d730e1c03d8f9ca82ce8b..e05b336f1216d2ff1a3460bc9c7835c70747d8ac 100644 (file)
@@ -20,7 +20,7 @@
                                        #{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/user/user_profile_link.tpl">
index 1109a02ab0b69e1370cd85d6f66543c3bb51aa0e..59d00852becbb50ee6cd3c6c37db95d2a21d28de 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/user/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
deleted file mode 100644 (file)
index 69043c8..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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"
-         >
-
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <h:form id="add_addressbook" acceptcharset="utf-8">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}
-                                               </div>
-
-                                               <div class="table_row">
-                                                       <div class="table_left">
-                                                               <h:outputLabel for="addressbookName" value="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME}"/>
-                                                       </div>
-
-                                                       <div class="table_right">
-                                                               <h:inputText styleClass="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">
-                                                                       <f:validator for="addressbookName" validatorId="AddressbookNameValidator" />
-                                                               </h:inputText>
-                                                       </div>
-                                               </div>
-
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
-                                               </div>
-                                       </div>
-                               </h:form>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
index f86d426eee762577e76b0e68cac046bb2bcf0471..29748ece79b6373698626d4ef66425c977114d88 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}" />
index ae575a3b0805f182f0162eb283a8de0461ed15e0..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}" />
index b8aa7c0d3c7f12f119e38c7af09f2e85d37ab88b..1aa2863904b74640020eabe4daf94aed841fa59c 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" />
 
index c915c16744ff3e8a349c77f8844464586db7a9db..fd2a453378f2476fca14d5fed194c4341e0fa655 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">
index 342127c6512d6ec716db7ac77b8897d136b90c75..dd82a522249689ea84c42b8620d87d967a74d10e 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">
index 79cea46eb0524b5826c41ec31ac6751e23a1e035..f65e87c01082b282de98cee19d4eb917ee4ac9f2 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">
index 7d8bc62318c3c9d46bc7e14e77c6a5e34cd2a7a7..db4032430977e0d23cb0e55afe13a523f23dfa79 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">
diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
deleted file mode 100644 (file)
index 8d0b038..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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"
-         >
-
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:outputText rendered="#{userLoginController.isUserLoggedIn()}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}
-                                       </div>
-
-                                       <div class="para">
-                                               <h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
-                                                       <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
-
-                                                               <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
-                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
-                                                                       <h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />
-                                                               </h:link>
-                                                       </h:column>
-
-                                                       <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
-
-                                                               <h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
-                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
-                                                                       <h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />
-                                                               </h:link>
-                                                       </h:column>
-
-                                                       <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
-
-                                                               <h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-                                                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-                                                               </h:outputFormat>
-                                                       </h:column>
-                                               </h:dataTable>
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:link id="add_first_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks() == false}" />
-                                               <h:link id="add_additional_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks()}" />
-                                       </div>
-                               </div>
-                       </h:outputText>
-
-                       <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 f89a086661e6dd41c788f8f6ce91844e4326c1d5..860658497e0f81d885553409680abd54b96d9447 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">