Continued:

- renamed SUB_TITLE_FOO -> CONTENT_TITLE_FOO
- moved menu insert into corresponding bar_base.tpl templates
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index da431701fb3fd5716d14cbcab860ed26b6b3d44b..70447d6590cbce606c82dfc84be7c927ca3f0e72 100644 (file)
--- 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 a26d64593448fb76217dba33afac0db1187e6c9d..b12643b3a0440089124e351d10fd6abdec0aef10 100644 (file)
--- 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 b472f481dfe69e8c4456daffc6e33fd47278581a..d2520393569004ca999836df12941fcbb82d6fc8 100644 (file)
--- 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 a90306bc8885fe3692cd6602b298928728e6d1c3..3345817b680bf4215dc97dae16ca60a9d74bf69c 100644 (file)
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -14,7 +14,7 @@
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_FOO}
+                       #{msg.CONTENT_TITLE_INDEX_FOO}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index 0305ff96fc4990c3f36cfe48ddadcc8e3fec7188..900fe874bb026fdefc05870e812acae0fb431e0b 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -8,4 +8,8 @@
        <!--
        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:composition>

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 7b8ebca624048398825684bed34cf5a07d0cf0fc..0bc4792ab64195c15861b9384788975f7dee0815 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -6,6 +6,10 @@
 
        <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>
+
        <!--
        Show basket if it contains items, else show an empty basket.
        //-->

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index dac346def3131ec8ef2908a8bdb2e641d0ea355e..7edc1ce09ad8ae0c198254ee0276d85a170d2c3d 100644 (file)
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -9,12 +9,8 @@
        <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">

diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml
index ed1225fad47842a99c60970c314a43c87a33050c..082dbd0f25741cd02038a9f4a05e9cdd82e522cf 100644 (file)
--- a/web/admin/category.xhtml
+++ b/web/admin/category.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_CATEGORIES}</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_CATEGORIES}
+                       #{msg.CONTENT_TITLE_ADMIN_CATEGORIES}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
index d1f2e75fc4a7dd14616e6afa3825a60f2133a7ab..3d6c6d84997935dd6081343e403c707864fee02e 100644 (file)
--- a/web/admin/index.xhtml
+++ b/web/admin/index.xhtml
@@ -9,12 +9,8 @@
        <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}
+                       #{msg.CONTENT_TITLE_ADMIN_WELCOME}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml
index 91f07153fc043624605d350395d471efec60e12e..66a2d0a599204b22ec263a6d3ad10a9684844af8 100644 (file)
--- a/web/admin/product.xhtml
+++ b/web/admin/product.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_PRODUCTS}</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_PRODUCTS}
+                       #{msg.CONTENT_TITLE_ADMIN_PRODUCTS}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/basket.xhtml b/web/basket.xhtml
index 230a89fe3b9ce202add8a279c7dd23a2a91df813..4afe02fa866311fc01aa78bace7ff27a2208e57d 100644 (file)
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_BASKET}</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_SHOW_BASKET}
+                       #{msg.CONTENT_TITLE_INDEX_SHOW_BASKET}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/bye.xhtml b/web/bye.xhtml
index 82e2362e3b23eaf913d53d8bf844cb09635d1d24..d5cd3bb219cdb38aab058f503f0a9d65da941c60 100644 (file)
--- a/web/bye.xhtml
+++ b/web/bye.xhtml
@@ -9,10 +9,6 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">Sitzung beenden</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">
                        Sitzung beenden
                </ui:define>

