Please cherry-pick:

- used h:panelGroup instead of direct div tag, remember that JSF pages are WUIs
  (like GUIs)

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

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 1cd546662b2e1fc6a10e5bc85aa7ddca996ea20a..124eefc001a01450f093261d5b7a61a11ade2745 100644 (file)
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -28,7 +28,7 @@
                                        </div>
                                </ui:fragment>
 
-                               <div class="registration_form">
+                               <h:panelGroup layout="block" styleClass="registration_form">
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                                                <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
                                        </ui:fragment>
@@ -36,7 +36,7 @@
                                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
                                                <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
                                        </ui:fragment>
-                               </div>
+                               </h:panelGroup>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">

diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index a16bdc2896626f9363b787de9f0c1daa1e19b1cc..46c2e6a9147c97126f68d780d5e4d6f7fbaed7d2 100644 (file)
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -22,9 +22,9 @@
                                <h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
                        </div>
 
-                       <div class="registration_form">
+                       <h:panelGroup layout="block" styleClass="registration_form">
                                <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
-                       </div>
+                       </h:panelGroup>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index f06e953c8e82007f35ccd6a153d53f3be74b9e64..fe89f8761095424e4739c76878fb3a126eb887f0 100644 (file)
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -21,15 +21,15 @@
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                        <div class="para">
-                                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
                                                <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                        </div>
                                </ui:fragment>
 
-                               <div class="registration_form">
+                               <h:panelGroup layout="block" styleClass="registration_form">
                                        <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl" />
-                               </div>
+                               </h:panelGroup>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">

diff --git a/web/index.xhtml b/web/index.xhtml
index 8273fa14895a7b804ed5a421965ab835a3ad2814..0954179750ecfc9f77d583168edbf8cf160193ea 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -18,11 +18,11 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <div class="registration_form">
+                               <h:panelGroup layout="block" styleClass="registration_form">
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                                                <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
                                        </ui:fragment>
-                               </div>
+                               </h:panelGroup>
 
                                <div class="para">
                                        <h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />