Moved to own (user) sub-folder to have recruiter's own templates

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 3ebaa15d1406788286c498d0608b9132f323d60a..13a5475dad5ad5210e56b43ec726195512563939 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -30,9 +30,9 @@ BUTTON_RESET_FORM=Formular zur\u00fccksetzen
 ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern
 ADMIN_BUTTON_DELETE_ENTRIES=L\u00f6schen
 PLEASE_FILL_ALL_FIELDS=Bitte alle Felder ausf\u00fcllen:
-GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ein:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein.
-GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
+GUEST_ENTER_USER_LOGIN_DATA_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ein:
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein.
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
 ENTER_PASSWORD=Passwort:
 LINK_GUEST_HOME_TITLE=Eingangsseite aufrufen
 LINK_GUEST_HOME=Home

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index b2161fbc3fed35612795833e765e8a21785247f3..5829e49d08388ca4e59ee15869de4f1f6889baa1 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -30,9 +30,9 @@ BUTTON_RESET_FORM=Reset form
 ADMIN_BUTTON_EDIT_ENTRIES=Edit
 ADMIN_BUTTON_DELETE_ENTRIES=Delete
 PLEASE_FILL_ALL_FIELDS=Please fill out all fields:
-GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your agent name and password:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned agent name and password.
-GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data:
+GUEST_ENTER_USER_LOGIN_DATA_TITLE=Please enter your user name and password:
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned user name and password.
+GUEST_ENTER_USER_LOGIN_DATA_LEGEND=Please enter your login data:
 ENTER_PASSWORD=Password:
 LINK_GUEST_HOME_TITLE=Go to home page
 LINK_GUEST_HOME=Home

diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl
deleted file mode 100644 (file)
index 03ca598..0000000
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       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_LOGIN_DATA_TITLE}
-                               </div>
-
-                               <fieldset id="login_data">
-                                       <legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>
-
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h: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>
-                                       </div>
-
-                                       <div class="clear"></div>
-
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h: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>
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </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>
-                       </div>
-               </h:form>
-       </div>
-</ui:composition>

diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
new file mode 100644 (file)
index 0000000..e34ebe3
--- /dev/null
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       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}
+                               </div>
+
+                               <fieldset id="login_data">
+                                       <legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">#{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}" />
+                                               </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>
+                                       </div>
+
+                                       <div class="clear"></div>
+
+                                       <div class="table_row">
+                                               <div class="table_left">
+                                                       <h: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>
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </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>
+                       </div>
+               </h:form>
+       </div>
+</ui:composition>

diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
new file mode 100644 (file)
index 0000000..e52d279
--- /dev/null
+++ b/web/guest/user/login.xhtml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       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"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LOGIN}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para">
+                               <!-- TODO Internatialize this somehow //-->
+                               Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
+                       </div>
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
+                       </div>
+
+                       <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:define>
+       </ui:composition>
+</html>