From 5e585c0098322f381a37026ff8a41431d58caa2a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 21:08:57 +0200
Subject: [PATCH] Please cherry-pick: - used h:panelGroup instead of direct div
 tag, remember that JSF pages are WUIs   (like GUIs)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/guest/user/user_register.xhtml       | 4 ++--
 web/guest/user/user_register_done.xhtml  | 4 ++--
 web/guest/user/user_register_page2.xhtml | 8 ++++----
 web/index.xhtml                          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 937ed09d..a2a30bfd 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -29,7 +29,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>
@@ -37,7 +37,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 a16bdc28..46c2e6a9 100644
--- 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 f06e953c..fe89f876 100644
--- 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 5faf2bb6..dc096791 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -19,11 +19,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}" />
-- 
2.39.5