From 3e177e07b4542d257b4183d636a6dc92192e4a0b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 17 Aug 2016 12:53:20 +0200
Subject: [PATCH] Fixed some comment-stuff: (please cherry-pick) - comments in
 JSF templates/pages may cause columns being rendered in h:panelGrid, better
 put such things in XML definition (outside ui:composition)

---
 web/WEB-INF/templates/admin/admin_base.tpl                | 8 ++++----
 .../admin/contact/admin_contact_data_columns.tpl          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index 029bfc66..92dc3d0a 100644
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+TODO: Add something here that should be displayed on all admin pages
+//-->
 <ui:composition
 	template="/WEB-INF/templates/base.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
@@ -5,10 +9,6 @@
 
 	<ui:define name="title">Administration - <ui:insert name="admin_title">Default admin title</ui:insert></ui:define>
 
-	<!--
-	TODO: Add something here that should be displayed on all admin pages
-	//-->
-
 	<ui:define name="menu">
 		<ui:include src="/WEB-INF/templates/admin/admin_menu.tpl" />
 	</ui:define>
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
index 6c50c8ab..ffb964de 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!-- @TODO maybe later add phone numbers as "main" numbers? //-->
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<!-- @TODO maybe later add phone numbers as "main" numbers? //-->
 	<h:column>
 		<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-- 
2.39.5