diff --git a/web/customer/checkout.xhtml b/web/customer/checkout.xhtml
index 9de80b1d11ce9fa8d02534cd15964af41c8e57e7..35f576bd3ca91ebfdc1841da53a75c3d8d2a4d85 100644 (file)
--- a/web/customer/checkout.xhtml
+++ b/web/customer/checkout.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT}</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_CUSTOMER_CHECKOUT}
+                       #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml
index c42be43fbb31b8a327f752eb6af57e8683501b05..53a409c7b0e463452b465366b317dd925523cf1b 100644 (file)
--- a/web/customer/checkout2.xhtml
+++ b/web/customer/checkout2.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CHECKOUT2}</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_CHECKOUT2}
+                       #{msg.CONTENT_TITLE_INDEX_CHECKOUT2}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/customer/checkout_done.xhtml b/web/customer/checkout_done.xhtml
index 2d1ddad5c8d8d2c172eb09a7e2516a2211af8aea..8d0ab26d5eab89fcaf0334f015b121d985631eda 100644 (file)
--- a/web/customer/checkout_done.xhtml
+++ b/web/customer/checkout_done.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT_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_CUSTOMER_CHECKOUT_DONE}
+                       #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index 35aa0821286c6ac89c1f39d9f54ca36c3c851935..85b8affa992c48755f2ff368f1f8cab50b1489cd 100644 (file)
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_EMPTY_BASKET}</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_CUSTOMER_EMPTY_BASKET}
+                       #{msg.CONTENT_TITLE_CUSTOMER_EMPTY_BASKET}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml
index c044f109c2341ae332697c272e3067b1080522f8..7019c5e2cb5e39f186c53fd3c97814d9016987f4 100644 (file)
--- a/web/customer/login.xhtml
+++ b/web/customer/login.xhtml
@@ -10,12 +10,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="customer_login">
                <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_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_CUSTOMER_LOGIN}
+                       #{msg.CONTENT_TITLE_CUSTOMER_LOGIN}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml
index 81f63af23106e6a19f758e532a96f56a69a392eb..3683f11166f1045ffc1ca7b3bdd7afb85ae0263a 100644 (file)
--- a/web/customer/lost_passwd.xhtml
+++ b/web/customer/lost_passwd.xhtml
@@ -10,12 +10,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_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_CUSTOMER_LOST_PASSWORD}
+                       #{msg.CONTENT_TITLE_CUSTOMER_LOST_PASSWORD}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml
index 2d91ead42c11b66cab5c3b0ab63aec607af0b39f..2faf5489f57b6d54759d29f1c40d6a6034b4ae12 100644 (file)
--- a/web/customer/register.xhtml
+++ b/web/customer/register.xhtml
@@ -10,12 +10,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_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_CUSTOMER_REGISTER}
+                       #{msg.CONTENT_TITLE_CUSTOMER_REGISTER}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 1a47978873b990e420cfc3d944c8ac12f5bf6b56..3bc7f24990d607cc3acf4c8a347bfa711dc9729e 100644 (file)
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -10,12 +10,8 @@
        <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">

diff --git a/web/index.xhtml b/web/index.xhtml
index 58ff71fd9565f0de647f26a9b77b40ad78050a44..77afb9fc2c2782e7c30f1bbb5bf4f15bc341f853 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -15,12 +15,8 @@
        <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">

diff --git a/web/item_added.xhtml b/web/item_added.xhtml
index 4ec9835e29b264c5bd871fbda010e246f2b2a878..e52dfa6de76eeb5609ae4d70cb380878bea0ac2f 100644 (file)
--- a/web/item_added.xhtml
+++ b/web/item_added.xhtml
@@ -9,12 +9,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_ITEM_ADDED}</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_ITEM_ADDED}
+                       #{msg.CONTENT_TITLE_INDEX_ITEM_ADDED}
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 77ef917f46a8201720739dae17c64c1604fbf38a..dbb0234d7d264e09a58f30a96f498313abf1e86b 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -10,12 +10,8 @@
        <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">

diff --git a/web/terms.xhtml b/web/terms.xhtml
index f4aa41c7c6fb7bc79254543b1376040341bc8170..71f0bddc2ceb634a1ac76ea550b986d8370a0b7b 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -10,12 +10,8 @@
        <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">