Please cherry-pick:

- replace div class="error_container" to h:panelGroup

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 8df49098e0c15e4d8cdbb71edc30575fea3c7847..63532d5e1477ddf3ce8b79f6497c30ee3714fc39 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -767,3 +767,4 @@ ADMIN_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=Administrator hat neues Benutzeraccount
 USER_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=Ein Administrator hat Ihren Benutzeracciunt angelegt.
 ADMIN_ACTIVITY_USER_LOGGED_OUT=Benutzer hat sich ausgeloggt.
 USER_ACTIVITY_USER_LOGGED_OUT=Sie haben sich ausgeloggt.
+ERROR_GUEST_USER_NAME_REQUIRED_DISABLED=Fehler: Die Anwendung verwendet keine Benutzernamen, dennoch wurde dieses Template geladen.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 93e0f3b30e2f4031ec3b17c7559af4f38f65efa3..01ae184ea6f5a7321c7da823c5c53fd7ce017b95 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -768,3 +768,4 @@ ADMIN_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=An administrator has created a new user
 USER_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=An aministrator has created your new user account.
 ADMIN_ACTIVITY_USER_LOGGED_OUT=User has logged out.
 USER_ACTIVITY_USER_LOGGED_OUT=You have logged out.
+ERROR_GUEST_USER_NAME_REQUIRED_DISABLED=Error: This application requires no user name, still this template has been loaded.

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 b351539463fd0ab08697911e5ec97a7986f1586c..8e8f5431f264cee49156026a65f423b28574dd0a 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
@@ -24,9 +24,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -40,9 +40,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -56,9 +56,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -72,9 +72,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -88,9 +88,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -106,9 +106,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -122,9 +122,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -140,9 +140,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -156,9 +156,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -175,9 +175,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -273,9 +273,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index ceaa95269eccb9c062b81090dd8a0d691a5beeca..2cfa486a4eb370961e8c24dd77ba2c6d2de52dc2 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -56,13 +56,13 @@
                                <div class="clear"></div>
                        </div>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index c2137c0ffabba40558645112c5525b1b60b0d233..adb9bac949c15394e719002614b14635dfe1a348 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -44,13 +44,13 @@
                                <div class="clear"></div>
                        </div>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index b110d8ae967048c81448d1f76438a3caa52a771c..1aec8d21e19da42f50062034a0e78be1323b09f5 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -56,13 +56,13 @@
                                <div class="clear"></div>
                        </div>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index a560cac7506ffb76dc4a399668514e0628d8e4de..98f95d66a704ad9260abf86a98a79ca119567edf 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -44,13 +44,13 @@
                                <div class="clear"></div>
                        </div>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index ff56323e8ea5efc34988fc8a0f8c08c77c228af9..b612405ab943990d8af94667b7119ae2870843f2 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -45,9 +45,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -63,9 +63,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
                </fieldset>
        </div>

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 94786d7e75265893c198d0ee00ea9ce46f500372..4faff7598f6ed374d428e17176bb57a066f1a50f 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
@@ -28,9 +28,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 59e93a4c6f7b0d5e8fcad9983476869d8b9fe224..e6e227a7815b9d920aa993e15e4f29e447f42252 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -43,6 +43,10 @@
                                        <div id="content">
                                                <ui:insert name="content">Default content</ui:insert>
                                        </div>
+
+                                       <h:panelGroup styleClass="error_container" layout="block">
+                                               <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       </h:panelGroup>
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index f39c43f1974a790f5b92aaa32935b9745a7e7d11..1e02c8c9b5339e178b471cb09c553ceda00ebe82 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -29,9 +29,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -47,9 +47,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -65,9 +65,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -83,9 +83,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -101,9 +101,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -117,9 +117,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -135,9 +135,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -153,9 +153,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -171,9 +171,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -191,9 +191,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -220,13 +220,13 @@
                                <div class="clear"></div>
                        </div>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -252,13 +252,13 @@
                                <div class="clear"></div>
                        </div>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
                        <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 b6b5031902aa23d77e3a83881317ddae61f176ea..286cd67a2d9c73d8ddf86c7d4af3ff925fc0968f 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
@@ -19,9 +19,9 @@
 
                <div class="clear"></div>
 
