]> git.mxchange.org Git - addressbook-war.git/commitdiff
Continued:
authorRoland Haeder <roland@mxchange.org>
Thu, 8 Oct 2015 13:26:56 +0000 (15:26 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 8 Oct 2015 13:26:56 +0000 (15:26 +0200)
- added more pages for login area
- also added their language strings
- moved menu/footer definitions into corresponding foo_base.tpl templates
Signed-off-by:Roland Häder <roland@mxchange.org>

33 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/templates.dist/admin_page.xhtml
web/WEB-INF/templates.dist/guest_page.xhtml
web/WEB-INF/templates.dist/login_page.xhtml
web/WEB-INF/templates/admin/admin_base.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/templates/login/login_base.tpl
web/WEB-INF/templates/login/login_menu.tpl
web/admin/admin_index.xhtml [new file with mode: 0644]
web/admin/admin_logout.xhtml
web/admin/index.xhtml [deleted file]
web/imprint.xhtml
web/index.xhtml
web/login/index.xhtml [deleted file]
web/login/login_edit_address.xhtml [new file with mode: 0644]
web/login/login_edit_user_data.xhtml [new file with mode: 0644]
web/login/login_index.xhtml [new file with mode: 0644]
web/login/login_other_addressbooks.xhtml [new file with mode: 0644]
web/login/login_own_addressbooks.xhtml [new file with mode: 0644]
web/login/login_user_list.xhtml [new file with mode: 0644]
web/privacy.xhtml
web/resources/css/cssLayout.css
web/resources/css/default.css
web/terms.xhtml
web/user/login.xhtml
web/user/login_error.xhtml
web/user/lost_passwd.xhtml
web/user/register.xhtml
web/user/register_done.xhtml
web/user/resend_link.xhtml

index 3fff23d54406902ee83cb55fd9ce272bc04f1f5c..1dd6c41b2ed2c39a7ecef877c56f66438902c265 100644 (file)
@@ -20,11 +20,11 @@ GENDER_FEMALE=Frau
 YES=Ja
 NO=Nein
 PAGE_TITLE_INDEX_WELCOME=Willkommen!
-SUB_TITLE_INDEX_WELCOME=Willkommen zum Addressbook:
+CONTENT_TITLE_INDEX_WELCOME=Willkommen zum Addressbook:
 PAGE_TITLE_ADMIN_WELCOME=Willkommen zum Administrationsbereich
-SUB_TITLE_ADMIN_WELCOME=Willkommen zur Administration:
+CONTENT_TITLE_ADMIN_WELCOME=Willkommen zur Administration:
 PAGE_TITLE_ADMIN_LOGOUT=Ausloggen
-SUB_TITLE_ADMIN_LOGOUT=Aus dem Adminbereich ausloggen:
+CONTENT_TITLE_ADMIN_LOGOUT=Aus dem Adminbereich ausloggen:
 SELECT_ENTRY=Ausw\u00e4hlen:
 BUTTON_RESET_FORM=Formular zur\u00fccksetzen
 ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern
@@ -46,7 +46,7 @@ LINK_GUEST_REGISTER=Neuer Benutzer
 LINK_GUEST_PASSWORD_TITLE=Neues Passwort erstellen
 LINK_GUEST_PASSWORD=Passwort vergessen?
 PAGE_TITLE_INDEX_IMPRINT=Impressum
-SUB_TITLE_INDEX_IMPRINT=Impressum:
+CONTENT_TITLE_INDEX_IMPRINT=Impressum:
 GUEST_REGISTRATION_TITLE=Anmelden als Benutzer
 GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Benutzername und Passwort.
 GUEST_REGISTRATION_EMAIL_LEGEND=Email-Adresse und Passwort:
@@ -73,20 +73,20 @@ PERSONAL_DATA_CITY=Ort:
 PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein.
 PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben:
 PAGE_TITLE_USER_LOGIN=Einloggen
-SUB_TITLE_USER_LOGIN=Zum Benutzerbereich einloggen:
+CONTENT_TITLE_USER_LOGIN=Zum Benutzerbereich einloggen:
 PAGE_TITLE_USER_LOST_PASSWORD=Passwort vergessen
-SUB_TITLE_USER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her:
+CONTENT_TITLE_USER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her:
 GUEST_LOST_PASSWORD_TITLE=Sie haben Ihr Passwort vergessen?
 GUEST_LOST_PASSWORD_LEGEND_TITLE=Bitte Daten eingeben:
 GUEST_LOST_PASSWORD_LEGEND=Bitte Daten eingeben:
 ENTER_EMAIL_ADDRESS=Email-Adresse:
 GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... oder ...
 PAGE_TITLE_USER_REGISTER=Anmeldung
-SUB_TITLE_USER_REGISTER=Anmelden zum Addressbook:
+CONTENT_TITLE_USER_REGISTER=Anmelden zum Addressbook:
 PAGE_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
-SUB_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
+CONTENT_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
 PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen
-SUB_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen:
+CONTENT_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen:
 ADMIN_MENU_MAIN_TITLE=Hauptauswahl
 ADMIN_MENU_LOGOUT_TITLE=Ausloggen
 LINK_ADMIN_INDEX_TITLE=Zur Willkommensseite
@@ -112,8 +112,40 @@ LINK_GUEST_RESENT_CONFIRMATION_LINK=Nochmals den Best\u00e4tigungslink aussenden
 GUEST_USER_REGISTRATION_COMPLETED=Die Anmeldung ist abgeschlossen und Ihr Account wartet auf Freischaltung. Es ist eine Email mit einem entsprechenden Best\u00e4tigungslink zu Ihnen unterwegs. Diesen m\u00fcssen Sie einmal anklicken oder in die Adresszeile des Browsers kopieren und dann aufrufen lassen. Danach ist Ihr Account freigegeben.
 PERSONAL_DATA_COUNTRY_CODE=L\u00e4ndercode:
 PAGE_TITLE_USER_REGISTER_DONE=Anmeldung abgeschlossen
-SUB_TITLE_USER_REGISTER_DONE=Die Anmeldung ist abgeschlossen:
+CONTENT_TITLE_USER_REGISTER_DONE=Die Anmeldung ist abgeschlossen:
 PAGE_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink erneut aussenden
-SUB_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink anfordern:
+CONTENT_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink anfordern:
 LINK_GUEST_RESEND_LINK=Best\u00e4tigungslink
 LINK_GUEST_RESEND_LINK_TITLE=Best\u00e4tigungslink erneut aussenden
+LINK_LOGIN_HOME_TITLE=Zur \u00dcbersichtsseite
+LINK_LOGIN_HOME=\u00dcbersicht
+MENU_LOGOUT_TITLE=Ausloggen
+CLICK_HERE=hier
+GUEST_ALREADY_USER_CONTINUE_LOGIN_1=Sie sind bereits angemeldet? Dann
+GUEST_ALREADY_USER_CONTINUE_LOGIN_2=einloggen.
+PAGE_TITLE_LOGIN_HOME=Willkommen zum Benutzerbereich
+CONTENT_TITLE_LOGIN_HOME=\u00dcbersicht Ihrer Addressb\u00fccher:
+LINK_LOGIN_LOGOUT=Ausloggen
+LINK_LOGIN_OWN_ADDRESSBOOKS=Meine Adressb\u00fccher
+LINK_LOGIN_LOGOUT_TITLE=Aus dem Benutzerbereich ausloggen
+LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Meine Adressb\u00fccher verwalten
+LINK_LOGIN_OTHER_ADDRESSBOOKS=Andere Adressb\u00fccher
+LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE=Von anderen Benutzern freigegebene Adressb\u00fccher
+MENU_ADDRESSBOOKS_TITLE=Adressb\u00fccher verwalten
+PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Eigene Adressb\u00fccher verwalten
+CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Verwalten Sie Ihre eigenen Adressb\u00fccher:
+LINK_LOGIN_USER_LIST=Benutzerliste
+LINK_LOGIN_USER_LIST_TITLE=Liste aller angemeldeten Benutzer
+PAGE_TITLE_LOGIN_USER_LIST=Benutzerliste
+CONTENT_TITLE_LOGIN_USER_LIST=Alle angemeldeten Benutzer:
+PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Freigegebene Adressnb\u00fccher anderer Mitglieder
+CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Von anderen Benutzern freigegebene Adressb\u00fccher auflisten:
+LINK_LOGIN_EDIT_ADDRESS=Kontaktdaten \u00e4ndern
+LINK_LOGIN_EDIT_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre eigenen Kontaktdaten.
+LINK_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern
+LINK_LOGIN_EDIT_USER_DATA_TITLE=\u00c4ndern Sie hier Ihre eigenen Benutzerdaten.
+MENU_EDIT_PROFILE_TITLE=Mein Profil
+PAGE_TITLE_LOGIN_EDIT_ADDRESS=Meine Kontaktdaten \u00e4ndern
+CONTENT_TITLE_LOGIN_EDIT_ADDRESS=\u00c4ndern Sie Ihre Adressdaten:
+PAGE_TITLE_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern
+CONTENT_TITLE_LOGIN_EDIT_USER_DATA=\u00c4ndern Sie Ihre Benutzerdaten:
index bbb494656db38190f0e5740f24ba703364e750ac..7e9c7c4083ebf5f47f883df68b7f03072486d80f 100644 (file)
@@ -20,11 +20,11 @@ GENDER_FEMALE=Mrs.
 YES=Yes
 NO=No
 PAGE_TITLE_INDEX_WELCOME=Welcome!
-SUB_TITLE_INDEX_WELCOME=Welcome to Addressbook
+CONTENT_TITLE_INDEX_WELCOME=Welcome to Addressbook
 PAGE_TITLE_ADMIN_WELCOME=Welcome to administration area
-SUB_TITLE_ADMIN_WELCOME=Welcome to website administration:
+CONTENT_TITLE_ADMIN_WELCOME=Welcome to website administration:
 PAGE_TITLE_ADMIN_LOGOUT=Logout
-SUB_TITLE_ADMIN_LOGOUT=Logout from administration area:
+CONTENT_TITLE_ADMIN_LOGOUT=Logout from administration area:
 SELECT_ENTRY=Select:
 BUTTON_RESET_FORM=Reset form
 ADMIN_BUTTON_EDIT_ENTRIES=Edit
@@ -46,7 +46,7 @@ LINK_GUEST_REGISTER=Registration
 LINK_GUEST_PASSWORD_TITLE=Create new password
 LINK_GUEST_PASSWORD=Lost password?
 PAGE_TITLE_INDEX_IMPRINT=Imprint
-SUB_TITLE_INDEX_IMPRINT=Imprint:
+CONTENT_TITLE_INDEX_IMPRINT=Imprint:
 GUEST_REGISTRATION_TITLE=Register a new user account
 GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your login name and password are required.
 GUEST_REGISTRATION_EMAIL_LEGEND=Email address and password:
@@ -73,20 +73,20 @@ PERSONAL_DATA_CITY=City:
 PERSONAL_DATA_LEGEND_TITLE=Please enter your data.
 PERSONAL_DATA_LEGEND=Please enter your data:
 PAGE_TITLE_USER_LOGIN=Login
-SUB_TITLE_USER_LOGIN=Login to user area:
+CONTENT_TITLE_USER_LOGIN=Login to user area:
 PAGE_TITLE_USER_LOST_PASSWORD=Lost password
-SUB_TITLE_USER_LOST_PASSWORD=Recover your password:
+CONTENT_TITLE_USER_LOST_PASSWORD=Recover your password:
 GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password?
 GUEST_LOST_PASSWORD_LEGEND_TITLE=Please enter your data:
 GUEST_LOST_PASSWORD_LEGEND=Please enter your data:
 ENTER_EMAIL_ADDRESS=Email address:
 GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... or ...
 PAGE_TITLE_USER_REGISTER=Register
-SUB_TITLE_USER_REGISTER=Register at Addressbook:
+CONTENT_TITLE_USER_REGISTER=Register at Addressbook:
 PAGE_TITLE_INDEX_TERMS=Terms & Conditions
-SUB_TITLE_INDEX_TERMS=Terms & Conditions
+CONTENT_TITLE_INDEX_TERMS=Terms & Conditions
 PAGE_TITLE_INDEX_PRIVACY=Privacy
-SUB_TITLE_INDEX_PRIVACY=Privacy:
+CONTENT_TITLE_INDEX_PRIVACY=Privacy:
 ADMIN_MENU_MAIN_TITLE=Main
 ADMIN_MENU_LOGOUT_TITLE=Logout
 LINK_ADMIN_INDEX_TITLE=To welcome page
@@ -112,8 +112,40 @@ LINK_GUEST_RESENT_CONFIRMATION_LINK=Resend again the confirmation link?
 GUEST_USER_REGISTRATION_COMPLETED=The registration is completed and your account is pending confirmation. An email has been sent to you. There you will find a confirmation link which you have to click once or copy it into your browser's address bar and call it.
 PERSONAL_DATA_COUNTRY_CODE=Country code:
 PAGE_TITLE_USER_REGISTER_DONE=Registration completed
-SUB_TITLE_USER_REGISTER_DONE=Registration is completed:
+CONTENT_TITLE_USER_REGISTER_DONE=Registration is completed:
 PAGE_TITLE_INDEX_RESEND_LINK=Resend confirmation link
-SUB_TITLE_INDEX_RESEND_LINK=Request confirmation link:
+CONTENT_TITLE_INDEX_RESEND_LINK=Request confirmation link:
 LINK_GUEST_RESEND_LINK=Confirmation link
 LINK_GUEST_RESEND_LINK_TITLE=Resend confirmation link
+LINK_LOGIN_HOME_TITLE=To overview page
+LINK_LOGIN_HOME=Overview
+MENU_LOGOUT_TITLE=Logout
+CLICK_HERE=here
+GUEST_ALREADY_USER_CONTINUE_LOGIN_1=Already registered? Then click
+GUEST_ALREADY_USER_CONTINUE_LOGIN_2=to login.
+PAGE_TITLE_LOGIN_HOME=Welcome to user area
+CONTENT_TITLE_LOGIN_HOME=Overview of your address books:
+LINK_LOGIN_LOGOUT=Logout
+LINK_LOGIN_OWN_ADDRESSBOOKS=My address books
+LINK_LOGIN_LOGOUT_TITLE=Logout from user area
+LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Manage own address books
+LINK_LOGIN_OTHER_ADDRESSBOOKS=Other's address books
+LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE=From other users shared address books
+MENU_ADDRESSBOOKS_TITLE=Manage address books
+PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage own address books
+CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage your own address books:
+LINK_LOGIN_USER_LIST=Benutzerliste
+LINK_LOGIN_USER_LIST_TITLE=Liste aller angemeldeten Benutzer
+PAGE_TITLE_LOGIN_USER_LIST=Benutzerliste
+CONTENT_TITLE_LOGIN_USER_LIST=Alle angemeldeten Benutzer:
+PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Freigegebene Adressnb\u00fccher anderer Mitglieder
+CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Manage other's shared address books
+LINK_LOGIN_EDIT_ADDRESS=Change address data
+LINK_LOGIN_EDIT_ADDRESS_TITLE=Change your own address data here.
+LINK_LOGIN_EDIT_USER_DATA=Benutzerdaten \u00e4ndern
+LINK_LOGIN_EDIT_USER_DATA_TITLE=Change your own user data here.
+MENU_EDIT_PROFILE_TITLE=My profile
+PAGE_TITLE_LOGIN_EDIT_ADDRESS=Change my address data
+CONTENT_TITLE_LOGIN_EDIT_ADDRESS=Change your address data:
+PAGE_TITLE_LOGIN_EDIT_USER_DATA=Change user data
+CONTENT_TITLE_LOGIN_EDIT_USER_DATA=Change your user data:
index ab8b7f848533a6546ac20c3d56a1733c94255013..7bf7a25010e32e55e59275ed53f942bc0d554a83 100644 (file)
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_index</from-outcome>
-                       <to-view-id>/admin/index.xhtml</to-view-id>
-               </navigation-case>
-           <navigation-case>
-               <from-outcome>login_index</from-outcome>
-               <to-view-id>/login/index.xhtml</to-view-id>
-           </navigation-case>
-           <navigation-case>
-               <from-outcome>resend_link</from-outcome>
-               <to-view-id>/user/resend_link.xhtml</to-view-id>
-           </navigation-case>
+                       <to-view-id>/admin/admin_index.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_index</from-outcome>
+                       <to-view-id>/login/login_index.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>resend_link</from-outcome>
+                       <to-view-id>/user/resend_link.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_own_addressbooks</from-outcome>
+                       <to-view-id>/login/login_own_addressbooks.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_other_addressbooks</from-outcome>
+                       <to-view-id>/login/login_other_addressbooks.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_user_list</from-outcome>
+                       <to-view-id>/login/login_user_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_logout</from-outcome>
+                       <to-view-id>/admin/admin_logout.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_edit_address</from-outcome>
+                       <to-view-id>/login/login_edit_address.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_edit_user_data</from-outcome>
+                       <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/user/login.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>login</from-outcome>
+                       <to-view-id>/login/login_index.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/user/register.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>register_done</from-outcome>
+                       <to-view-id>/user/register_done.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/admin_logout.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>index</from-outcome>
-                       <to-view-id>/*</to-view-id>
+                       <to-view-id>/index.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <application>
                        <supported-locale>en_US</supported-locale>
                </locale-config>
        </application>
-    <navigation-rule>
-        <from-view-id>/user/login.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>login</from-outcome>
-            <to-view-id>/login/index.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
 </faces-config>
index 23940e06c1031b63fe8746a0f4e7c3e63100cd83..d19c7c1c2aeb815d49a97f865156b94c246cd50b 100644 (file)
@@ -9,10 +9,6 @@
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">Your page's title here</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
                        Your header above content here
                </ui:define>
@@ -20,9 +16,5 @@
                <ui:define name="content">
                        Here goes your content.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index a90306bc8885fe3692cd6602b298928728e6d1c3..e8f4fa139ef8cb36b94f370096068fd303e5cf3f 100644 (file)
@@ -9,20 +9,12 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_FOO}
+                       #{msg.CONTENT_TITLE_INDEX_FOO}
                </ui:define>
 
                <ui:define name="content">
                        Here goes your content.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index c91b0f83c8952201451994dc39c2749ffaeb6049..9378e32c1f09e05e5654217a1dac682160dcfb24 100644 (file)
@@ -14,7 +14,7 @@
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_LOGIN_FOO}
+                       #{msg.CONTENT_TITLE_LOGIN_FOO}
                </ui:define>
 
                <ui:define name="content">
index 0305ff96fc4990c3f36cfe48ddadcc8e3fec7188..d405786f1e3be729427ddd5415412c421a0dc125 100644 (file)
@@ -8,4 +8,12 @@
        <!--
        TODO: Add something here that should be displayed on all admin pages
        //-->
+
+       <ui:define name="menu">
+               <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
+       </ui:define>
+
+       <ui:define name="footer">
+               <ui:include id="footer" class="admin_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
+       </ui:define>
 </ui:composition>
index a238e0505ee353c62f90685366ecc5d3b295bdc9..4ad527bb2901ded79b89c48bd7cb6a6e5536c594 100644 (file)
@@ -5,4 +5,12 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
        <ui:define name="title"><ui:insert name="guest_title" class="guest_title" /></ui:define>
+
+       <ui:define name="menu">
+               <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+       </ui:define>
+
+       <ui:define name="footer">
+               <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+       </ui:define>
 </ui:composition>
index c7c2389acf21795db41cd49ca33a6a56e441fb67..9c2b948d1a61888ac8b8e1449ad097815c3bfc6f 100644 (file)
@@ -24,7 +24,7 @@
                                <li><h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" /></li>
                                <li><h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" /></li>
                                <li><h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" /></li>
-                               <li><h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_RESEND_LINK}" /></li>
+                               <li><h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" /></li>
                        </ul>
                </div>
        </div>
index 23c86ca2a469aca805839762503c9fe03028ea9a..4ea5d85f2698f2eb6eb219748a55827751b3e029 100644 (file)
@@ -5,4 +5,12 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
        <ui:define name="title">Benutzerbereich - <ui:insert name="login_title" class="login_title" /></ui:define>
+
+       <ui:define name="menu">
+               <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+       </ui:define>
+
+       <ui:define name="footer">
+               <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+       </ui:define>
 </ui:composition>
index 08ce0c8fc5982f505b9ce772749066c8c2fe8564..70b7f101d3f87f7dcbd58542720cc95a40117c0d 100644 (file)
                        </div>
 
                        <ul>
-                               <li><h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_GUEST_HOME}" /></li>
-                               <li><h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" /></li>
+                               <li><h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_LOGIN_HOME}" /></li>
+                               <li><h:link title="#{msg.LINK_LOGIN_USER_LIST_TITLE}" outcome="login_user_list" value="#{msg.LINK_LOGIN_USER_LIST}" /></li>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.MENU_EDIT_PROFILE_TITLE}
+                       </div>
+
+                       <ul>
+                               <li><h:link title="#{msg.LINK_LOGIN_EDIT_USER_DATA_TITLE}" outcome="login_edit_user_data" value="#{msg.LINK_LOGIN_EDIT_USER_DATA}" /></li>
+                               <li><h:link title="#{msg.LINK_LOGIN_EDIT_ADDRESS_TITLE}" outcome="login_edit_address" value="#{msg.LINK_LOGIN_EDIT_ADDRESS}" /></li>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.MENU_ADDRESSBOOKS_TITLE}
+                       </div>
+
+                       <ul>
+                               <li><h:link title="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE}" outcome="login_own_addressbooks" value="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS}" /></li>
+                               <li><h:link title="#{msg.LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE}" outcome="login_other_addressbooks" value="#{msg.LINK_LOGIN_OTHER_ADDRESSBOOKS}" /></li>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.MENU_LOGOUT_TITLE}
+                       </div>
+
+                       <ul>
+                               <li><h:link title="#{msg.LINK_LOGIN_LOGOUT_TITLE}" outcome="logout" value="#{msg.LINK_LOGIN_LOGOUT}" /></li>
                        </ul>
                </div>
        </div>
diff --git a/web/admin/admin_index.xhtml b/web/admin/admin_index.xhtml
new file mode 100644 (file)
index 0000000..66ce3ac
--- /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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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_WELCOME}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_WELCOME}
+               </ui:define>
+
+               <ui:define name="content">
+                       <!--
+                       TODO: Replace this dummy
+                       //-->
+                       Einiges kann hier eingestellt werden.
+               </ui:define>
+       </ui:composition>
+</html>
index dac346def3131ec8ef2908a8bdb2e641d0ea355e..764f7f347f464125799283548e92548c65a0a57b 100644 (file)
@@ -9,20 +9,12 @@
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_ADMIN_LOGOUT}
+                       #{msg.CONTENT_TITLE_ADMIN_LOGOUT}
                </ui:define>
 
                <ui:define name="content">
                        Offenes TODO.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
deleted file mode 100644 (file)
index d1f2e75..0000000
+++ /dev/null
@@ -1,31 +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 xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/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_WELCOME}</ui:define>
-
-               <ui:define name="menu">
-                       <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.SUB_TITLE_ADMIN_WELCOME}
-               </ui:define>
-
-               <ui:define name="content">
-                       <!--
-                       TODO: Replace this dummy
-                       //-->
-                       Einiges kann hier eingestellt werden.
-               </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
-               </ui:define>
-       </ui:composition>
-</html>
index 1a47978873b990e420cfc3d944c8ac12f5bf6b56..9ae0129e02670e029b982468939b77bae7f449ff 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_IMPRINT}
+                       #{msg.CONTENT_TITLE_INDEX_IMPRINT}
                </ui:define>
 
                <ui:define name="content">
                        TODO: Hier kommt das Impressum hin!
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index ef1bc7e8c91ef23ba40809c1a8eaf6590627ccb7..9cd0fa174683e6a6eae59f4032a0cba82375b0e5 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_WELCOME}
+                       #{msg.CONTENT_TITLE_INDEX_WELCOME}
                </ui:define>
 
                <ui:define name="content">
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
diff --git a/web/login/index.xhtml b/web/login/index.xhtml
deleted file mode 100644 (file)
index dafff40..0000000
+++ /dev/null
@@ -1,28 +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 xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/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="guest_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
-
-               <ui:define name="menu">
-                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.SUB_TITLE_LOGIN_FOO}
-               </ui:define>
-
-               <ui:define name="content">
-                       Here goes your content.
-               </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/login/login_edit_address.xhtml b/web/login/login_edit_address.xhtml
new file mode 100644 (file)
index 0000000..a0359e3
--- /dev/null
@@ -0,0 +1,24 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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_ADDRESS}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_EDIT_ADDRESS}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/login/login_edit_user_data.xhtml b/web/login/login_edit_user_data.xhtml
new file mode 100644 (file)
index 0000000..0a627f6
--- /dev/null
@@ -0,0 +1,24 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/login/login_index.xhtml b/web/login/login_index.xhtml
new file mode 100644 (file)
index 0000000..774ab62
--- /dev/null
@@ -0,0 +1,20 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/login/login_other_addressbooks.xhtml b/web/login/login_other_addressbooks.xhtml
new file mode 100644 (file)
index 0000000..9c80f76
--- /dev/null
@@ -0,0 +1,24 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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_OTHER_ADDRESSBOOKS}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml
new file mode 100644 (file)
index 0000000..4b60481
--- /dev/null
@@ -0,0 +1,24 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/login/login_user_list.xhtml b/web/login/login_user_list.xhtml
new file mode 100644 (file)
index 0000000..a7087b3
--- /dev/null
@@ -0,0 +1,24 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/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_LIST}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_USER_LIST}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
index 77ef917f46a8201720739dae17c64c1604fbf38a..9024b1e7c90afd932340c252be170b8799c22e55 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_PRIVACY}
+                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}
                </ui:define>
 
                <ui:define name="content">
                        Hier kommen die Datenschutzbestimmungen hin.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index ca1f6f165bfd07500f796a2fb2411e5a4c339448..84bdff8a889428f52e063a9116aa25ae3b834a0b 100644 (file)
@@ -40,17 +40,10 @@ div, table {
 }
 
 .left_content {
-       background-color: #dddddd;
        padding: 5px;
        margin-left: 170px;
 }
 
-.right_content {
-       background-color: #dddddd;
-       padding: 5px;
-       margin: 0px 170px 0px 170px;
-}
-
 #top a:link, #top a:visited {
        color: #ffffff;
        font-weight : bold;
@@ -138,8 +131,10 @@ ul.footer_nav li.footer_copyright {
 }
 
 #content_header {
+       background-color: #dddddd;
        font-weight: bold;
        font-size: 18px;
+       padding-bottom: 20px;
 }
 
 .table_header_column {
index 1df064aa1458424a9174c144060d69d34971fb82..7b8fe8598dbc7053517d562910567ce87bcb6aeb 100644 (file)
@@ -1,8 +1,8 @@
 body {
        background-color: #ffffff;
        font-size: 12px;
-       font-family: lucida;
-       color: #000000;  
+       font-family: sans-serif;
+       color: #000000;
        margin: 10px;
 }
 
index f4aa41c7c6fb7bc79254543b1376040341bc8170..d1f4df9be24f5cb7824833a3ad5edb549f1e639d 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_TERMS}
+                       #{msg.CONTENT_TITLE_INDEX_TERMS}
                </ui:define>
 
                <ui:define name="content">
                        Hier kommen die allgemeinen Geschäftsbedingungen hin.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index 77bf49b124b3f4e200c047ec138a7089d2e2ad65..cd12e5a00c7eeca163e5076b3eb08705ad16b9d3 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
                <ui:define name="title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_USER_LOGIN}
+                       #{msg.CONTENT_TITLE_USER_LOGIN}
                </ui:define>
 
                <ui:define name="content">
@@ -32,9 +28,5 @@
                                <h:link id="user_lost_password" outcome="user_lost_passwd" title="Passwort wiederherstellen" value="Passwort vergessen?" />
                        </div>
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index 36b34d679e40840634747d30693b7fc7e658bde7..53961c3b670a764bdf02dd9baa9b168c5ef5e839 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
                <ui:define name="title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_USER_LOGIN_ERROR}
+                       #{msg.CONTENT_TITLE_USER_LOGIN_ERROR}
                </ui:define>
 
                <ui:define name="content">
                        Hier kommt die Fehlermeldung hin.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index e534aa4d081c64cf30183e1be2f70f4319994f36..97baad7735e5ea69c2bfc149f43b1f11e65d8fc5 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_USER_LOST_PASSWORD}
+                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
                </ui:define>
 
                <ui:define name="content">
@@ -67,9 +63,5 @@
                                </h:form>
                        </div>
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index efaa35b9c960611e20e6e21d506bc0d0e3dc9d77..433586c8bcce876203b5e8b28d044fee65a2bb36 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_USER_REGISTER}
+                       #{msg.CONTENT_TITLE_USER_REGISTER}
                </ui:define>
 
                <ui:define name="content">
                        <div class="para">
-                               Sie sind bereits Kunde? Dann <h:link outcome="user_login" value="hier" /> einloggen.
+                               #{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:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index 5214611bf7ad84b40d3020e2f2b781667d6c789e..f4d595a0fe907e5cf3080329475aa56fc9a6bf93 100644 (file)
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_USER_REGISTER_DONE}
+                       #{msg.CONTENT_TITLE_USER_REGISTER_DONE}
                </ui:define>
 
                <ui:define name="content">
@@ -29,9 +25,5 @@
                                </h:link>
                        </div>
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
index ebb62a4a79cfdcc6d6f25555f1ac263f6b3c0e95..40304242e743a61ae75e1b23c061dfa5a26d52f0 100644 (file)
@@ -9,20 +9,12 @@
        <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="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_RESEND_LINK}
+                       #{msg.CONTENT_TITLE_INDEX_RESEND_LINK}
                </ui:define>
 
                <ui:define name="content">
                        Here goes your content.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>