From fee5d31a7ea0232d185b379fe7342778a6f663de Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 12 Oct 2015 11:37:27 +0200
Subject: [PATCH] =?utf8?q?added=20NONE=5FSELECTED=20choice=20+=20possible?=
 =?utf8?q?=20fix=3F=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxchange?=
 =?utf8?q?.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../mxchange/localization/bundle_de_DE.properties  |  1 +
 .../mxchange/localization/bundle_en_US.properties  |  1 +
 .../templates/generic/form_personal_data.tpl       | 14 +++++++++-----
 .../templates/generic/gender_selection_box.tpl     |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index e533470f..3267f44b 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -170,3 +170,4 @@ LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE=Vergeben Sie hier einen Name fuer Ihr Adressb
 BUTTON_LOGIN_ADD_ADDRESSBOOK=Adressbuch anlegen
 LOGIN_ENTER_ADDRESSBOOK_NAME=Names des Adressbuches:
 COUNTRY_GERMANY=Deutschland
+NONE_SELECTED=k.A.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 1bc2d555..d03c7a55 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -170,3 +170,4 @@ LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE=Here you can give your address book a name. E
 BUTTON_LOGIN_ADD_ADDRESSBOOK=Create address book
 LOGIN_ENTER_ADDRESSBOOK_NAME=Name of address book:
 COUNTRY_GERMANY=Germany
+NONE_SELECTED=Empty
diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index 4eacc4ac..da0c1ca5 100644
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -114,6 +114,7 @@
 
 				<div class="table_right">
 					<h:selectOneMenu class="select" id="country" value="#{userController.country}">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
@@ -128,14 +129,15 @@
 
 				<div class="table_right">
 					<h:selectOneMenu class="select" id="phoneCountryCode" value="#{userController.phoneCountry}">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{userController.phoneAreaCode}">
+					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{userController.phoneAreaCode}" validator="PhoneNumberValidator" required="false">
 						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{userController.phoneNumber}">
+					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{userController.phoneNumber}" validator="PhoneNumberValidator" required="false">
 						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
@@ -150,14 +152,15 @@
 
 				<div class="table_right">
 					<h:selectOneMenu class="select" id="faxCountryCode" value="#{userController.faxCountry}">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{userController.faxAreaCode}">
+					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{userController.faxAreaCode}" validator="PhoneNumberValidator" required="false">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{userController.faxNumber}">
+					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{userController.faxNumber}" validator="PhoneNumberValidator" required="false">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
@@ -172,10 +175,11 @@
 
 				<div class="table_right">
 					<h:selectOneMenu class="select" id="cellphoneCarrier" value="#{userController.cellphoneCarrier}">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{cellphone.allSmsProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.country.countryLocalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{userController.cellphoneNumber}">
+					<h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{userController.cellphoneNumber}" validator="PhoneNumberValidator" required="false">
 						<f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index 43cde467..cbe55b02 100644
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -6,6 +6,7 @@
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 
 	<h:selectOneMenu class="select" id="gender" value="#{userController.gender}">
+		<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 		<f:selectItems value="#{gender.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
 	</h:selectOneMenu>
 </ui:composition>
-- 
2.39.5