X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ftemplates%2Fadmin%2Fcontact%2Fadmin_form_contact_data.tpl;h=f7f3228b75f1506d1ce75419d0126dd5d750351f;hb=8e4ce897a6faab489a2b09fa64cb1b696d37018f;hp=04aeab1438c9abc04e08c67e10bacabbb55af71b;hpb=4447f01ca2a02bcd3e42e117c4e4efcf51e1f3dd;p=pizzaservice-war.git

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 04aeab14..f7f3228b 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
@@ -7,14 +7,16 @@
 
 	<div class="para">
 		<fieldset id="personal_data">
-			<legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}</legend>
+			<legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
+			</legend>
 
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="gender" value="#{msg.ADMIN_PERSONAL_DATA_GENDER}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
@@ -23,48 +25,70 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="firstName" value="#{msg.ADMIN_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="#{adminContactController.firstName}" />
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
+					<h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.title}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
+			<div class="table_row">
+				<div class="table_left_medium">
 					<h:outputLabel for="familyName" value="#{msg.ADMIN_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="#{adminContactController.familyName}" />
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
@@ -73,12 +97,14 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
 					</h:inputText>
@@ -87,39 +113,45 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
@@ -138,11 +170,11 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
@@ -161,11 +193,11 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table_right_medium">
 					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
@@ -175,12 +207,12 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left">
+				<div class="table_left_medium">
 					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
 				</div>
 
-				<div class="table_right">
-					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" />
+				<div class="table_right_medium">
+					<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" />
 				</div>
 
 				<div class="clear"></div>