No id here needed

diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index dca91f086a686cfc39ac84fa5cafa8a7f8647f0b..bfafb7cfdb216a8280089172b00cfbe1503cf5df 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -11,7 +11,7 @@
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
                <ui:define name="menu">
-                       <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
+                       <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index 4ad01e3626ee8ed83dcd1b2a56274dcddd10f43c..029bfc66b2f499efacb2bd3464f0ba6c6a013e4c 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -10,7 +10,7 @@
        //-->
 
        <ui:define name="menu">
-               <ui:include id="menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
+               <ui:include src="/WEB-INF/templates/admin/admin_menu.tpl" />
        </ui:define>
 
        <ui:define name="footer">

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 4b2e0aa90b00ca1397b0484faa54e82da17d6fca..5b50c7c3d682359099b11e163ee53875eae7272f 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -9,7 +9,7 @@
        </ui:define>
 
        <ui:define name="menu">
-               <ui:include id="menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               <ui:include src="/WEB-INF/templates/guest/guest_menu.tpl" />
        </ui:define>
 
        <ui:define name="footer">

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index bae64259efeec1674c8d7cee314cdc06f279f55d..0b87c3252187aade2ed9f7fa5b5db4eb40b16850 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -9,7 +9,7 @@
 
        <ui:define name="menu">
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
+                       <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />

diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 15006b004be92461791460ed0d762e79439eada2..e52d27906ff338ae9ee0b8d9d76fee2227b2e0fa 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -22,7 +22,7 @@
                        </div>
 
                        <div class="para">
-                               <ui:include id="login_form" src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
+                               <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
                        </div>
 
                        <div class="para">

diff --git a/web/user/index.xhtml b/web/user/index.xhtml
index dafff4098d279f69eb6c409122b36fde7170fbe6..2cdcf12e452877599f9047d11ba66612f10e2da0 100644 (file)
--- a/web/user/index.xhtml
+++ b/web/user/index.xhtml
@@ -10,7 +10,7 @@
                <ui:define name="guest_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
                <ui:define name="menu">
-                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+                       <ui:include class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 534a11ea7d4d7e75b2c35118935ebbe229773cb7..35fc74884d01214a6377e6f51bf1e14b3d9511ae 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -17,7 +17,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                                </ui:include>
                        </ui:fragment>

diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 9b790e21bb73e575f0b2463cf40851876bb35a71..3fc84f45c74d513f3485929abad310fdf035fd00 100644 (file)
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -17,7 +17,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                                </ui:include>
                        </ui:fragment>

diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index eda45b9400abc3db1afac5ec0861d145267927af..05de1ba793a61cc91ddcbc9369e63ebfdc7a1ee1 100644 (file)
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -17,7 +17,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                                </ui:include>
                        </ui:fragment>