Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / guest / user / guest_login_form.tpl

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 fb8b6d00a244e43a9b8fdbfc2e1a5d040142671d..01c94d24cd96f97750c35e44ade70e98150ab506 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -3,47 +3,59 @@
        xmlns="http://www.w3.org/1999/xhtml"
        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="login_form">
-                       <div class="table">
-                               <div class="table_header">
-                                       #{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui">
+
+       <h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+               <h:form id="form_user_login">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table-header">
+                                       <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
                                </div>
 
-                               <fieldset id="login_data">
-                                       <legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}</legend>
+                               <fieldset class="fieldset">
+                                       <legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
+                                       </legend>
 
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
+                                                       <p:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
                                                </div>
 
-                                               <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 class="table-right">
+                                                       <p:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
-                                       </div>
+                                       </h:panelGroup>
 
-                                       <div class="clear"></div>
+                                       <h:panelGroup styleClass="error-container" layout="block">
+                                               <p:message for="userName" />
+                                       </h:panelGroup>
 
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
+                                                       <p:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
                                                </div>
 
-                                               <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 class="table-right">
+                                                       <p:inputText type="secret" styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
-                                       </div>
+                                       </h:panelGroup>
 
-                                       <div class="clear"></div>
+                                       <h:panelGroup styleClass="error-container" layout="block">
+                                               <p:message for="userPassword" />
+                                       </h:panelGroup>
                                </fieldset>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
+                               <div class="table-footer">
+                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
                                </div>
-                       </div>
+                       </h:panelGroup>
                </h:form>
-       </div>
+
+               <h:panelGroup styleClass="error-container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
+                       <h:outputText styleClass="alert-danger" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
+               </h:panelGroup>
+       </h:panelGroup>
 </ui:composition>