From 1baf23183191af517a59bfbd65ad8e6a9ed162de Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 21:30:40 +0200
Subject: [PATCH] Please cherry-pick: - updated templates - added missing
 template message_box_mini.tpl
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/templates/generic/message_box.tpl | 22 ++++++++----
 .../templates/generic/message_box_mini.tpl    | 34 ++++++++++++++++++
 .../guest_email_address_repeat_fields.tpl     | 26 +++++++-------
 .../templates/guest/guest_privacy_terms.tpl   | 28 ++++++++-------
 .../templates/guest/user/guest_login_form.tpl | 33 +++++++++--------
 .../guest/user/guest_registration_form.tpl    |  4 +--
 .../register/guest_form_register_page1.tpl    | 35 +++++++++++--------
 .../register/guest_form_register_page2.tpl    | 10 +++---
 .../register/guest_form_register_single.tpl   | 22 +++++++++---
 9 files changed, 140 insertions(+), 74 deletions(-)
 create mode 100644 web/WEB-INF/templates/generic/message_box_mini.tpl

diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
index 9dddabfd..07c5b1e4 100644
--- a/web/WEB-INF/templates/generic/message_box.tpl
+++ b/web/WEB-INF/templates/generic/message_box.tpl
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<div class="message_box">
 		<div class="message_header">
@@ -12,9 +12,17 @@
 		</div>
 
 		<ui:fragment rendered="#{not empty message}">
-			<div class="okay para">
-				<h:outputText value="#{message}" />
-			</div>
+			<ui:fragment rendered="#{not empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="#{styleClass}" value="#{message}" />
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="okay" value="#{message}" />
+				</div>
+			</ui:fragment>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty message}">
diff --git a/web/WEB-INF/templates/generic/message_box_mini.tpl b/web/WEB-INF/templates/generic/message_box_mini.tpl
new file mode 100644
index 00000000..e8e1c560
--- /dev/null
+++ b/web/WEB-INF/templates/generic/message_box_mini.tpl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<div class="message_box_mini">
+		<div class="message_header">
+			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+		</div>
+
+		<ui:fragment rendered="#{not empty message}">
+			<ui:fragment rendered="#{not empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="#{styleClass}" value="#{message}" />
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="okay" value="#{message}" />
+				</div>
+			</ui:fragment>
+		</ui:fragment>
+
+		<ui:fragment rendered="#{empty message}">
+			<div class="errors para">
+				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+			</div>
+		</ui:fragment>
+	</div>
+</ui:composition>
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 eedea722..286cd67a 100644
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -7,36 +7,36 @@
 	>
 
 	<div class="table_row">
-		<div class="table_left">
+		<div class="table_left_medium">
 			<h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
 		</div>
 
-		<div class="table_right">
-			<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+		<div class="table_right_medium">
+			<h:inputText styleClass="input" id="emailAddress" size="30" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
 				<f:validator validatorId="EmailAddressValidator" />
 			</h:inputText>
 		</div>
 
 		<div class="clear"></div>
+
+		<h:panelGroup styleClass="error_container" layout="block">
+			<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		</h:panelGroup>
 	</div>
 
 	<div class="table_row">
-		<div class="table_left">
+		<div class="table_left_medium">
 			<h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
 		</div>
 
-		<div class="table_right">
-			<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+		<div class="table_right_medium">
+			<h:inputText styleClass="input" id="emailAddressRepeat" size="30" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 		</div>
 
 		<div class="clear"></div>
-	</div>
-
-	<div class="error_container">
-		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-	</div>
 
-	<div class="error_container">
-		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<h:panelGroup styleClass="error_container" layout="block">
+			<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		</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 877e2fa0..87f6c602 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -6,19 +6,20 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="para">
-		<fieldset id="terms_privacy">
+		<fieldset class="fieldset" id="terms_privacy">
 			<legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">
 				<h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
 			</legend>
 
 			<div class="table_row">
-				<div class="table_left25">
-					<h:selectBooleanCheckbox styleClass="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
+				<div class="table_left25_medium">
+					<h:selectBooleanCheckbox styleClass="checkbox" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
 
-				<div class="table_right75">
+				<div class="table_left75_medium">
+					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
 					<h:outputText value="&#160;" />
 					<h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
@@ -27,20 +28,21 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<div class="error_container">
-				<h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:panelGroup styleClass="error_container" layout="block">
+					<h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				</h:panelGroup>
 			</div>
 
 			<div class="table_row">
-				<div class="table_left25">
-					<h:selectBooleanCheckbox styleClass="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
+				<div class="table_left25_medium">
+					<h:selectBooleanCheckbox styleClass="checkbox" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
 
-				<div class="table_right75">
+				<div class="table_left75_medium">
+					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
 					<h:outputText value="&#160;" />
 					<h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
