From 3ff12cb1730d035123669b8674c8ae56a60d02c0 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 8 Oct 2015 15:26:56 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20more=20pages=20for=20lo?= =?utf8?q?gin=20area=20-=20also=20added=20their=20language=20strings=20-?= =?utf8?q?=20moved=20menu/footer=20definitions=20into=20corresponding=20fo?= =?utf8?q?o=5Fbase.tpl=20templates=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../localization/bundle_de_DE.properties | 54 ++++++++++++--- .../localization/bundle_en_US.properties | 54 ++++++++++++--- web/WEB-INF/faces-config.xml | 67 ++++++++++++++----- web/WEB-INF/templates.dist/admin_page.xhtml | 8 --- web/WEB-INF/templates.dist/guest_page.xhtml | 10 +-- web/WEB-INF/templates.dist/login_page.xhtml | 2 +- web/WEB-INF/templates/admin/admin_base.tpl | 8 +++ web/WEB-INF/templates/guest/guest_base.tpl | 8 +++ web/WEB-INF/templates/guest/guest_menu.tpl | 2 +- web/WEB-INF/templates/login/login_base.tpl | 8 +++ web/WEB-INF/templates/login/login_menu.tpl | 30 ++++++++- web/admin/{index.xhtml => admin_index.xhtml} | 10 +-- web/admin/admin_logout.xhtml | 10 +-- web/imprint.xhtml | 10 +-- web/index.xhtml | 10 +-- .../{index.xhtml => login_edit_address.xhtml} | 8 +-- web/login/login_edit_user_data.xhtml | 24 +++++++ web/login/login_index.xhtml | 20 ++++++ web/login/login_other_addressbooks.xhtml | 24 +++++++ web/login/login_own_addressbooks.xhtml | 24 +++++++ web/login/login_user_list.xhtml | 24 +++++++ web/privacy.xhtml | 10 +-- web/resources/css/cssLayout.css | 9 +-- web/resources/css/default.css | 4 +- web/terms.xhtml | 10 +-- web/user/login.xhtml | 10 +-- web/user/login_error.xhtml | 10 +-- web/user/lost_passwd.xhtml | 10 +-- web/user/register.xhtml | 14 ++-- web/user/register_done.xhtml | 10 +-- web/user/resend_link.xhtml | 10 +-- 31 files changed, 327 insertions(+), 185 deletions(-) rename web/admin/{index.xhtml => admin_index.xhtml} (69%) rename web/login/{index.xhtml => login_edit_address.xhtml} (74%) create mode 100644 web/login/login_edit_user_data.xhtml create mode 100644 web/login/login_index.xhtml create mode 100644 web/login/login_other_addressbooks.xhtml create mode 100644 web/login/login_own_addressbooks.xhtml create mode 100644 web/login/login_user_list.xhtml diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 3fff23d5..1dd6c41b 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -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: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index bbb49465..7e9c7c40 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -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: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index ab8b7f84..7bf7a250 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -47,22 +47,60 @@ admin_index - /admin/index.xhtml - - - login_index - /login/index.xhtml - - - resend_link - /user/resend_link.xhtml - + /admin/admin_index.xhtml + + + login_index + /login/login_index.xhtml + + + resend_link + /user/resend_link.xhtml + + + login_own_addressbooks + /login/login_own_addressbooks.xhtml + + + login_other_addressbooks + /login/login_other_addressbooks.xhtml + + + login_user_list + /login/login_user_list.xhtml + + + admin_logout + /admin/admin_logout.xhtml + + + login_edit_address + /login/login_edit_address.xhtml + + + login_edit_user_data + /login/login_edit_user_data.xhtml + + + + /user/login.xhtml + + login + /login/login_index.xhtml + + + + /user/register.xhtml + + register_done + /user/register_done.xhtml + /admin/admin_logout.xhtml index - /* + /index.xhtml @@ -71,11 +109,4 @@ en_US - - /user/login.xhtml - - login - /login/index.xhtml - - diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml index 23940e06..d19c7c1c 100644 --- a/web/WEB-INF/templates.dist/admin_page.xhtml +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -9,10 +9,6 @@ Your page's title here - - - - Your header above content here @@ -20,9 +16,5 @@ Here goes your content. - - - - diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index a90306bc..e8f4fa13 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -9,20 +9,12 @@ #{msg.PAGE_TITLE_INDEX_FOO} - - - - - #{msg.SUB_TITLE_INDEX_FOO} + #{msg.CONTENT_TITLE_INDEX_FOO} Here goes your content. - - - - diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index c91b0f83..9378e32c 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -14,7 +14,7 @@ - #{msg.SUB_TITLE_LOGIN_FOO} + #{msg.CONTENT_TITLE_LOGIN_FOO} diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index 0305ff96..d405786f 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -8,4 +8,12 @@ + + + + + + + + diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index a238e050..4ad527bb 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -5,4 +5,12 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> + + + + + + + + diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index c7c2389a..9c2b948d 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -24,7 +24,7 @@
    • -
    • +
    • diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl index 23c86ca2..4ea5d85f 100644 --- a/web/WEB-INF/templates/login/login_base.tpl +++ b/web/WEB-INF/templates/login/login_base.tpl @@ -5,4 +5,12 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> Benutzerbereich - + + + + + + diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl index 08ce0c8f..70b7f101 100644 --- a/web/WEB-INF/templates/login/login_menu.tpl +++ b/web/WEB-INF/templates/login/login_menu.tpl @@ -12,8 +12,34 @@ + +
    + #{msg.MENU_EDIT_PROFILE_TITLE} +
    + + + +
    + #{msg.MENU_ADDRESSBOOKS_TITLE} +
    + + + +
    + #{msg.MENU_LOGOUT_TITLE} +
    + + diff --git a/web/admin/index.xhtml b/web/admin/admin_index.xhtml similarity index 69% rename from web/admin/index.xhtml rename to web/admin/admin_index.xhtml index d1f2e75f..66ce3acb 100644 --- a/web/admin/index.xhtml +++ b/web/admin/admin_index.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_ADMIN_WELCOME} - - - - - #{msg.SUB_TITLE_ADMIN_WELCOME} + #{msg.CONTENT_TITLE_ADMIN_WELCOME} @@ -23,9 +19,5 @@ //--> Einiges kann hier eingestellt werden. - - - - diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index dac346de..764f7f34 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -9,20 +9,12 @@ #{msg.PAGE_TITLE_ADMIN_LOGOUT} - - - - - #{msg.SUB_TITLE_ADMIN_LOGOUT} + #{msg.CONTENT_TITLE_ADMIN_LOGOUT} Offenes TODO. - - - - diff --git a/web/imprint.xhtml b/web/imprint.xhtml index 1a479788..9ae0129e 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -10,20 +10,12 @@ #{msg.PAGE_TITLE_INDEX_IMPRINT} - - - - - #{msg.SUB_TITLE_INDEX_IMPRINT} + #{msg.CONTENT_TITLE_INDEX_IMPRINT} TODO: Hier kommt das Impressum hin! - - - - diff --git a/web/index.xhtml b/web/index.xhtml index ef1bc7e8..9cd0fa17 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -10,19 +10,11 @@ #{msg.PAGE_TITLE_INDEX_WELCOME} - - - - - #{msg.SUB_TITLE_INDEX_WELCOME} + #{msg.CONTENT_TITLE_INDEX_WELCOME} - - - - diff --git a/web/login/index.xhtml b/web/login/login_edit_address.xhtml similarity index 74% rename from web/login/index.xhtml rename to web/login/login_edit_address.xhtml index dafff409..a0359e32 100644 --- a/web/login/index.xhtml +++ b/web/login/login_edit_address.xhtml @@ -7,22 +7,18 @@ > - #{msg.PAGE_TITLE_LOGIN_FOO} + #{msg.PAGE_TITLE_LOGIN_EDIT_ADDRESS} - #{msg.SUB_TITLE_LOGIN_FOO} + #{msg.CONTENT_TITLE_LOGIN_EDIT_ADDRESS} Here goes your content. - - - diff --git a/web/login/login_edit_user_data.xhtml b/web/login/login_edit_user_data.xhtml new file mode 100644 index 00000000..0a627f6a --- /dev/null +++ b/web/login/login_edit_user_data.xhtml @@ -0,0 +1,24 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} + + + + + + #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA} + + + + Here goes your content. + + + diff --git a/web/login/login_index.xhtml b/web/login/login_index.xhtml new file mode 100644 index 00000000..774ab626 --- /dev/null +++ b/web/login/login_index.xhtml @@ -0,0 +1,20 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_HOME} + + + #{msg.CONTENT_TITLE_LOGIN_HOME} + + + + Here goes your content. + + + diff --git a/web/login/login_other_addressbooks.xhtml b/web/login/login_other_addressbooks.xhtml new file mode 100644 index 00000000..9c80f76d --- /dev/null +++ b/web/login/login_other_addressbooks.xhtml @@ -0,0 +1,24 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS} + + + + + + #{msg.CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS} + + + + Here goes your content. + + + diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml new file mode 100644 index 00000000..4b60481e --- /dev/null +++ b/web/login/login_own_addressbooks.xhtml @@ -0,0 +1,24 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS} + + + + + + #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS} + + + + Here goes your content. + + + diff --git a/web/login/login_user_list.xhtml b/web/login/login_user_list.xhtml new file mode 100644 index 00000000..a7087b37 --- /dev/null +++ b/web/login/login_user_list.xhtml @@ -0,0 +1,24 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_USER_LIST} + + + + + + #{msg.CONTENT_TITLE_LOGIN_USER_LIST} + + + + Here goes your content. + + + diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 77ef917f..9024b1e7 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -10,20 +10,12 @@ #{msg.PAGE_TITLE_INDEX_PRIVACY} - - - - - #{msg.SUB_TITLE_INDEX_PRIVACY} + #{msg.CONTENT_TITLE_INDEX_PRIVACY} Hier kommen die Datenschutzbestimmungen hin. - - - - diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index ca1f6f16..84bdff8a 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -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 { diff --git a/web/resources/css/default.css b/web/resources/css/default.css index 1df064aa..7b8fe859 100644 --- a/web/resources/css/default.css +++ b/web/resources/css/default.css @@ -1,8 +1,8 @@ body { background-color: #ffffff; font-size: 12px; - font-family: lucida; - color: #000000; + font-family: sans-serif; + color: #000000; margin: 10px; } diff --git a/web/terms.xhtml b/web/terms.xhtml index f4aa41c7..d1f4df9b 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -10,20 +10,12 @@ #{msg.PAGE_TITLE_INDEX_TERMS} - - - - - #{msg.SUB_TITLE_INDEX_TERMS} + #{msg.CONTENT_TITLE_INDEX_TERMS} Hier kommen die allgemeinen Geschäftsbedingungen hin. - - - - diff --git a/web/user/login.xhtml b/web/user/login.xhtml index 77bf49b1..cd12e5a0 100644 --- a/web/user/login.xhtml +++ b/web/user/login.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_USER_LOGIN} - - - - - #{msg.SUB_TITLE_USER_LOGIN} + #{msg.CONTENT_TITLE_USER_LOGIN} @@ -32,9 +28,5 @@ - - - - diff --git a/web/user/login_error.xhtml b/web/user/login_error.xhtml index 36b34d67..53961c3b 100644 --- a/web/user/login_error.xhtml +++ b/web/user/login_error.xhtml @@ -10,20 +10,12 @@ #{msg.PAGE_TITLE_USER_LOGIN_ERROR} - - - - - #{msg.SUB_TITLE_USER_LOGIN_ERROR} + #{msg.CONTENT_TITLE_USER_LOGIN_ERROR} Hier kommt die Fehlermeldung hin. - - - - diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml index e534aa4d..97baad77 100644 --- a/web/user/lost_passwd.xhtml +++ b/web/user/lost_passwd.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_USER_LOST_PASSWORD} - - - - - #{msg.SUB_TITLE_USER_LOST_PASSWORD} + #{msg.CONTENT_TITLE_USER_LOST_PASSWORD} @@ -67,9 +63,5 @@ - - - - diff --git a/web/user/register.xhtml b/web/user/register.xhtml index efaa35b9..433586c8 100644 --- a/web/user/register.xhtml +++ b/web/user/register.xhtml @@ -10,26 +10,20 @@ #{msg.PAGE_TITLE_USER_REGISTER} - - - - - #{msg.SUB_TITLE_USER_REGISTER} + #{msg.CONTENT_TITLE_USER_REGISTER}
    - Sie sind bereits Kunde? Dann einloggen. + #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} + + #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
    - - - -     diff --git a/web/user/register_done.xhtml b/web/user/register_done.xhtml index 5214611b..f4d595a0 100644 --- a/web/user/register_done.xhtml +++ b/web/user/register_done.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_USER_REGISTER_DONE} - - - - - #{msg.SUB_TITLE_USER_REGISTER_DONE} + #{msg.CONTENT_TITLE_USER_REGISTER_DONE} @@ -29,9 +25,5 @@ - - - - diff --git a/web/user/resend_link.xhtml b/web/user/resend_link.xhtml index ebb62a4a..40304242 100644 --- a/web/user/resend_link.xhtml +++ b/web/user/resend_link.xhtml @@ -9,20 +9,12 @@ #{msg.PAGE_TITLE_INDEX_RESEND_LINK} - - - - - #{msg.SUB_TITLE_INDEX_RESEND_LINK} + #{msg.CONTENT_TITLE_INDEX_RESEND_LINK} Here goes your content. - - - - -- 2.39.5