Please cherry-pick:

[jjobs-war.git] / web / guest / user / user_login.xhtml

diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index 5a3130ee4fc64b4386e953ccd49aa1dbf1e970cd..586f65e62e7abadd52e3599362ec731cea8969da 100644 (file)
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -4,7 +4,8 @@
                                xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                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:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
@@ -15,13 +16,15 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox id="error-user-login-disabled" message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <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}" />
+                               <p:link id="user_register" outcome="user_register" title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}" value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
@@ -29,10 +32,8 @@
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-                               <h:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+                               <p:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}" />
                        </h:panelGroup>
                </ui:fragment>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
        </ui:define>
 </ui:composition>