Please cherry-pick:

[jjobs-war.git] / web / admin / branch_office / admin_branch_office_list.xhtml

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 8ff058ba13e2fabf0bbcb828b60b1b8aba096ce5..f1fb5c354da38534b15857bb6316ac6be87c0341 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
        </ui:define>
 
@@ -25,7 +25,6 @@
                                tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               widgetVar="branchOfficeTable"
                                filteredValue="#{branchOfficeController.filteredBranchOffices}"
                                rows="10"
                                reflow="true"
@@ -38,9 +37,15 @@
                                >
 
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
-                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                       <p:columnToggler datasource="table-list-branch-offices" trigger="toggler" />
+                                       <p:row>
+                                               <p:column>
+                                                       <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
+                                               </p:column>
+                                               <p:column>
+                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:columnToggler datasource="table-list-branch-offices" trigger="toggler" />
+                                               </p:column>
+                                       </p:row>
                                </f:facet>
 
                                <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{branchOffice.branchId}" filterBy="#{branchOffice.branchId}">
@@ -143,7 +148,7 @@
 
                                <ui:include src="/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl" />
 
-                               <p:panelGrid columns="2" styleClass="table-footer" layout="block">
+                               <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
                                        <p:commandButton
                                                styleClass="reset divider-right"
                                                type="reset"