]> git.mxchange.org Git - jjobs-war.git/commitdiff
re-organized pages:
authorRoland Haeder <roland@mxchange.org>
Thu, 5 May 2016 14:03:18 +0000 (16:03 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 6 May 2016 21:06:09 +0000 (23:06 +0200)
- moved /user/ -> /guest/user/ as these are pages for current guest but later users
- moved /login/ -> /user/ as these are pages for current (logged-in) users

Signed-off-by: Roland Häder <roland@mxchange.org>
50 files changed:
nbproject/faces-config.NavData
web/WEB-INF/faces-config.xml
web/WEB-INF/templates.dist/guest_login_page.xhtml
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/guest/user/login.xhtml [new file with mode: 0644]
web/guest/user/login_error.xhtml [new file with mode: 0644]
web/guest/user/lost_passwd.xhtml [new file with mode: 0644]
web/guest/user/register.xhtml [new file with mode: 0644]
web/guest/user/register_done.xhtml [new file with mode: 0644]
web/guest/user/resend_link.xhtml [new file with mode: 0644]
web/guest/user/show_addressbook.xhtml [new file with mode: 0644]
web/guest/user/show_addressbook_entries.xhtml [new file with mode: 0644]
web/guest/user/user_list.xhtml [new file with mode: 0644]
web/guest/user/user_profile.xhtml [new file with mode: 0644]
web/imprint.xhtml
web/login/login_add_addressbook.xhtml [deleted file]
web/login/login_change_email_address.xhtml [deleted file]
web/login/login_change_password.xhtml [deleted file]
web/login/login_change_personal_data.xhtml [deleted file]
web/login/login_contact_data_saved.xhtml [deleted file]
web/login/login_data_saved.xhtml [deleted file]
web/login/login_edit_user_data.xhtml [deleted file]
web/login/login_index.xhtml [deleted file]
web/login/login_own_addressbooks.xhtml [deleted file]
web/login/login_user_data_saved.xhtml [deleted file]
web/privacy.xhtml
web/terms.xhtml
web/user/login.xhtml [deleted file]
web/user/login_add_addressbook.xhtml [new file with mode: 0644]
web/user/login_change_email_address.xhtml [new file with mode: 0644]
web/user/login_change_password.xhtml [new file with mode: 0644]
web/user/login_change_personal_data.xhtml [new file with mode: 0644]
web/user/login_contact_data_saved.xhtml [new file with mode: 0644]
web/user/login_data_saved.xhtml [new file with mode: 0644]
web/user/login_edit_user_data.xhtml [new file with mode: 0644]
web/user/login_error.xhtml [deleted file]
web/user/login_index.xhtml [new file with mode: 0644]
web/user/login_own_addressbooks.xhtml [new file with mode: 0644]
web/user/login_user_data_saved.xhtml [new file with mode: 0644]
web/user/lost_passwd.xhtml [deleted file]
web/user/register.xhtml [deleted file]
web/user/register_done.xhtml [deleted file]
web/user/resend_link.xhtml [deleted file]
web/user/show_addressbook.xhtml [deleted file]
web/user/show_addressbook_entries.xhtml [deleted file]
web/user/user_list.xhtml [deleted file]
web/user/user_profile.xhtml [deleted file]

index 599d7838cbdb03e897833dffbf9551831d6213b1..f4cc90c5cb34c5af5fe9e7099927d5b6135cc62c 100644 (file)
@@ -2,62 +2,60 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="privacy.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="user/index.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="index.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="*" x="2400" y="150" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="user/register.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="terms.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="privacy.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="*" x="150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="exception.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="imprint.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/login/login_data_saved.xhtml" x="1150" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
index 36e24c4a3de6f5c028878bfe1ded85e15808f5a3..ab03d890972551574e5f620513dc8c318780b518 100644 (file)
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_register</from-outcome>
-                       <to-view-id>/user/register.xhtml</to-view-id>
+                       <to-view-id>/guest/user/register.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_login</from-outcome>
-                       <to-view-id>/user/login.xhtml</to-view-id>
+                       <to-view-id>/guest/user/login.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_lost_passwd</from-outcome>
-                       <to-view-id>/user/lost_passwd.xhtml</to-view-id>
+                       <to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>terms</from-outcome>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_index</from-outcome>
-                       <to-view-id>/login/login_index.xhtml</to-view-id>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_resend_link</from-outcome>
-                       <to-view-id>/user/resend_link.xhtml</to-view-id>
+                       <to-view-id>/guest/user/resend_link.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_logout</from-outcome>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_edit_user_data</from-outcome>
-                       <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+                       <to-view-id>/user/login_edit_user_data.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_profile</from-outcome>
-                       <to-view-id>/user/user_profile.xhtml</to-view-id>
+                       <to-view-id>/guest/user/user_profile.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login.xhtml</from-view-id>
+               <from-view-id>/guest/user/login.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login</from-outcome>
-                       <to-view-id>/login/login_index.xhtml</to-view-id>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_add_user</from-outcome>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/guest/user/login.xhtml</from-view-id>
-               <navigation-case>
-                       <from-outcome>login</from-outcome>
-                       <to-view-id>/user/login_index.xhtml</to-view-id>
-               </navigation-case>
                <navigation-case>
                        <from-outcome>login_index</from-outcome>
-                       <to-view-id>/user/index.xhtml</to-view-id>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/register.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>/user/register_done.xhtml</to-view-id>
+                       <to-view-id>/guest/user/register_done.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_own_addressbooks.xhtml</from-view-id>
+               <from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_add_addressbook</from-outcome>
-                       <to-view-id>/login/login_add_addressbook.xhtml</to-view-id>
+                       <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>/user/show_addressbook.xhtml</to-view-id>
+                       <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>/user/show_addressbook_entries.xhtml</to-view-id>
+                       <to-view-id>/guest/user/show_addressbook_entries.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_edit_user_data.xhtml</from-view-id>
+               <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_change_email_address</from-outcome>
-                       <to-view-id>/login/login_change_email_address.xhtml</to-view-id>
+                       <to-view-id>/user/login_change_email_address.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_change_password</from-outcome>
-                       <to-view-id>/login/login_change_password.xhtml</to-view-id>
+                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_change_personal_data</from-outcome>
-                       <to-view-id>/login/login_change_personal_data.xhtml</to-view-id>
+                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_change_password.xhtml</from-view-id>
+               <from-view-id>/user/login_change_password.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login_data_saved</from-outcome>
-                       <to-view-id>/login/login_data_saved.xhtml</to-view-id>
+                       <from-outcome>user_data_saved</from-outcome>
+                       <to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_change_email_address.xhtml</from-view-id>
+               <from-view-id>/user/login_change_email_address.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>contact_data_saved</from-outcome>
-                       <to-view-id>/login/login_contact_data_saved.xhtml</to-view-id>
+                       <to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_product</from-outcome>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_change_personal_data.xhtml</from-view-id>
+               <from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login_data_saved</from-outcome>
-                       <to-view-id>/login/login_data_saved.xhtml</to-view-id>
+                       <from-outcome>contact_data_saved</from-outcome>
+                       <to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_category</from-outcome>
index 2e7bc380f8d842da02a633c71e2dbc264eea1c09..8a38263be6172eee50a8138ba2fb1af1f8d069f0 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_INDEX_FOO}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       Here goes your content.\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_FOO}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
index 130d20d6edc3f07964c7c25c729b50447e3471b2..badc92e324eacf9d2a54fae2706acb3cc9768420 100644 (file)
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <f:metadata>\r
-               <f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />\r
-               <f:viewAction action="#{adminHelper.copyContactToController()}" />\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />\r
-\r
-                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">\r
-                               <div class="table">\r
-                                       <div class="table_header">\r
-                                               <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">\r
-                                                       <f:param value="#{adminHelper.contact.contactId}" />\r
-                                               </h:outputFormat>\r
-                                       </div>\r
-\r
-                                       <div class="para notice">\r
-                                               #{msg.ADMIN_DELETE_CONTACT_NOTICE}\r
-                                       </div>\r
-\r
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />\r
-\r
-                                       <div class="table_footer">\r
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                               <h:commandButton styleClass="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />\r
-                                       </div>\r
-                               </div>\r
-                       </h:form>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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"
+       >
+
+       <f:metadata>
+               <f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+               <f:viewAction action="#{adminHelper.copyContactToController()}" />
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
+
+                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
+                                                       <f:param value="#{adminHelper.contact.contactId}" />
+                                               </h:outputFormat>
+                                       </div>
+
+                                       <div class="para notice">
+                                               #{msg.ADMIN_DELETE_CONTACT_NOTICE}
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+                                       </div>
+                               </div>
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>
index 299b3308e9f1e46001f88a1dc1f7ebbc7ffcb6ed..0ac502ada92c85d08c8dea858c15c28d2c339129 100644 (file)
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <f:metadata>\r
-               <f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />\r
-               <f:viewAction action="#{adminHelper.copyContactToController()}" />\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />\r
-\r
-                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">\r
-                               <div class="table">\r
-                                       <div class="table_header">\r
-                                               <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">\r
-                                                       <f:param value="#{adminHelper.contact.contactId}" />\r
-                                               </h:outputFormat>\r
-                                       </div>\r
-\r
-                                       <div class="para notice">\r
-                                               #{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}\r
-                                       </div>\r
-\r
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">\r
-                                               <ui:param name="mode" value="edit" />\r
-                                       </ui:include>\r
-\r
-                                       <div class="table_footer">\r
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />\r
-                                       </div>\r
-                               </div>\r
-                       </h:form>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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"
+       >
+
+       <f:metadata>
+               <f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+               <f:viewAction action="#{adminHelper.copyContactToController()}" />
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
+
+                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
+                                                       <f:param value="#{adminHelper.contact.contactId}" />
+                                               </h:outputFormat>
+                                       </div>
+
+                                       <div class="para notice">
+                                               #{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
+                                               <ui:param name="mode" value="edit" />
+                                       </ui:include>
+
+                                       <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_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+                                       </div>
+                               </div>
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>
index a31a09dcf1b98b2be5e12452606130742ed6f794..63cda07cfbbb75022dff30ccba641a3dc61f14f5 100644 (file)
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>\r
-\r
-                                       <h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">\r
-                                               <f:param name="countryId" value="#{country.countryId}" />\r
-                                       </h:link>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>\r
-\r
-                                       <h:outputText value="#{country.countryCode}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>\r
-\r
-                                       <h:outputText value="#{country.countryExternalDialPrefix}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>\r
-\r
-                                       <h:outputText value="#{msg[country.countryI18nkey]}" />\r
-                               </h:column>\r
-                       </h:dataTable>\r
-\r
-                       <h:form id="add_country">\r
-                               <div class="table_medium">\r
-                                       <div class="table_header">\r
-                                               #{msg.ADMIN_ADD_COUNTRY_TITLE}\r
-                                       </div>\r
-\r
-                                       <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />\r
-\r
-                                       <div class="table_footer">\r
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />\r
-                                       </div>\r
-                               </div>\r
-\r
-                               <div class="para notice">\r
-                                       #{msg.ADMIN_ADD_COUNTRY_NOTICES}\r
-                                       <ul>\r
-                                               <li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>\r
-                                       </ul>\r
-                               </div>\r
-                       </h:form>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
+
+                                       <h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
+                                               <f:param name="countryId" value="#{country.countryId}" />
+                                       </h:link>
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
+
+                                       <h:outputText value="#{country.countryCode}" />
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
+
+                                       <h:outputText value="#{country.countryExternalDialPrefix}" />
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
+
+                                       <h:outputText value="#{msg[country.countryI18nkey]}" />
+                               </h:column>
+                       </h:dataTable>
+
+                       <h:form id="add_country">
+                               <div class="table_medium">
+                                       <div class="table_header">
+                                               #{msg.ADMIN_ADD_COUNTRY_TITLE}
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
+
+                                       <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_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+                                       </div>
+                               </div>
+
+                               <div class="para notice">
+                                       #{msg.ADMIN_ADD_COUNTRY_NOTICES}
+                                       <ul>
+                                               <li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
+                                       </ul>
+                               </div>
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>
index cda953ca16df13c1e02ba5dfd389a615bdb4d0e8..9d03373c352a80d399e0f5b61f8fc80a424b40d9 100644 (file)
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:dataTable id="table_list_mobile" var="mobile" value="#{adminMobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{adminMobileProviderController.hasMobileProvider()}">\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>\r
-\r
-                                       <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">\r
-                                               <f:param name="providerId" value="#{mobile.providerId}" />\r
-                                       </h:link>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>\r
-\r
-                                       <h:outputText value="#{mobile.providerName}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>\r
-\r
-                                       <h:outputText value="#{mobile.providerDialPrefix}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>\r
-\r
-                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>\r
-\r
-                                       <h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">\r
-                                               <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-                       </h:dataTable>\r
-\r
-                       <h:form id="add_provider">\r
-                               <div class="table_medium">\r
-                                       <div class="table_header">\r
-                                               #{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}\r
-                                       </div>\r
-\r
-                                       <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />\r
-\r
-                                       <div class="table_footer">\r
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />\r
-                                       </div>\r
-                               </div>\r
-\r
-                               <div class="para notice">\r
-                                       #{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}\r
-                                       <ul>\r
-                                               <li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>\r
-                                       </ul>\r
-                               </div>\r
-                       </h:form>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:dataTable id="table_list_mobile" var="mobile" value="#{adminMobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{adminMobileProviderController.hasMobileProvider()}">
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>
+
+                                       <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
+                                               <f:param name="providerId" value="#{mobile.providerId}" />
+                                       </h:link>
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>
+
+                                       <h:outputText value="#{mobile.providerName}" />
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>
+
+                                       <h:outputText value="#{mobile.providerDialPrefix}" />
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>
+
+                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>
+
+                                       <h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
+                                               <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </h:column>
+                       </h:dataTable>
+
+                       <h:form id="add_provider">
+                               <div class="table_medium">
+                                       <div class="table_header">
+                                               #{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
+
+                                       <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_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+                                       </div>
+                               </div>
+
+                               <div class="para notice">
+                                       #{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}
+                                       <ul>
+                                               <li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>
+                                       </ul>
+                               </div>
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
new file mode 100644 (file)
index 0000000..7c87397
--- /dev/null
@@ -0,0 +1,33 @@
+<?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/guest/guest_base.tpl" id="user_login">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LOGIN}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para">
+                               <!-- TODO Internatialize this somehow //-->
+                               Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
+                       </div>
+
+                       <div class="para">
+                               <ui:include id="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
+                       </div>
+
+                       <div class="para">
+                               <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml
new file mode 100644 (file)
index 0000000..85361e7
--- /dev/null
@@ -0,0 +1,23 @@
+<?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:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LOGIN_ERROR}
+               </ui:define>
+
+               <ui:define name="content">
+                       Hier kommt die Fehlermeldung hin.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
new file mode 100644 (file)
index 0000000..103e070
--- /dev/null
@@ -0,0 +1,68 @@
+<?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/guest/guest_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para" id="user_lost_password_content">
+                               <h:form id="lost_password_form">
+                                       <div class="table">
+                                               <div class="table_header">
+                                                       #{msg.GUEST_LOST_PASSWORD_TITLE}
+                                               </div>
+
+                                               <fieldset id="login_data">
+                                                       <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                                       <div class="table_header">
+                                                               #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
+                                                       </div>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                               </fieldset>
+
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+                                               </div>
+                                       </div>
+                               </h:form>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
new file mode 100644 (file)
index 0000000..b03c31e
--- /dev/null
@@ -0,0 +1,30 @@
+<?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/guest/guest_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_REGISTER}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para">
+                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+                       </div>
+
+                       <div class="registration_form">
+                               <ui:include src="/WEB-INF/templates/guest/guest_registration_form.tpl" />
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
new file mode 100644 (file)
index 0000000..ddffa7e
--- /dev/null
@@ -0,0 +1,30 @@
+<?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/guest/guest_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_REGISTER_DONE}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para">
+                               #{msg.GUEST_USER_REGISTRATION_COMPLETED}
+                       </div>
+
+                       <div class="registration_form">
+                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
+                                       <f:param name="user_id" value="#{userController.userId}" />
+                               </h:link>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
new file mode 100644 (file)
index 0000000..89da750
--- /dev/null
@@ -0,0 +1,22 @@
+<?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/guest/guest_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_RESEND_LINK}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml
new file mode 100644 (file)
index 0000000..6095ec3
--- /dev/null
@@ -0,0 +1,56 @@
+<?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">
+
+       <f:metadata>
+               <f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
+                       <f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+                       <f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
+               </f:viewParam>
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
+                               <f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
+
+                               <h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
+                               <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:param name="user" value="#{addressbookController.addressbookUser}" />
+                               </ui:include>
+
+                               <h:outputLabel for="addressbookCreated" styleClass="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
+                               <h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
+                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
+                               </h:outputFormat>
+
+                               <h:outputLabel for="addressbookStatus" styleClass="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
+                               <h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
+
+                               <f:facet name="footer">
+                                       <h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
+                                       <h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />
+
+                                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">
+                                               <h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />
+                                       </ui:fragment>
+                               </f:facet>
+                       </h:panelGrid>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml
new file mode 100644 (file)
index 0000000..0164c1a
--- /dev/null
@@ -0,0 +1,22 @@
+<?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_USER_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
new file mode 100644 (file)
index 0000000..64b21a7
--- /dev/null
@@ -0,0 +1,39 @@
+<?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/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LIST}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="table_big">
+                               <div class="table_header">
+                                       #{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:column>
+                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>
+                                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
+                                                       <ui:param name="user" value="#{user}" />
+                                               </ui:include>
+                                       </h:column>
+
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>
+                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+                                       </h:column>
+                               </h:dataTable>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
new file mode 100644 (file)
index 0000000..fe0a4ef
--- /dev/null
@@ -0,0 +1,48 @@
+<?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"
+         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}">
+                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+                       <f:validator for="userId" validatorId="UserIdValidator" />
+               </f:viewParam>
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
+               </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>
+
+                               <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>
+
+                               <c:otherwise>
+                                       #{msg.ERROR_PROFILE_NOT_VISIBLE}
+                               </c:otherwise>
+                       </c:choose>
+               </ui:define>
+       </ui:composition>
+</html>
index fea8034371f079764c6b07f676b77242e7773319..25c8180fde3491f2c4c3b185e3f4ba29f99d8178 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_INDEX_IMPRINT}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       TODO: Hier kommt das Impressum hin!\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_IMPRINT}
+               </ui:define>
+
+               <ui:define name="content">
+                       TODO: Hier kommt das Impressum hin!
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/login/login_add_addressbook.xhtml b/web/login/login_add_addressbook.xhtml
deleted file mode 100644 (file)
index f93fd7f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <h:form id="add_addressbook" acceptcharset="utf-8">\r
-                                       <div class="table">\r
-                                               <div class="table_header">\r
-                                                       #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}\r
-                                               </div>\r
-\r
-                                               <div class="table_row">\r
-                                                       <div class="table_left">\r
-                                                               <h:outputLabel for="addressbookName" value="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME}"/>\r
-                                                       </div>\r
-\r
-                                                       <div class="table_right">\r
-                                                               <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}">\r
-                                                                       <f:validator for="addressbookName" validatorId="AddressbookNameValidator" />\r
-                                                               </h:inputText>\r
-                                                       </div>\r
-                                               </div>\r
-\r
-                                               <div class="table_footer">\r
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                                       <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />\r
-                                               </div>\r
-                                       </div>\r
-                               </h:form>\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
deleted file mode 100644 (file)
index eeab1da..0000000
+++ /dev/null
@@ -1,83 +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_CHANGE_EMAIL_ADDRESS}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
-                                       </div>
-
-                                       <h:form id="login_form">
-                                               <div class="para">
-                                                       <fieldset id="change_email">
-                                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               #{userController.emailAddress}
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-                                                       </fieldset>
-                                               </div>
-
-                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
-
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
-                                               </div>
-                                       </h:form>
-                               </div>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml
deleted file mode 100644 (file)
index be8d7db..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <div class="table">\r
-                                       <div class="table_header">\r
-                                               #{msg.LOGIN_CHANGE_PASSWORD_TITLE}\r
-                                       </div>\r
-\r
-                                       <h:form id="login_form">\r
-                                               <div class="para">\r
-                                                       <fieldset id="change_password">\r
-                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>\r
-\r
-                                                               <div class="table_row">\r
-                                                                       <div class="table_left">\r
-                                                                               <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />\r
-                                                                       </div>\r
-\r
-                                                                       <div class="table_right">\r
-                                                                               <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />\r
-                                                                       </div>\r
-\r
-                                                                       <div class="clear"></div>\r
-                                                               </div>\r
-\r
-                                                               <div class="table_row">\r
-                                                                       <div class="table_left">\r
-                                                                               <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />\r
-                                                                       </div>\r
-\r
-                                                                       <div class="table_right">\r
-                                                                               <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />\r
-                                                                       </div>\r
-\r
-                                                                       <div class="clear"></div>\r
-                                                               </div>\r
-                                                       </fieldset>\r
-                                               </div>\r
-\r
-                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />\r
-\r
-                                               <div class="table_footer">\r
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />\r
-                                               </div>\r
-                                       </h:form>\r
-                               </div>\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml
deleted file mode 100644 (file)
index 9ea912c..0000000
+++ /dev/null
@@ -1,45 +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_CHANGE_PERSONAL_DATA}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}
-                                       </div>
-
-                                       <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/guest/guest_privacy_terms.tpl" />
-
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-                                               </div>
-                                       </h:form>
-                               </div>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/login/login_contact_data_saved.xhtml b/web/login/login_contact_data_saved.xhtml
deleted file mode 100644 (file)
index 8f52ddf..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">\r
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />\r
-                               </ui:include>\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_data_saved.xhtml b/web/login/login_data_saved.xhtml
deleted file mode 100644 (file)
index 53ca4ea..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">\r
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />\r
-                               </ui:include>\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_edit_user_data.xhtml b/web/login/login_edit_user_data.xhtml
deleted file mode 100644 (file)
index 661befa..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <div class="table">\r
-                                       <div class="table_header">\r
-                                               #{msg.LOGIN_EDIT_USER_DATA_TITLE}\r
-                                       </div>\r
-\r
-                                       <div class="para notice">\r
-                                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />\r
-                                       </div>\r
-\r
-                                       <div class="para">\r
-                                               <ul>\r
-                                                       <li>\r
-                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />\r
-                                                       </li>\r
-                                                       <li>\r
-                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />\r
-                                                       </li>\r
-                                                       <li>\r
-                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />\r
-                                                       </li>\r
-                                               </ul>\r
-                                       </div>\r
-                               </div>\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_index.xhtml b/web/login/login_index.xhtml
deleted file mode 100644 (file)
index d0c5d23..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_HOME}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               Here goes your content.\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml
deleted file mode 100644 (file)
index e8b2638..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <div class="table">\r
-                                       <div class="table_header">\r
-                                               #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}\r
-                                       </div>\r
-\r
-                                       <div class="para">\r
-                                               <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()}">\r
-                                                       <h:column>\r
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>\r
-\r
-                                                               <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">\r
-                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />\r
-                                                                       <h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />\r
-                                                               </h:link>\r
-                                                       </h:column>\r
-\r
-                                                       <h:column>\r
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>\r
-\r
-                                                               <h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">\r
-                                                                       <f:param name="addressbookId" value="#{addressbook.addressbookId}" />\r
-                                                                       <h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />\r
-                                                               </h:link>\r
-                                                       </h:column>\r
-\r
-                                                       <h:column>\r
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>\r
-\r
-                                                               <h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">\r
-                                                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />\r
-                                                               </h:outputFormat>\r
-                                                       </h:column>\r
-                                               </h:dataTable>\r
-                                       </div>\r
-\r
-                                       <div class="table_footer">\r
-                                               <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}" />\r
-                                               <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()}" />\r
-                                       </div>\r
-                               </div>\r
-                       </h:outputText>\r
-\r
-                       <h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </h:outputText>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/login/login_user_data_saved.xhtml b/web/login/login_user_data_saved.xhtml
deleted file mode 100644 (file)
index da19945..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">\r
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />\r
-                               </ui:include>\r
-                       </ui:fragment>\r
-\r
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">\r
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />\r
-                       </ui:fragment>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
index 4d2112831e09e82c951e177011837a369c8f3a85..86df2feb92e7c9698d855dc217a9314448bb572f 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       Hier kommen die Datenschutzbestimmungen hin.\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}
+               </ui:define>
+
+               <ui:define name="content">
+                       Hier kommen die Datenschutzbestimmungen hin.
+               </ui:define>
+       </ui:composition>
+</html>
index a7a2ac9c3db5c0c7a365ae2f67fd71187b7632a0..f46e4cf89ad6c82323bcf858507a284e72adf96b 100644 (file)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_INDEX_TERMS}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       Hier kommen die allgemeinen Geschäftsbedingungen hin.\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<?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/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_TERMS}
+               </ui:define>
+
+               <ui:define name="content">
+                       Hier kommen die allgemeinen Geschäftsbedingungen hin.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login.xhtml b/web/user/login.xhtml
deleted file mode 100644 (file)
index 7c87397..0000000
+++ /dev/null
@@ -1,33 +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/guest/guest_base.tpl" id="user_login">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOGIN}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para">
-                               <!-- TODO Internatialize this somehow //-->
-                               Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
-                       </div>
-
-                       <div class="para">
-                               <ui:include id="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
-                       </div>
-
-                       <div class="para">
-                               <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
new file mode 100644 (file)
index 0000000..a3d1746
--- /dev/null
@@ -0,0 +1,51 @@
+<?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 id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
new file mode 100644 (file)
index 0000000..eeab1da
--- /dev/null
@@ -0,0 +1,83 @@
+<?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_CHANGE_EMAIL_ADDRESS}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
+                                       </div>
+
+                                       <h:form id="login_form">
+                                               <div class="para">
+                                                       <fieldset id="change_email">
+                                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               #{userController.emailAddress}
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+                                                       </fieldset>
+                                               </div>
+
+                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
+                                               </div>
+                                       </h:form>
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
new file mode 100644 (file)
index 0000000..183c1b5
--- /dev/null
@@ -0,0 +1,71 @@
+<?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_CHANGE_PASSWORD}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               #{msg.LOGIN_CHANGE_PASSWORD_TITLE}
+                                       </div>
+
+                                       <h:form id="login_form">
+                                               <div class="para">
+                                                       <fieldset id="change_password">
+                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+                                                       </fieldset>
+                                               </div>
+
+                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
+                                               </div>
+                                       </h:form>
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
new file mode 100644 (file)
index 0000000..9ea912c
--- /dev/null
@@ -0,0 +1,45 @@
+<?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_CHANGE_PERSONAL_DATA}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}
+                                       </div>
+
+                                       <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/guest/guest_privacy_terms.tpl" />
+
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+                                               </div>
+                                       </h:form>
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
new file mode 100644 (file)
index 0000000..b0414b3
--- /dev/null
@@ -0,0 +1,30 @@
+<?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_CONTACT_DATA_SAVED}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
new file mode 100644 (file)
index 0000000..bd6b87e
--- /dev/null
@@ -0,0 +1,30 @@
+<?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_DATA_SAVED}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
new file mode 100644 (file)
index 0000000..261571c
--- /dev/null
@@ -0,0 +1,50 @@
+<?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_EDIT_USER_DATA}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               #{msg.LOGIN_EDIT_USER_DATA_TITLE}
+                                       </div>
+
+                                       <div class="para notice">
+                                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+                                       </div>
+
+                                       <div class="para">
+                                               <ul>
+                                                       <li>
+                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+                                                       </li>
+                                                       <li>
+                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+                                                       </li>
+                                                       <li>
+                                                               <h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+                                                       </li>
+                                               </ul>
+                                       </div>
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_error.xhtml b/web/user/login_error.xhtml
deleted file mode 100644 (file)
index 85361e7..0000000
+++ /dev/null
@@ -1,23 +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:c="http://xmlns.jcp.org/jsp/jstl/core"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
-
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOGIN_ERROR}
-               </ui:define>
-
-               <ui:define name="content">
-                       Hier kommt die Fehlermeldung hin.
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
new file mode 100644 (file)
index 0000000..92d6b8f
--- /dev/null
@@ -0,0 +1,28 @@
+<?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_HOME}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_HOME}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               Here goes your content.
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
new file mode 100644 (file)
index 0000000..235cb07
--- /dev/null
@@ -0,0 +1,67 @@
+<?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 id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </h:outputText>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
new file mode 100644 (file)
index 0000000..a98fbcb
--- /dev/null
@@ -0,0 +1,30 @@
+<?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_USER_DATA_SAVED}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml
deleted file mode 100644 (file)
index 94b9f73..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         >\r
-\r
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <div class="para" id="user_lost_password_content">\r
-                               <h:form id="lost_password_form">\r
-                                       <div class="table">\r
-                                               <div class="table_header">\r
-                                                       #{msg.GUEST_LOST_PASSWORD_TITLE}\r
-                                               </div>\r
-\r
-                                               <fieldset id="login_data">\r
-                                                       <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>\r
-\r
-                                                       <div class="table_row">\r
-                                                               <div class="table_left">\r
-                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />\r
-                                                               </div>\r
-\r
-                                                               <div class="table_right">\r
-                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />\r
-                                                               </div>\r
-\r
-                                                               <div class="clear"></div>\r
-                                                       </div>\r
-\r
-                                                       <div class="table_header">\r
-                                                               #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}\r
-                                                       </div>\r
-\r
-                                                       <div class="table_row">\r
-                                                               <div class="table_left">\r
-                                                                       <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />\r
-                                                               </div>\r
-\r
-                                                               <div class="table_right">\r
-                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />\r
-                                                               </div>\r
-\r
-                                                               <div class="clear"></div>\r
-                                                       </div>\r
-\r
-                                               </fieldset>\r
-\r
-                                               <div class="table_footer">\r
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />\r
-                                               </div>\r
-                                       </div>\r
-                               </h:form>\r
-                       </div>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/user/register.xhtml b/web/user/register.xhtml
deleted file mode 100644 (file)
index b03c31e..0000000
+++ /dev/null
@@ -1,30 +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/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_REGISTER}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para">
-                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
-                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
-                       </div>
-
-                       <div class="registration_form">
-                               <ui:include src="/WEB-INF/templates/guest/guest_registration_form.tpl" />
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/register_done.xhtml b/web/user/register_done.xhtml
deleted file mode 100644 (file)
index ddffa7e..0000000
+++ /dev/null
@@ -1,30 +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/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_REGISTER_DONE}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para">
-                               #{msg.GUEST_USER_REGISTRATION_COMPLETED}
-                       </div>
-
-                       <div class="registration_form">
-                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
-                                       <f:param name="user_id" value="#{userController.userId}" />
-                               </h:link>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/resend_link.xhtml b/web/user/resend_link.xhtml
deleted file mode 100644 (file)
index 89da750..0000000
+++ /dev/null
@@ -1,22 +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/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_RESEND_LINK}
-               </ui:define>
-
-               <ui:define name="content">
-                       Here goes your content.
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml
deleted file mode 100644 (file)
index ad10b3f..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core">\r
-\r
-       <f:metadata>\r
-               <f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">\r
-                       <f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />\r
-                       <f:validator for="addressbookId" validatorId="AddressbookIdValidator" />\r
-               </f:viewParam>\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">\r
-                               <f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>\r
-\r
-                               <h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>\r
-                               <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />\r
-\r
-                               <h:outputLabel for="userProfileLink" styleClass="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>\r
-                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">\r
-                                       <ui:param name="user" value="#{addressbookController.addressbookUser}" />\r
-                               </ui:include>\r
-\r
-                               <h:outputLabel for="addressbookCreated" styleClass="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>\r
-                               <h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">\r
-                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />\r
-                               </h:outputFormat>\r
-\r
-                               <h:outputLabel for="addressbookStatus" styleClass="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>\r
-                               <h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />\r
-\r
-                               <f:facet name="footer">\r
-                                       <h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />\r
-                                       <h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />\r
-\r
-                                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">\r
-                                               <h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />\r
-                                       </ui:fragment>\r
-                               </f:facet>\r
-                       </h:panelGrid>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
diff --git a/web/user/show_addressbook_entries.xhtml b/web/user/show_addressbook_entries.xhtml
deleted file mode 100644 (file)
index 0164c1a..0000000
+++ /dev/null
@@ -1,22 +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_USER_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}
-               </ui:define>
-
-               <ui:define name="content">
-                       Here goes your content.
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml
deleted file mode 100644 (file)
index 64b21a7..0000000
+++ /dev/null
@@ -1,39 +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/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LIST}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="table_big">
-                               <div class="table_header">
-                                       #{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:column>
-                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>
-                                               <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-                                                       <ui:param name="user" value="#{user}" />
-                                               </ui:include>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>
-                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-                                       </h:column>
-                               </h:dataTable>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/user_profile.xhtml b/web/user/user_profile.xhtml
deleted file mode 100644 (file)
index b693617..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-         xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-         xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">\r
-\r
-       <f:metadata>\r
-               <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}">\r
-                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />\r
-                       <f:validator for="userId" validatorId="UserIdValidator" />\r
-               </f:viewParam>\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">\r
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>\r
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_INDEX_USER_PROFILE}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <c:choose>\r
-                               <c:when test="#{userController.isUserIdEmpty()}">\r
-                                       <ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />\r
-                               </c:when>\r
-\r
-                               <c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">\r
-                                       <div align="center">\r
-                                               <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">\r
-                                                       <f:facet name="header">\r
-                                                               #{msg.PUBLIC_USER_PROFILE}\r
-                                                       </f:facet>\r
-                                               </h:panelGrid>\r
-                                       </div>\r
-                               </c:when>\r
-\r
-                               <c:otherwise>\r
-                                       #{msg.ERROR_PROFILE_NOT_VISIBLE}\r
-                               </c:otherwise>\r
-                       </c:choose>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r