Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / resources / tags / admin / form_data / contact / admin_form_contact_data.tpl

diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
index 964049c036773759c39b85381e960be222f0dd4b..3d71415c09c3b07843ac6f7c228eed52c4ad56de 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="para" layout="block">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
                <fieldset class="fieldset" id="personal_data">
                        <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
@@ -58,7 +58,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
+                                       <h:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -72,7 +72,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
+                                       <h:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -88,7 +88,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+                                       <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -102,7 +102,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
+                                       <h:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -118,7 +118,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
+                                       <h:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -132,7 +132,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
+                                       <h:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -196,13 +196,13 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
+                                       <h:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                                               <f:validator validatorId="EmailAddressValidator" />
-                                               <f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
+                                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                                               <f:validator for="emailAddress" validatorId="EmailAddressValidator" />
+                                               <f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>