@@ -49,10 +51,10 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<div class="error_container">
-				<h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:panelGroup styleClass="error_container" layout="block">
+					<h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				</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 c339432a..ea92ab2e 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -4,15 +4,14 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	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">
-			<div class="table">
+		<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}
+					<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
 				</div>
 
-				<fieldset id="login_data">
+				<fieldset class="fieldset" id="login_data">
 					<legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">
 						<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
 					</legend>
@@ -25,12 +24,12 @@
 						<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" />
+						<h:panelGroup styleClass="error_container" layout="block">
+							<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</h:panelGroup>
 					</div>
 
 					<div class="table_row">
@@ -41,20 +40,24 @@
 						<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" />
+						<h:panelGroup styleClass="error_container" layout="block">
+							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</h:panelGroup>
 					</div>
 				</fieldset>
 
 				<div class="table_footer">
-					<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
-			</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/guest_registration_form.tpl b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
index c9020630..0fa8fcd5 100644
--- a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
@@ -8,7 +8,7 @@
 	<h:form id="register_page2_form">
 		<div class="table">
 			<div class="table_header">
-				#{msg.GUEST_REGISTRATION_PAGE2_TITLE}
+				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
 			</div>
 
 			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
@@ -80,7 +80,7 @@
 					</div>
 
 					<div class="para notice">
-						#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
+						<h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
 					</div>
 				</fieldset>
 			</div>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index 221f3961..68c7b15f 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -5,26 +5,25 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-
-	<h:form id="form_register_page1">
-		<div class="table">
+	<h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+		<h:panelGroup styleClass="table_medium" layout="block">
 			<div class="table_header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
 			</div>
 
 			<div class="para">
-				<fieldset id="login_data">
+				<fieldset class="fieldset" id="login_data">
 					<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
 						<h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
 					</legend>
 
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
 						<div class="table_row">
-							<div class="table_left">
+							<div class="table_left_medium">
 								<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table_right_medium">
 								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
 							</div>
 
@@ -38,29 +37,37 @@
 						<div class="para"></div>
 
 						<div class="table_row">
-							<div class="table_left">
+							<div class="table_left_medium">
 								<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 							</div>
 
-							<div class="table_right">
-								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+							<div class="table_right_medium">
+								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
 							</div>
 
 							<div class="clear"></div>
 						</div>
 
+						<h:panelGroup styleClass="error_container" layout="block">
+							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</h:panelGroup>
+
 						<div class="table_row">
-							<div class="table_left">
+							<div class="table_left_medium">
 								<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 							</div>
 
-							<div class="table_right">
-								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+							<div class="table_right_medium">
+								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
 							</div>
 
 							<div class="clear"></div>
 						</div>
 
+						<h:panelGroup styleClass="error_container" layout="block">
+							<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</h:panelGroup>
+
 						<div class="para notice">
 							<h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
 						</div>
@@ -71,9 +78,9 @@
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 			<div class="table_footer">
-				<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" id="continueRegisterPage1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{registerController.doRegisterMultiPage1()}" />
 			</div>
-		</div>
+		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index 6ac09d54..4acb48f2 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
@@ -5,8 +5,8 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:form id="form_register_page2">
-		<div class="table">
+	<h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+		<h:panelGroup styleClass="table_medium" layout="block">
 			<div class="table_header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
 			</div>
@@ -14,9 +14,9 @@
 			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
 			<div class="table_footer">
-				<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton styleClass="submit" type="submit" id="finish_registration" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
+				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
 			</div>
-		</div>
+		</h:panelGroup>
 	</h:form>
 </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 dc3cd180..8771db23 100644
--- 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
@@ -5,8 +5,8 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:form id="form_register_single">
-		<div class="table">
+	<h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+		<h:panelGroup styleClass="table_medium" layout="block">
 			<div class="table_header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
 			</div>
@@ -14,7 +14,7 @@
 			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
 			<div class="para">
-				<fieldset id="login_data">
+				<fieldset class="fieldset" id="login_data">
 					<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
 						<h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
 					</legend>
@@ -30,6 +30,10 @@
 							</div>
 
 							<div class="clear"></div>
+
+							<h:panelGroup styleClass="error_container" layout="block">
+								<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							</h:panelGroup>
 						</div>
 					</ui:fragment>
 
@@ -50,6 +54,10 @@
 							<div class="clear"></div>
 						</div>
 
+						<h:panelGroup styleClass="error_container" layout="block">
+							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</h:panelGroup>
+
 						<div class="table_row">
 							<div class="table_left">
 								<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
@@ -62,6 +70,10 @@
 							<div class="clear"></div>
 						</div>
 
+						<h:panelGroup styleClass="error_container" layout="block">
+							<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</h:panelGroup>
+
 						<div class="para notice">
 							<h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
 						</div>
@@ -72,9 +84,9 @@
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 			<div class="table_footer">
-				<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" id="finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
 			</div>
-		</div>
+		</h:panelGroup>
 	</h:form>
 </ui:composition>
-- 
2.39.5