From: Roland Haeder <roland@mxchange.org>
Date: Thu, 8 Oct 2015 13:24:16 +0000 (+0200)
Subject: Moved footer definition to corresponding foo_base.tpl templates
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=496e6c58474c2582844b80dcd5f647bc541a7072;p=pizzaservice-war.git

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 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 @@
 	<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 3345817b..e8f4fa13 100644
--- 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 900fe874..55485af3 100644
--- 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 0bc4792a..53d3de54 100644
--- 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 7edc1ce0..764f7f34 100644
--- 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 082dbd0f..efd7ca73 100644
--- 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 3d6c6d84..66ce3acb 100644
--- 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 66a2d0a5..78ae9252 100644
--- 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 4afe02fa..2f175aa8 100644
--- 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 d5cd3bb2..0f822f72 100644
--- 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 35f576bd..88ed1fab 100644
--- 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 53a409c7..fa548f07 100644
--- 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 8d0ab26d..0a40ae2b 100644
--- 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 85b8affa..479838cc 100644
--- 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 7019c5e2..cf8098d5 100644
--- 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 3683f111..e2b40855 100644
--- 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 2faf5489..461b5da3 100644
--- 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 3bc7f249..9ae0129e 100644
--- 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 77afb9fc..fe297f7e 100644
--- 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 e52dfa6d..cc01792e 100644
--- 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 dbb0234d..9024b1e7 100644
--- 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 71f0bddc..d1f4df9b 100644
--- 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>