From 3e478fb33aa4d4c502e935aa7935ce6ab06169e7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 30 Aug 2016 17:52:38 +0200
Subject: [PATCH] Please cherry-pick: - lesser ui:fragment (was bad here
 anyway)

---
 web/guest/user/user_login.xhtml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index 1419666b..fe615ac7 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -18,23 +18,21 @@
 
 		<ui:define name="content">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
-					<div class="para">
-						<h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
-						<h:outputText value="&#160;" />
-						<h:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
-					</div>
-				</ui:fragment>
+				<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+					<h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
+
+					<h:outputText value="&#160;" />
+
+					<h:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
+				</h:panelGroup>
 
 				<div class="para">
 					<ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
 				</div>
 
-				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
-					<div class="para">
-						<h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
-					</div>
-				</ui:fragment>
+				<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
+					<h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+				</h:panelGroup>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
-- 
2.39.5