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)

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index 029bfc66b2f499efacb2bd3464f0ba6c6a013e4c..92dc3d0aaf50f8a37e5a4686be4bdf46c60caa3d 100644 (file)
--- 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 6c50c8abb4e772f7ed1284684baf6b69a1e6e8d6..ffb964de55eb687c9e3c18217a0737e7dd1f99d6 100644 (file)
--- 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}" />