From 4d6ee6da7e8d568031d39c9177b309f03132b9a6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 25 Aug 2016 14:44:30 +0200
Subject: [PATCH] Please cherry-pick: - fixed component ids

---
 .../templates/admin/contact/admin_form_contact_data.tpl       | 4 ++--
 web/WEB-INF/templates/contact/form_contact_data.tpl           | 2 +-
 web/admin/fax/admin_fax_list.xhtml                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 086d52c9..b3515394 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
@@ -193,11 +193,11 @@
 					</h:selectOneMenu>
 
 					<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
-						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
 					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
-						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
 
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index af42442f..f39c43f1 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -198,7 +198,7 @@
 
 			<div class="table_row">
 				<div class="table_left_medium">
-					<h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+					<h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index 2f621cc4..e6606f80 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -31,10 +31,10 @@
 
 				<h:column>
 					<f:facet name="header">
-						<h:outputLabel for="phoneNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+						<h:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
 					</f:facet>
 
-					<h:outputText id="phoneNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+					<h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
 				</h:column>
 
 				<h:column>
-- 
2.39.5