Please cherry-pick:

[jjobs-war.git] / web / admin / admin_logout.xhtml

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 34ec868b5100898d0c4284496581f25a5243ff1d..7e5a13f39afc826caabbfddbf0adc1c64d8884c1 100644 (file)
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -8,15 +8,17 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LOGOUT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOGOUT}" />
                </ui:define>
 
                <ui:define name="content">
                        <h:form id="form_admin_logout">
-                               <div class="table">
+                               <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
                                        </div>
@@ -26,10 +28,9 @@
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
                        </h:form>
                </ui:define>
        </ui:composition>