X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ftemplates%2Fcontact%2Fform_contact_data.tpl;h=77a406f037a9df772936da6bd1aea0149056db24;hb=63046d175704adcb6bdd126db1ce6fc5bc400e1f;hp=290abd55dbe4d205594dd8c7531a19e22033b7be;hpb=3dedfe02a978e6c0da9fc53976f8ecb9a4b68792;p=pizzaservice-war.git

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 290abd55..77a406f0 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -1,238 +1,211 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui">
 
-	<div class="para notice">
-		#{msg.PERSONAL_DATA_MINIMUM_NOTICE}
-	</div>
+	<h:panelGroup styleClass="para notice" layout="block">
+		<h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
+	</h:panelGroup>
 
-	<div class="para">
-		<fieldset id="personal_data">
+	<h:panelGroup styleClass="para" layout="block">
+		<fieldset class="fieldset" id="personal_data">
 			<legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
 				<h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
 			</legend>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
-				</div>
-
-				<div class="table_right">
-					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
-						<ui:param  name="targetController" value="#{contactController}" />
-					</ui:include>
-				</div>
+			<widgets:outputPersonalTitleTableRow targetController="#{contactController}" />
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
 						<f:validator for="familyName" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="error_container">
-				<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="street" value="#{msg.DATA_STREET_NAME}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="houseNumber" value="#{msg.DATA_HOUSE_NUMBER}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="houseNumberExtension" value="#{msg.DATA_HOUSE_NUMBER_EXTENSION}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="error_container">
-				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange minimum="1" maximum="99999" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="city" value="#{msg.DATA_CITY}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
+				<h:panelGroup styleClass="error_container" layout="block">
+					<h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
 						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
+				<h:panelGroup styleClass="error_container" layout="block">
+					<h:message for="birthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				</h:panelGroup>
 
-			<div class="error_container">
-				<h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[c.countryI18nkey]})" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
 					</h:selectOneMenu>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
-
-			<div class="error_container">
-				<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</div>
+				<h:panelGroup styleClass="error_container" layout="block">
+					<h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right">
-					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
 						<f:validator validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
 						<f:validator validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right">
-					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -240,55 +213,37 @@
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
-				</div>
-
-				<div class="table_right">
-					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
-						<ui:param name="targetController" value="#{contactController}" />
-					</ui:include>
-				</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
 
-				<div class="clear"></div>
-			</div>
+			<widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
 		</fieldset>
-	</div>
+	</h:panelGroup>
 
-	<ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-		<div class="para">
-			<fieldset id="user_profile">
-				<legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
-					<h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
-				</legend>
-
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
-					</div>
+	<h:panelGroup styleClass="para" layout="block" rendered="#{userController.isPublicUserProfileEnabled()}">
+		<fieldset class="fieldset" id="profile_mode">
+			<legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
+				<h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
+			</legend>
 
-					<div class="table_right">
-						<ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
-					</div>
+			<widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
 
-					<div class="clear"></div>
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="para notice">
+					<ul>
+						<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
+						<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}" /></li>
+						<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
+					</ul>
 				</div>
-
-				<div class="table_row">
-					<div class="para notice">
-						<ul>
-							<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
-							<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}" /></li>
-							<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
-						</ul>
-					</div>
-				</div>
-			</fieldset>
-		</div>
-	</ui:fragment>
+			</h:panelGroup>
+		</fieldset>
+	</h:panelGroup>
 </ui:composition>