-               <div class="error_container">
+               <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-               </div>
+               </h:panelGroup>
        </div>
 
        <div class="table_row">
@@ -35,8 +35,8 @@
 
                <div class="clear"></div>
 
-               <div class="error_container">
+               <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-               </div>
+               </h:panelGroup>
        </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 9d1943d0fc476ef164b5060db3a67a53cf9e6153..87f6c6025453b653f99fc3e62079c5d2dae52a02 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -29,9 +29,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
@@ -52,9 +52,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
                </fieldset>
        </div>

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 1bb24a809dab346f153562abd8ae04c6a222c0b2..ff8f295a5e13a02da11052608d8eedf8c2b8cdcf 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
        <div id="user_login_content">
-               <h:form id="form_user_login">
+               <h:form id="form_user_login" rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table_header">
                                        #{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
@@ -27,9 +27,9 @@
 
                                                <div class="clear"></div>
 
-                                               <div class="error_container">
+                                               <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                               </div>
+                                               </h:panelGroup>
                                        </div>
 
                                        <div class="table_row">
@@ -43,9 +43,9 @@
 
                                                <div class="clear"></div>
 
-                                               <div class="error_container">
+                                               <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                               </div>
+                                               </h:panelGroup>
                                        </div>
                                </fieldset>
 
@@ -55,5 +55,9 @@
                                </div>
                        </h:panelGroup>
                </h:form>
+
+               <h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
+               </h:panelGroup>
        </div>
 </ui:composition>

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 7ddcabfc2ee4d8d6fb06467ae7dbd938b5b329d5..eb9db2752d5dc5099bb6174a6a7608aeb0c11a29 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
@@ -31,9 +31,9 @@
 
                                                        <div class="clear"></div>
 
-                                                       <div class="error_container">
+                                                       <h:panelGroup styleClass="error_container" layout="block">
                                                                <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                       </div>
+                                                       </h:panelGroup>
                                                </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 6afb3eb6b29d5e6765f3f75f56cfe80ac838fd70..d20a2d1e3027e1ffa91f93b74e58b0e6afdbefaa 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
@@ -19,9 +19,9 @@
 
                <div class="clear"></div>
 
-               <div class="error_container">
+               <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-               </div>
+               </h:panelGroup>
        </div>
 
        <div class="table_row">
@@ -35,8 +35,8 @@
 
                <div class="clear"></div>
 
-               <div class="error_container">
+               <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-               </div>
+               </h:panelGroup>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 7c8a11c93a00dab33c9a9dd56c8ef3b96ebe7fa7..cbe9d2d4135120397a7be04fb53113b919a0b80f 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -24,9 +24,9 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                               </h:panelGroup>
                        </div>
                </fieldset>
        </div>

diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index b1fc24bfbb201832e8f9ac060658fb30f1d61f54..c4da123a94cbe8984abff1d8618452236f733313 100644 (file)
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -41,9 +41,9 @@
                                                </div>
                                        </fieldset>
 
-                                       <div class="error_container">
+                                       <h:panelGroup styleClass="error_container" layout="block">
                                                <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-                                       </div>
+                                       </h:panelGroup>
 
                                        <div class="table_row">
                                                <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index 254d07c8b8962e4984dd63684f9359d89d0d4934..fd7983505ce4c537ad96112930aec0cd03dbd226 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -41,9 +41,9 @@
 
                                                                        <div class="clear"></div>
 
-                                                                       <div class="error_container">
+                                                                       <h:panelGroup styleClass="error_container" layout="block">
                                                                                <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
+                                                                       </h:panelGroup>
                                                                </div>
 
                                                                <div class="table_row">
@@ -58,9 +58,9 @@
                                                                        <div class="clear"></div>
                                                                </div>
 
-                                                               <div class="error_container">
+                                                               <h:panelGroup styleClass="error_container" layout="block">
                                                                        <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </div>
+                                                               </h:panelGroup>
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
@@ -73,9 +73,9 @@
 
                                                                        <div class="clear"></div>
 
-                                                                       <div class="error_container">
+                                                                       <h:panelGroup styleClass="error_container" layout="block">
                                                                                <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
+                                                                       </h:panelGroup>
                                                                </div>
                                                        </fieldset>
                                                </div>