Moved footer definition to corresponding foo_base.tpl templates

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml
index 23940e06c1031b63fe8746a0f4e7c3e63100cd83..d19c7c1c2aeb815d49a97f865156b94c246cd50b 100644 (file)
--- a/web/WEB-INF/templates.dist/admin_page.xhtml
+++ b/web/WEB-INF/templates.dist/admin_page.xhtml
@@ -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>

diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml
index 3345817b680bf4215dc97dae16ca60a9d74bf69c..e8f4fa139ef8cb36b94f370096068fd303e5cf3f 100644 (file)
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -9,10 +9,6 @@
        <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.CONTENT_TITLE_INDEX_FOO}
                </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/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>

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

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 0bc4792ab64195c15861b9384788975f7dee0815..53d3de54157b7494ef2de0fcb803b85b0df5604a 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -24,4 +24,8 @@
                        <ui:include src="/WEB-INF/templates/basket/mini_basket.tpl" />
                </ui:fragment>
        </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>

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 7edc1ce09ad8ae0c198254ee0276d85a170d2c3d..764f7f347f464125799283548e92548c65a0a57b 100644 (file)
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -16,9 +16,5 @@
                <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/category.xhtml b/web/admin/category.xhtml
index 082dbd0f25741cd02038a9f4a05e9cdd82e522cf..efd7ca73445cb44c375beba3f7cdec2dc8ddbdf3 100644 (file)
--- a/web/admin/category.xhtml
+++ b/web/admin/category.xhtml
@@ -86,9 +86,5 @@
                                </h:form>
                        </div>
                </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
index 3d6c6d84997935dd6081343e403c707864fee02e..66ce3acbd86690fe13547d2bcb3fb1f5f89c8b5e 100644 (file)
--- a/web/admin/index.xhtml
+++ b/web/admin/index.xhtml
@@ -19,9 +19,5 @@
                        //-->
                        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>

diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml
index 66a2d0a599204b22ec263a6d3ad10a9684844af8..78ae9252c32a38a74009aaaa4db0aca280f21f01 100644 (file)
--- a/web/admin/product.xhtml
+++ b/web/admin/product.xhtml
@@ -132,9 +132,5 @@
                                </ul>
                        </div>
                </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/basket.xhtml b/web/basket.xhtml
index 4afe02fa866311fc01aa78bace7ff27a2208e57d..2f175aa892f9fdb62d7cc324d2fae407f8d44166 100644 (file)
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -67,9 +67,5 @@
                                <h:link class="checkout_link" id="checkout" value="#{msg.LINK_CONTINUE_TO_CHECKOUT}" outcome="checkout" />
                        </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>

diff --git a/web/bye.xhtml b/web/bye.xhtml
index d5cd3bb219cdb38aab058f503f0a9d65da941c60..0f822f72266f23291dbc328c991b92c80a2fc750 100644 (file)
--- a/web/bye.xhtml
+++ b/web/bye.xhtml
@@ -16,9 +16,5 @@
                <ui:define name="content">
                        Offenes TODO!
                </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/customer/checkout.xhtml b/web/customer/checkout.xhtml
index 35f576bd3ca91ebfdc1841da53a75c3d8d2a4d85..88ed1fabf8344583e5a5f4ba15b0bf8e95c6cbf4 100644 (file)
--- a/web/customer/checkout.xhtml
+++ b/web/customer/checkout.xhtml
@@ -64,9 +64,5 @@
                                </div>
                        </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>

diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml
index 53a409c7b0e463452b465366b317dd925523cf1b..fa548f07786256e4a1d29f41d1a3e54d0b36897a 100644 (file)
--- a/web/customer/checkout2.xhtml
+++ b/web/customer/checkout2.xhtml
@@ -49,9 +49,5 @@
                                </div>
                        </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>

diff --git a/web/customer/checkout_done.xhtml b/web/customer/checkout_done.xhtml
index 8d0ab26d5eab89fcaf0334f015b121d985631eda..0a40ae2b444d86d07fba5c49d6393b0d272fe930 100644 (file)
--- a/web/customer/checkout_done.xhtml
+++ b/web/customer/checkout_done.xhtml
@@ -20,9 +20,5 @@
                                <f:param name="key" value="#{receiptController.fetchAccessKey()}" />
                        </h:link>
                </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/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index 85b8affa992c48755f2ff368f1f8cab50b1489cd..479838ccfaafa09c3344b4aa08add8848e360a59 100644 (file)
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -16,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/guest/guest_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>

diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml
index 7019c5e2cb5e39f186c53fd3c97814d9016987f4..cf8098d5f54367d7f6916298808fcc9b1fe3c87f 100644 (file)
--- a/web/customer/login.xhtml
+++ b/web/customer/login.xhtml
@@ -28,9 +28,5 @@
                                <h:link id="customer_lost_password" outcome="customer_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>

diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml
index 3683f11166f1045ffc1ca7b3bdd7afb85ae0263a..e2b40855a8717aa477cf1b811c1f40cf53394cb1 100644 (file)
--- a/web/customer/lost_passwd.xhtml
+++ b/web/customer/lost_passwd.xhtml
@@ -63,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>

diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml
index 2faf5489f57b6d54759d29f1c40d6a6034b4ae12..461b5da337dc6852b6e6afad872c235174912045 100644 (file)
--- a/web/customer/register.xhtml
+++ b/web/customer/register.xhtml
@@ -23,9 +23,5 @@
                                <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>

diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 3bc7f24990d607cc3acf4c8a347bfa711dc9729e..9ae0129e02670e029b982468939b77bae7f449ff 100644 (file)
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -17,9 +17,5 @@
                <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>

diff --git a/web/index.xhtml b/web/index.xhtml
index 77afb9fc2c2782e7c30f1bbb5bf4f15bc341f853..fe297f7e60dc387c700aea6ccbb7401e74300750 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -94,9 +94,5 @@
                                </h:outputText>
                        </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>

diff --git a/web/item_added.xhtml b/web/item_added.xhtml
index e52dfa6de76eeb5609ae4d70cb380878bea0ac2f..cc01792ed1b06a71a9eea80efde56aba513b7ce4 100644 (file)
--- a/web/item_added.xhtml
+++ b/web/item_added.xhtml
@@ -18,9 +18,5 @@
                                <f:param value="#{basketController.outputLastAddedItem()}" />
                        </h:outputFormat>
                </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/privacy.xhtml b/web/privacy.xhtml
index dbb0234d7d264e09a58f30a96f498313abf1e86b..9024b1e7c90afd932340c252be170b8799c22e55 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -17,9 +17,5 @@
                <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>

diff --git a/web/terms.xhtml b/web/terms.xhtml
index 71f0bddc2ceb634a1ac76ea550b986d8370a0b7b..d1f4df9be24f5cb7824833a3ad5edb549f1e639d 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -17,9 +17,5 @@
                <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>