From da9326bd5f74559cbec2f6c516bcc2ddcda5c46a Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 8 Oct 2015 14:29:43 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20renamed=20SUB=5FTITLE=5FFOO=20-?= =?utf8?q?>=20CONTENT=5FTITLE=5FFOO=20-=20moved=20menu=20insert=20into=20c?= =?utf8?q?orresponding=20bar=5Fbase.tpl=20templates=20Signed-off-by:Roland?= =?utf8?q?=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nbproject/project.properties | 2 +- .../localization/bundle_de_DE.properties | 34 +++++++++---------- .../localization/bundle_en_US.properties | 34 +++++++++---------- web/WEB-INF/templates.dist/guest_page.xhtml | 2 +- web/WEB-INF/templates/admin/admin_base.tpl | 4 +++ web/WEB-INF/templates/guest/guest_base.tpl | 4 +++ web/admin/admin_logout.xhtml | 6 +--- web/admin/category.xhtml | 6 +--- web/admin/index.xhtml | 6 +--- web/admin/product.xhtml | 6 +--- web/basket.xhtml | 6 +--- web/bye.xhtml | 4 --- web/customer/checkout.xhtml | 6 +--- web/customer/checkout2.xhtml | 6 +--- web/customer/checkout_done.xhtml | 6 +--- web/customer/empty_basket.xhtml | 6 +--- web/customer/login.xhtml | 6 +--- web/customer/lost_passwd.xhtml | 6 +--- web/customer/register.xhtml | 6 +--- web/imprint.xhtml | 6 +--- web/index.xhtml | 6 +--- web/item_added.xhtml | 6 +--- web/privacy.xhtml | 6 +--- web/terms.xhtml | 6 +--- 24 files changed, 61 insertions(+), 125 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index da431701..70447d65 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -47,7 +47,7 @@ j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar +j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index a26d6459..b12643b3 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -31,7 +31,7 @@ INPUT_TITLE_ENTER_ITEM_AMOUNT=Geben Sie hier die Bestellmenge ein. LOGIN_NO_CUSTOMER_NUMBER_MESSAGE=Sie haben keine EMail-Adresse eingegeben. LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben. PAGE_TITLE_INDEX_WELCOME=Willkommen! -SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service: +CONTENT_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service: FOLLOWING_PRODUCTS_ARE_AVAILABLE=Folgende Produkte k\u00f6nnen bestellt werden: ADMIN_ADD_ITEM_TO_BASKET=Hinzuf\u00fcgen LINK_TO_BASKET_TITLE=Weiter zum Warenkorb. @@ -43,16 +43,16 @@ TOTAL_ORDER_PRICE=Gesamtsumme: NO_ITEMS_ADDED_TO_BASKET=Es befinden sich derzeit keine Artikel im Warenkorb. ITEM_NOT_ORDERED=Nicht bestellt. 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: PAGE_TITLE_ADMIN_CATEGORIES=Kategorien -SUB_TITLE_ADMIN_CATEGORIES=Kategorien administrieren: +CONTENT_TITLE_ADMIN_CATEGORIES=Kategorien administrieren: SELECT_ENTRY=Ausw\u00e4hlen: ADMIN_ENTER_CATEGORY_TITLE=Bezeichnung: ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=(z.B. Pizzen) ADMIN_PARENT_CATEGORY=Elternkategorie: -SUB_TITLE_ADMIN_PRODUCTS=Diese Produkte sind erstellt worden: +CONTENT_TITLE_ADMIN_PRODUCTS=Diese Produkte sind erstellt worden: PAGE_TITLE_ADMIN_PRODUCTS=Produkte BUTTON_RESET_FORM=Formular zur\u00fccksetzen ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern @@ -93,20 +93,20 @@ LINK_TO_BASKET=Zum Warenkorb LINK_CONTINUE_SHOPPING=Weiter einkaufen LINK_CONTINUE_SHOPPING_TITLE=Klicken zum Fortfahren mit dem Einkauf. PAGE_TITLE_INDEX_SHOW_BASKET=Warenkorb anzeigen -SUB_TITLE_INDEX_SHOW_BASKET=Alle im Warenkorb befindlichen Artikel: +CONTENT_TITLE_INDEX_SHOW_BASKET=Alle im Warenkorb befindlichen Artikel: GUEST_ITEM_TITLE=Artikel: BUTTON_CHANGE_ITEM_AMOUNT=\u00c4ndern PAGE_TITLE_INDEX_IMPRINT=Impressum -SUB_TITLE_INDEX_IMPRINT=Impressum: +CONTENT_TITLE_INDEX_IMPRINT=Impressum: PAGE_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt -SUB_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt: +CONTENT_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt: GUEST_ITEM_ADDED_TO_BASKET=Der Artikel {0} wurde zum Warenkorb hinzugef\u00fcgt. LINK_CONTINUE_TO_CHECKOUT=Weiter zur Bezahlung PAGE_TITLE_CUSTOMER_CHECKOUT=Weiter zur Bezahlung PAGE_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen -SUB_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen: +CONTENT_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen: GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=Sie k\u00f6nnen hier ohne Anmeldung bezahlen: -SUB_TITLE_CUSTOMER_CHECKOUT=Bezahlungsm\u00f6glichkeit ausw\u00e4hlen: +CONTENT_TITLE_CUSTOMER_CHECKOUT=Bezahlungsm\u00f6glichkeit ausw\u00e4hlen: LINK_CHECKOUT_OPTION_LOGIN=Weiter zum Kundenlogin LINK_CHECKOUT_OPTION_REGISTRATION=Weiter zum neuen Kundenkonto anmelden LINK_CHECKOUT_OPTION_GUEST=Ohne Anmeldung bezahlen @@ -139,9 +139,9 @@ PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein. PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben: GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Bezahlung ohne Anmeldung PAGE_TITLE_CUSTOMER_LOGIN=Einloggen -SUB_TITLE_CUSTOMER_LOGIN=Zum Kundenbereich einloggen: +CONTENT_TITLE_CUSTOMER_LOGIN=Zum Kundenbereich einloggen: PAGE_TITLE_CUSTOMER_LOST_PASSWORD=Passwort vergessen -SUB_TITLE_CUSTOMER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her: +CONTENT_TITLE_CUSTOMER_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: @@ -149,17 +149,17 @@ ENTER_EMAIL_ADDRESS=Email-Adresse: GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... oder ... BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2 PAGE_TITLE_CUSTOMER_REGISTER=Neukunde -SUB_TITLE_CUSTOMER_REGISTER=Anmelden zum Pizza-Service: +CONTENT_TITLE_CUSTOMER_REGISTER=Anmelden zum Pizza-Service: 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 PAGE_TITLE_CUSTOMER_CHECKOUT_DONE=Bestellvorgang abgeschlossen -SUB_TITLE_CUSTOMER_CHECKOUT_DONE=Der Bestellvorgang ist abgeschlossen: +CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE=Der Bestellvorgang ist abgeschlossen: PAGE_TITLE_CUSTOMER_EMPTY_BASKET=Leerer Warenkorb! -SUB_TITLE_CUSTOMER_EMPTY_BASKET=Sie haben keine Artikel zum Warenkorb hinzugef\u00fcgt: +CONTENT_TITLE_CUSTOMER_EMPTY_BASKET=Sie haben keine Artikel zum Warenkorb hinzugef\u00fcgt: LINK_OPEN_RECEIPT=Rechnung ansehen ERROR_AMOUNT_IS_NULL=Die Bestellmenge ist nicht gesetzt. ERROR_AMOUNT_IS_NOT_LONG=Die eingegebene Menge ist keine Zahl. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index b472f481..d2520393 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -31,7 +31,7 @@ INPUT_TITLE_ENTER_ITEM_AMOUNT=Enter order amount here. LOGIN_NO_CUSTOMER_NUMBER_MESSAGE=You have entered no email address. LOGIN_NO_PASSWORD_MESSAGE=You have entered no password. PAGE_TITLE_INDEX_WELCOME=Welcome! -SUB_TITLE_INDEX_WELCOME=Welcome to Pizza-Service +CONTENT_TITLE_INDEX_WELCOME=Welcome to Pizza-Service FOLLOWING_PRODUCTS_ARE_AVAILABLE=Following products can be ordered: ADMIN_ADD_ITEM_TO_BASKET=Add to basket LINK_TO_BASKET_TITLE=Continued to basket page. @@ -43,16 +43,16 @@ TOTAL_ORDER_PRICE=Total: NO_ITEMS_ADDED_TO_BASKET=There are no items in the basket. ITEM_NOT_ORDERED=Not ordered. 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: PAGE_TITLE_ADMIN_CATEGORIES=Categories -SUB_TITLE_ADMIN_CATEGORIES=Administrate categories: +CONTENT_TITLE_ADMIN_CATEGORIES=Administrate categories: SELECT_ENTRY=Select: ADMIN_ENTER_CATEGORY_TITLE=Title: ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=(e.g. Pizza) ADMIN_PARENT_CATEGORY=Parent category: -SUB_TITLE_ADMIN_PRODUCTS=These products has been created: +CONTENT_TITLE_ADMIN_PRODUCTS=These products has been created: PAGE_TITLE_ADMIN_PRODUCTS=Products BUTTON_RESET_FORM=Reset form ADMIN_BUTTON_EDIT_ENTRIES=Edit @@ -93,20 +93,20 @@ LINK_TO_BASKET=To basket LINK_CONTINUE_SHOPPING=Continue shopping LINK_CONTINUE_SHOPPING_TITLE=Click to continue shopping. PAGE_TITLE_INDEX_SHOW_BASKET=Show basket -SUB_TITLE_INDEX_SHOW_BASKET=Following items are in basket: +CONTENT_TITLE_INDEX_SHOW_BASKET=Following items are in basket: GUEST_ITEM_TITLE=Item: BUTTON_CHANGE_ITEM_AMOUNT=Change PAGE_TITLE_INDEX_IMPRINT=Imprint -SUB_TITLE_INDEX_IMPRINT=Imprint: +CONTENT_TITLE_INDEX_IMPRINT=Imprint: PAGE_TITLE_INDEX_ITEM_ADDED=Item has been added to basket -SUB_TITLE_INDEX_ITEM_ADDED=Item has been added to basket: +CONTENT_TITLE_INDEX_ITEM_ADDED=Item has been added to basket: GUEST_ITEM_ADDED_TO_BASKET=The item {0} has been added to the basket. LINK_CONTINUE_TO_CHECKOUT=Continue to checkout PAGE_TITLE_CUSTOMER_CHECKOUT=Continue to checkout PAGE_TITLE_INDEX_CHECKOUT2=Checkout without login -SUB_TITLE_INDEX_CHECKOUT2=Checkout without login: +CONTENT_TITLE_INDEX_CHECKOUT2=Checkout without login: GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=You can checkout without registration -SUB_TITLE_CUSTOMER_CHECKOUT=Choose checkout option: +CONTENT_TITLE_CUSTOMER_CHECKOUT=Choose checkout option: LINK_CHECKOUT_OPTION_LOGIN=Continue to customer login LINK_CHECKOUT_OPTION_REGISTRATION=Continue with new customer registration LINK_CHECKOUT_OPTION_GUEST=Checkout without registration @@ -139,9 +139,9 @@ PERSONAL_DATA_LEGEND_TITLE=Please enter your data. PERSONAL_DATA_LEGEND=Please enter your data: GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Payment without registration PAGE_TITLE_CUSTOMER_LOGIN=Login -SUB_TITLE_CUSTOMER_LOGIN=Login to customer area: +CONTENT_TITLE_CUSTOMER_LOGIN=Login to customer area: PAGE_TITLE_CUSTOMER_LOST_PASSWORD=Lost password -SUB_TITLE_CUSTOMER_LOST_PASSWORD=Recover your password: +CONTENT_TITLE_CUSTOMER_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: @@ -149,17 +149,17 @@ ENTER_EMAIL_ADDRESS=Email address: GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... or ... BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2 PAGE_TITLE_CUSTOMER_REGISTER=Register -SUB_TITLE_CUSTOMER_REGISTER=Register at Pizza-Service: +CONTENT_TITLE_CUSTOMER_REGISTER=Register at Pizza-Service: 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 PAGE_TITLE_CUSTOMER_CHECKOUT_DONE=Checkout done -SUB_TITLE_CUSTOMER_CHECKOUT_DONE=The checkout is completed: +CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE=The checkout is completed: PAGE_TITLE_CUSTOMER_EMPTY_BASKET=Empty basket! -SUB_TITLE_CUSTOMER_EMPTY_BASKET=You have no products added to basket: +CONTENT_TITLE_CUSTOMER_EMPTY_BASKET=You have no products added to basket: LINK_OPEN_RECEIPT=View receipt ERROR_AMOUNT_IS_NULL=Order amount is not set. ERROR_AMOUNT_IS_NOT_LONG=The entered amount is not a number. diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index a90306bc..3345817b 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -14,7 +14,7 @@ - #{msg.SUB_TITLE_INDEX_FOO} + #{msg.CONTENT_TITLE_INDEX_FOO} diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index 0305ff96..900fe874 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -8,4 +8,8 @@ + + + + diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 7b8ebca6..0bc4792a 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -6,6 +6,10 @@ + + + + diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index dac346de..7edc1ce0 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_ADMIN_LOGOUT} - - - - - #{msg.SUB_TITLE_ADMIN_LOGOUT} + #{msg.CONTENT_TITLE_ADMIN_LOGOUT} diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml index ed1225fa..082dbd0f 100644 --- a/web/admin/category.xhtml +++ b/web/admin/category.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_ADMIN_CATEGORIES} - - - - - #{msg.SUB_TITLE_ADMIN_CATEGORIES} + #{msg.CONTENT_TITLE_ADMIN_CATEGORIES} diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml index d1f2e75f..3d6c6d84 100644 --- a/web/admin/index.xhtml +++ b/web/admin/index.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_ADMIN_WELCOME} - - - - - #{msg.SUB_TITLE_ADMIN_WELCOME} + #{msg.CONTENT_TITLE_ADMIN_WELCOME} diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml index 91f07153..66a2d0a5 100644 --- a/web/admin/product.xhtml +++ b/web/admin/product.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_ADMIN_PRODUCTS} - - - - - #{msg.SUB_TITLE_ADMIN_PRODUCTS} + #{msg.CONTENT_TITLE_ADMIN_PRODUCTS} diff --git a/web/basket.xhtml b/web/basket.xhtml index 230a89fe..4afe02fa 100644 --- a/web/basket.xhtml +++ b/web/basket.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_INDEX_SHOW_BASKET} - - - - - #{msg.SUB_TITLE_INDEX_SHOW_BASKET} + #{msg.CONTENT_TITLE_INDEX_SHOW_BASKET} diff --git a/web/bye.xhtml b/web/bye.xhtml index 82e2362e..d5cd3bb2 100644 --- a/web/bye.xhtml +++ b/web/bye.xhtml @@ -9,10 +9,6 @@ Sitzung beenden - - - - Sitzung beenden diff --git a/web/customer/checkout.xhtml b/web/customer/checkout.xhtml index 9de80b1d..35f576bd 100644 --- a/web/customer/checkout.xhtml +++ b/web/customer/checkout.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_CUSTOMER_CHECKOUT} - - - - - #{msg.SUB_TITLE_CUSTOMER_CHECKOUT} + #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT} diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml index c42be43f..53a409c7 100644 --- a/web/customer/checkout2.xhtml +++ b/web/customer/checkout2.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_INDEX_CHECKOUT2} - - - - - #{msg.SUB_TITLE_INDEX_CHECKOUT2} + #{msg.CONTENT_TITLE_INDEX_CHECKOUT2} diff --git a/web/customer/checkout_done.xhtml b/web/customer/checkout_done.xhtml index 2d1ddad5..8d0ab26d 100644 --- a/web/customer/checkout_done.xhtml +++ b/web/customer/checkout_done.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_CUSTOMER_CHECKOUT_DONE} - - - - - #{msg.SUB_TITLE_CUSTOMER_CHECKOUT_DONE} + #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE} diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml index 35aa0821..85b8affa 100644 --- a/web/customer/empty_basket.xhtml +++ b/web/customer/empty_basket.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_CUSTOMER_EMPTY_BASKET} - - - - - #{msg.SUB_TITLE_CUSTOMER_EMPTY_BASKET} + #{msg.CONTENT_TITLE_CUSTOMER_EMPTY_BASKET} diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml index c044f109..7019c5e2 100644 --- a/web/customer/login.xhtml +++ b/web/customer/login.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_CUSTOMER_LOGIN} - - - - - #{msg.SUB_TITLE_CUSTOMER_LOGIN} + #{msg.CONTENT_TITLE_CUSTOMER_LOGIN} diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml index 81f63af2..3683f111 100644 --- a/web/customer/lost_passwd.xhtml +++ b/web/customer/lost_passwd.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_CUSTOMER_LOST_PASSWORD} - - - - - #{msg.SUB_TITLE_CUSTOMER_LOST_PASSWORD} + #{msg.CONTENT_TITLE_CUSTOMER_LOST_PASSWORD} diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml index 2d91ead4..2faf5489 100644 --- a/web/customer/register.xhtml +++ b/web/customer/register.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_CUSTOMER_REGISTER} - - - - - #{msg.SUB_TITLE_CUSTOMER_REGISTER} + #{msg.CONTENT_TITLE_CUSTOMER_REGISTER} diff --git a/web/imprint.xhtml b/web/imprint.xhtml index 1a479788..3bc7f249 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_INDEX_IMPRINT} - - - - - #{msg.SUB_TITLE_INDEX_IMPRINT} + #{msg.CONTENT_TITLE_INDEX_IMPRINT} diff --git a/web/index.xhtml b/web/index.xhtml index 58ff71fd..77afb9fc 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -15,12 +15,8 @@ #{msg.PAGE_TITLE_INDEX_WELCOME} - - - - - #{msg.SUB_TITLE_INDEX_WELCOME} + #{msg.CONTENT_TITLE_INDEX_WELCOME} diff --git a/web/item_added.xhtml b/web/item_added.xhtml index 4ec9835e..e52dfa6d 100644 --- a/web/item_added.xhtml +++ b/web/item_added.xhtml @@ -9,12 +9,8 @@ #{msg.PAGE_TITLE_INDEX_ITEM_ADDED} - - - - - #{msg.SUB_TITLE_INDEX_ITEM_ADDED} + #{msg.CONTENT_TITLE_INDEX_ITEM_ADDED} diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 77ef917f..dbb0234d 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_INDEX_PRIVACY} - - - - - #{msg.SUB_TITLE_INDEX_PRIVACY} + #{msg.CONTENT_TITLE_INDEX_PRIVACY} diff --git a/web/terms.xhtml b/web/terms.xhtml index f4aa41c7..71f0bddc 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -10,12 +10,8 @@ #{msg.PAGE_TITLE_INDEX_TERMS} - - - - - #{msg.SUB_TITLE_INDEX_TERMS} + #{msg.CONTENT_TITLE_INDEX_TERMS} -- 2.39.5