</div>
<div class="table_right">
- <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+ <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+ <ui:param name="targetController" value="#{userController}" />
+ </ui:include>
</div>
<div class="clear"></div>
</div>
<div class="table_right">
- <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customerController.firstName}" required="true">
- <f:validator validatorId="NameValidator" />
+ <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{userController.firstName}" required="true">
+ <f:validator for="firstName" validatorId="NameValidator" />
</h:inputText>
</div>
</div>
<div class="table_right">
- <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customerController.familyName}" required="true">
- <f:validator validatorId="NameValidator" />
+ <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{userController.familyName}" required="true">
+ <f:validator for="familyName" validatorId="NameValidator" />
</h:inputText>
</div>
</div>
<div class="table_right">
- <h:inputText class="input" id="street" size="20" maxlength="255" value="#{customerController.street}" required="true">
- <f:validator validatorId="NameValidator" />
+ <h:inputText class="input" id="street" size="20" maxlength="255" value="#{userController.street}" required="true">
+ <f:validator for="street" validatorId="NameValidator" />
</h:inputText>
</div>
</div>
<div class="table_right">
- <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customerController.houseNumber}" required="true">
- <f:validateLongRange minimum="1" maximum="500" />
+ <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{userController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+ <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
</h:inputText>
</div>
</div>
<div class="table_right">
- <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customerController.zipCode}" required="true" />
+ <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{userController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+ <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+ </h:inputText>
</div>
<div class="clear"></div>
</div>
<div class="table_right">
- <h:inputText class="input" id="city" size="10" maxlength="255" value="#{customerController.city}" required="true">
- <f:validator validatorId="NameValidator" />
+ <h:inputText class="input" id="city" size="10" maxlength="255" value="#{userController.city}" required="true">
+ <f:validator for="city" validatorId="NameValidator" />
</h:inputText>
</div>
</div>
<div class="table_right">
- <h:selectOneMenu class="select" id="country" value="#{userController.country}">
- <f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{msg[c.countryI18nkey]}" />
+ <h:selectOneMenu class="select" id="country" value="#{userController.country}" converter="country">
+ <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+ <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
</h:selectOneMenu>
</div>
<div class="table_row">
<div class="table_left">
- <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+ <h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
</div>
<div class="table_right">
- <h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customerController.phoneNumber}" />
+ <h:selectOneMenu class="select" id="countryPhoneCode" value="#{userController.phoneCountry}" converter="country">
+ <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+ <f:selectItems value="#{countryController.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}">
+ <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+ </h:inputText>
+
+ <h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{userController.phoneNumber}">
+ <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+ </h:inputText>
</div>
<div class="clear"></div>
</div>
<div class="table_right">
- <h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customerController.faxNumber}" />
+ <h:selectOneMenu class="select" id="faxCountryCode" value="#{userController.faxCountry}" converter="country">
+ <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+ <f:selectItems value="#{countryController.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}">
+ <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+ </h:inputText>
+
+ <h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{userController.faxNumber}">
+ <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+ </h:inputText>
</div>
<div class="clear"></div>
</div>
<div class="table_right">
- <h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customerController.cellphoneNumber}" />
+ <ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+ <ui:param name="targetController" value="#{userController}" />
+ </ui:include>
</div>
<div class="clear"></div>