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