added NONE_SELECTED choice + possible fix?

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index e533470f1694951d4dbfcdb12af9d25e206c7d27..3267f44b32debab4de062de143a1c55ca28df4cb 100644 (file)
--- 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 1bc2d555ec4838a8969359c0dfd348544f758936..d03c7a559ddc1707fce0d284d0360af8c9545130 100644 (file)
--- 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 4eacc4ac29e13a71b7ab7dfa42e5b43d62dde464..da0c1ca58862690a3f66e296f4f4d9ac607764dd 100644 (file)
--- 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 43cde46729b959717127c7f9cfafac82e0ef8ced..cbe55b02c332404e0a6fa6ef859693554d9b8590 100644 (file)
--- 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>