Please cherry-pick:

[jjobs-war.git] / web / admin / branch_offices / admin_branch_offices_list.xhtml

diff --git a/web/admin/branch_offices/admin_branch_offices_list.xhtml b/web/admin/branch_offices/admin_branch_offices_list.xhtml
index 067f77eed046dbdb10339bc483bf7d986dcc0aab..0a5e5b41b13498e24451fbd214980547e55cc50c 100644 (file)
--- a/web/admin/branch_offices/admin_branch_offices_list.xhtml
+++ b/web/admin/branch_offices/admin_branch_offices_list.xhtml
@@ -2,6 +2,7 @@
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
                                xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+                               xmlns:links="http://mxchange.org/jsf/core/links"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -20,77 +21,89 @@
                <h:dataTable id="table_list_branch_offices" var="branchOffice" value="#{branchOfficeController.allBranchOffices()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}" rendered="#{not branchOfficeController.allBranchOffices().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{branchOffice.branchId}">
+                               <h:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
                                        <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_OWNER_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
                                        <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
                                </h:link>
 
-                               <h:link outcome="admin_assign_branch_offices_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+                               <h:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
                                        <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_NAME}" />
+                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_branch_offices" value="#{branchOffice.branchCompany.companyName}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}">
-                                       <f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
-                               </h:link>
+                               <h:outputLink value="#{branchOffice.branchCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty branchOffice.branchCompany.companyWebsiteUrl}">
+                                       <h:outputText value="#{branchOffice.branchCompany.companyName}" />
+                               </h:outputLink>
+
+                               <h:outputText value="#{branchOffice.branchCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_EMAIL_ADDRESS}" />
+                                       <h:outputText value="#{msg.DATA_EMAIL_ADDRESS}" />
                                </f:facet>
 
-                               <h:outputText value="#{branchOffice.branchEmailAddress}" />
+                               <h:outputLink value="mailto:#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
+
+                               <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.DATA_CITY}" />
+                                       <h:outputText value="#{msg.DATA_ADDRESS}" />
                                </f:facet>
 
-                               <h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" />
+                               <h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" title="#{branchOffice.branchStreet} #{branchOffice.branchHouseNumber} (#{msg.DATA_STORE} #{branchOffice.branchStore}, #{msg.DATA_SUITE_NUMBER} #{branchOffice.branchSuiteNumber})" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_CONTACT_PERSON}" />
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
                                        <f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
                                </h:link>
 
-                               <h:link outcome="admin_assign_branch_office_contact" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON}" rendered="#{empty branchOffice.branchContactEmployee}">
+                               <h:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
                                        <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
                                        <f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
                        </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                               </f:facet>
+
+                               <links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
+                       </h:column>
                </h:dataTable>
 
                <h:form id="form_admin_add_branch_office">