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 d405786f1e3be729427ddd5415412c421a0dc125..ebdd14ecd8816afb1bd9a6ef3e2bb3b3e2e27766 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -1,19 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: Add something here that should be displayed on all administrative pages
+//-->
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">Administration - <ui:insert name="admin_title" class="admin_title" /></ui:define>
+       <ui:define name="document_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA} - " />
 
-       <!--
-       TODO: Add something here that should be displayed on all admin pages
-       //-->
+               <ui:insert name="document_admin_title">
+                       <h:outputText value="Default admin title" />
+               </ui:insert>
+       </ui:define>
 
        <ui:define name="menu">
-               <ui:include id="menu" class="admin_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">
-               <ui:include id="footer" class="admin_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
+               <ui:include src="/WEB-INF/templates/admin/admin_footer.tpl" />
        </ui:define>
 </ui:composition>