Continued with reparation: (please cherry-pick)

- placed all "error_container" div inside "table_row" div
- added missing error_container class for a div
- this prepares the project for rewrite towards more JSF 2.0 and lesser vanilla-HTML tags

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

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index 73bcaeb1269e8c57dbb2eab40adf07e4560c6126..7ed9c25e13e940560275c87d3015eaedce13a2cf 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -13,9 +13,13 @@
                </f:facet>
 
                <h:column>
-                       <h:outputLabel for="cellphoneId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+                       <h:panelGroup>
+                               <h:outputLabel for="cellphoneId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
 
-                       <h:outputText id="cellphoneId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                               <h:outputText id="cellphoneId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+
+                               <h:message for="cellphoneId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
                </h:column>
 
                <h:column>
@@ -43,8 +47,4 @@
                        </div>
                </h:column>
        </h:panelGrid>
-
-       <div class="error_container">
-               <h:message errorClass="errors" fatalClass="errors" warnClass="errors" for="cellphoneId" />
-       </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
index 1fa52a28307f366e21120000d5431243635eda12..8d74ca1ebfefb1b7eb0805bab970b8c4a5da455b 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
@@ -39,10 +39,10 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <div class="error_container">
-                               <h:message for="cellphoneProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="cellphoneProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
                        </div>
 
                        <div class="table_row">
@@ -57,10 +57,10 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <div class="error_container">
-                               <h:message for="cellphoneNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="cellphoneNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
                        </div>
                </fieldset>
        </div>

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 3cdb6a096b2c550aac0affd4b9fa04b1178b32f1..f4721b79d7774c3850ab2fe2579a94c5a14bdaf2 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -23,9 +23,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -37,9 +39,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -51,9 +55,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -65,9 +71,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -79,9 +87,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -95,9 +105,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -109,9 +121,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -125,9 +139,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -139,9 +155,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -156,9 +174,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">

diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 8917611c36b6dcb29dcec2b874614c881bd0fdbd..94786d7e75265893c198d0ee00ea9ce46f500372 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -27,9 +27,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 969fe4e624b762b870d4bd23871baffa1e290404..d62243e906f476f50023d3b0c56c0cd2563134fc 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -28,9 +28,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -44,9 +46,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -60,9 +64,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -76,9 +82,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -92,10 +100,10 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <div class="error_container">
-                               <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
                        </div>
 
                        <div class="table_row">
@@ -108,10 +116,10 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <div class="error_container">
-                               <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
                        </div>
 
                        <div class="table_row">
@@ -126,9 +134,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -142,9 +152,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -158,9 +170,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -176,9 +190,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">

diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index 7a2df7556bfb57bfcef1ff0a8b6e44b2c1820120..b6b5031902aa23d77e3a83881317ddae61f176ea 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -18,6 +18,10 @@
                </div>
 
                <div class="clear"></div>
+
+               <div class="error_container">
+                       <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               </div>
        </div>
 
        <div class="table_row">
@@ -30,13 +34,9 @@
                </div>
 
                <div class="clear"></div>
-       </div>
 
-       <div>
-               <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-       </div>
-
-       <div>
-               <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               <div class="error_container">
+                       <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               </div>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index f05b1d55396347c124a3e340fa5a5c3a99b6bc00..9d1943d0fc476ef164b5060db3a67a53cf9e6153 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -28,9 +28,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left25_medium">
@@ -49,9 +51,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </div>
+                       </div>
                </fieldset>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 2387a5feac8b42bad705e0c6d54f6899a707cfcb..1bb24a809dab346f153562abd8ae04c6a222c0b2 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -24,9 +24,13 @@
                                                <div class="table_right">
                                                        <h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
-                                       </div>
 
-                                       <div class="clear"></div>
+                                               <div class="clear"></div>
+
+                                               <div class="error_container">
+                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </div>
+                                       </div>
 
                                        <div class="table_row">
                                                <div class="table_left">
@@ -36,9 +40,13 @@
                                                <div class="table_right">
                                                        <h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
-                                       </div>
 
-                                       <div class="clear"></div>
+                                               <div class="clear"></div>
+
+                                               <div class="error_container">
+                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </div>
+                                       </div>
                                </fieldset>
 
                                <div class="table_footer">

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index cd7b8f40c544508716e0fb6d4c999cd44f01fa89..7ddcabfc2ee4d8d6fb06467ae7dbd938b5b329d5 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -30,10 +30,10 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
 
-                                               <div class="error_container">
-                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <div class="error_container">
+                                                               <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       </div>
                                                </div>
                                        </ui:fragment>
 

diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index b11235440c1b52c7d8f4551c3df7535e258e0dae..6afb3eb6b29d5e6765f3f75f56cfe80ac838fd70 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -18,6 +18,10 @@
                </div>
 
                <div class="clear"></div>
+
+               <div class="error_container">
+                       <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               </div>
        </div>
 
        <div class="table_row">
@@ -30,13 +34,9 @@
                </div>
 
                <div class="clear"></div>
-       </div>
 
-       <div>
-               <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-       </div>
-
-       <div>
-               <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               <div class="error_container">
+                       <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               </div>
        </div>
 </ui:composition>

diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index 49c48c22be25d79a72c0a33a61ba53ea49875a35..bbd665b9a8d11ccda5b4909f5c788207961a839f 100644 (file)
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -39,7 +39,7 @@
                                                </div>
                                        </fieldset>
 
-                                       <div>
+                                       <div class="error_container">
                                                <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                                        </div>
 

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index a4b50d33106682b687bc98e160f76d01ea037ec1..bff6c9021ba64cf78b864202c420af85ccf5e0e4 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -38,10 +38,10 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-                                                               </div>
 
-                                                               <div class="error_container">
-                                                                       <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       <div class="error_container">
+                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
                                                                </div>
 
                                                                <div class="table_row">
@@ -70,10 +70,10 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-                                                               </div>
 
-                                                               <div class="error_container">
-                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       <div class="error_container">
+                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
                                                                </div>
                                                        </fieldset>
                                                </div>