Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / admin_base.tpl

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index 4ad01e3626ee8ed83dcd1b2a56274dcddd10f43c..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,12 +9,8 @@
 
        <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 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">