From: Roland Häder <roland@mxchange.org>
Date: Sun, 1 Oct 2017 15:41:53 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d2a22b62262f08b62be21ba0cc886d290675619c;p=jfinancials-war.git

Please cherry-pick:
- renamed template, no plural is needed

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
new file mode 100644
index 00000000..44abe1f0
--- /dev/null
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
+
+	<h:panelGroup styleClass="para" layout="block">
+		<fieldset class="fieldset">
+			<legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:selectOneMenu
+						id="branchCompany"
+						value="#{adminBranchOfficeController.branchCompany}"
+						filter="true"
+						filterMatchMode="contains"
+						required="true"
+						requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
+						>
+						<f:converter converterId="BasicCompanyDataConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+						<f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+					</p:selectOneMenu>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchCompany" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:selectOneMenu
+						id="branchContactEmployee"
+						value="#{adminBranchOfficeController.branchContactEmployee}"
+						filter="true"
+						filterMatchMode="contains"
+						>
+						<f:converter converterId="CompanyEmployeeConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+					</p:selectOneMenu>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchContactEmployee" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:selectOneMenu
+						id="branchUserOwner"
+						value="#{adminBranchOfficeController.branchUserOwner}"
+						filter="true"
+						filterMatchMode="contains"
+						>
+						<f:converter converterId="UserConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
+					</p:selectOneMenu>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchUserOwner" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+						<f:validator validatorId="EmailAddressValidator" />
+						<f:attribute name="allowEmptyValue" value="true" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchEmailAddress" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.landLineCountry}" />
+
+					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
+						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
+					</p:inputText>
+
+					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
+						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineCountry" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineAreaCode" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineNumber" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.faxCountry}" />
+
+					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
+						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+					</p:inputText>
+
+					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
+						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxCountry" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxAreaCode" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxNumber" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
+				</div>
+			</h:panelGroup>
+		</fieldset>
+
+		<fieldset class="fieldset" id="admin_branch_office_address">
+			<legend title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchStreet" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
+						<f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchHouseNumber" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
+						<f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchStore" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
+						<f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchSuiteNumber" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+						<f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchZipCode" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchCity" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchCountry" />
+			</h:panelGroup>
+		</fieldset>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_offices_data.tpl
deleted file mode 100644
index 44abe1f0..00000000
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_offices_data.tpl
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="branchCompany"
-						value="#{adminBranchOfficeController.branchCompany}"
-						filter="true"
-						filterMatchMode="contains"
-						required="true"
-						requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
-						>
-						<f:converter converterId="BasicCompanyDataConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-						<f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchCompany" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="branchContactEmployee"
-						value="#{adminBranchOfficeController.branchContactEmployee}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="CompanyEmployeeConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchContactEmployee" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="branchUserOwner"
-						value="#{adminBranchOfficeController.branchUserOwner}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="UserConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchUserOwner" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="true" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchEmailAddress" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.landLineCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
-						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
-						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineCountry" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineAreaCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.faxCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxCountry" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxAreaCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
-				</div>
-			</h:panelGroup>
-		</fieldset>
-
-		<fieldset class="fieldset" id="admin_branch_office_address">
-			<legend title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchStreet" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-						<f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchHouseNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-						<f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchStore" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-						<f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchSuiteNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
-						<f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchZipCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchCity" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchCountry" />
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>