Please cherry-pick:

- cleanups on templates such as ...
- adding h:outputText
- adding error_container with h:panelGroup and h:message
- removed no longer used template as it has been splitted

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

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 ff8f295a5e13a02da11052608d8eedf8c2b8cdcf..ea92ab2e2516aa8c4295a6cfe10a1ff71bcf9e26 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -8,7 +8,7 @@
                <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 class="fieldset" id="login_data">

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 7ccf32d9dd677b30fca62304276436b8874ea594..68c7b15faada279a6d4d3168376216e3b87b15db 100644 (file)
--- 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,10 +5,10 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:form id="form_register_page1">
+       <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               #{msg.GUEST_REGISTRATION_PAGE1_TITLE}
+                               <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
                        </div>
 
                        <div class="para">
@@ -42,24 +42,32 @@
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+                                                               <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_medium">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+                                                               <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>

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 8e23818007fb71377bdcdf3361d747af356aeede..4acb48f27b82224f881f9574ffd72b9510f5d570 100644 (file)
--- 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,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:form id="form_register_page2">
+       <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}" />

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 eb9db2752d5dc5099bb6174a6a7608aeb0c11a29..8771db2366ebb50897df620e88b3c4c6be7bb57b 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
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:form id="form_register_single">
+       <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}" />
@@ -54,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}" />
@@ -66,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>