X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ftemplates%2Fadmin%2Fcontact%2Fadmin_form_contact_data.tpl;h=ce141485e119304968fcdb8c095b23da6f12cb50;hb=b810cfbd6fcc29e218c2cfa360be7668dec3e51e;hp=5b015a0d8eb59a4e9c0e1bd8e2ae159fc9cb367f;hpb=ff37f1fa4262e87620d722aca17e9e203fcaa57c;p=pizzaservice-war.git

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 5b015a0d..ce141485 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -17,7 +17,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
 				</div>
@@ -167,7 +167,8 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
 					</h:selectOneMenu>
@@ -182,11 +183,11 @@
 
 			<h:panelGroup styleClass="table_row" layout="block">
 				<div class="table_left_medium">
-					<h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+					<h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminContactController.landLineCountry}">
+					<h:selectOneMenu styleClass="select right_space" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
@@ -206,7 +207,7 @@
 
 			<h:panelGroup styleClass="table_row" layout="block">
 				<div class="table_left_medium">
-					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+					<h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
@@ -234,15 +235,9 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{adminContactController.mobileProvider}">
-						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</h:selectOneMenu>
-
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminContactController.mobileNumber}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					<ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminContactController}" />
+					</ui:include>
 				</div>
 
 				<div class="clear"></div>
@@ -254,7 +249,9 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" />
+					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+						<f:validator validatorId="EmailAddressValidator" />
+					</h:inputText>
 				</div>
 
 				<div class="clear"></div>