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 b2902e221eea571d554839004e75ef2227fdedcd..b5a9507731d6f6327b8ef49fda8339aa4ee1bc57 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 eb41d8e8ed17f38f1c23b52cd31b62138a275496..2a06f495f46e5287375aeebace35eaf714549542 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 user name and password:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned user 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/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index 682b9409aacbf652c76b59809f283f5715a3537f..4a5919f1eb21c2199f316b9be518f9ebf374aac7 100644 (file)
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<ui:composition\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:f="http://java.sun.com/jsf/core"\r
-       xmlns:h="http://java.sun.com/jsf/html"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
-\r
-       <ui:fragment rendered="#{not empty targetController}">\r
-               <h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}">\r
-                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />\r
-                       <f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />\r
-               </h:selectOneMenu>\r
-       </ui:fragment>\r
-\r
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />\r
-</ui:composition>\r
+<?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">
+
+       <ui:fragment rendered="#{not empty targetController}">
+               <h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}">
+                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                       <f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
+               </h:selectOneMenu>
+       </ui:fragment>
+
+       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>

diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index cf46430be0eacfed424ebad25f41979fd3c87e55..14515170c01c4c125cb877040722f4e98b383049 100644 (file)
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<ui:composition\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:f="http://java.sun.com/jsf/core"\r
-       xmlns:h="http://java.sun.com/jsf/html"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
-\r
-       <ui:fragment rendered="#{not empty targetController}">\r
-               <h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">\r
-                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />\r
-                       <f:selectItems value="#{mobileController.allMobileProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />\r
-               </h:selectOneMenu>\r
-\r
-               <h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">\r
-                       <f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />\r
-               </h:inputText>\r
-       </ui:fragment>\r
-\r
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />\r
-</ui:composition>\r
+<?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">
+
+       <ui:fragment rendered="#{not empty targetController}">
+               <h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
+                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                       <f:selectItems value="#{mobileController.allMobileProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
+               </h:selectOneMenu>
+
+               <h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
+                       <f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
+               </h:inputText>
+       </ui:fragment>
+
+       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>

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 5a5ca1b..0000000
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<ui:composition\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:f="http://java.sun.com/jsf/core"\r
-       xmlns:h="http://java.sun.com/jsf/html"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
-       <div id="user_login_content">\r
-               <h:form id="login_form">\r
-                       <div class="table">\r
-                               <div class="table_header">\r
-                                       #{msg.GUEST_ENTER_LOGIN_DATA_TITLE}\r
-                               </div>\r
-\r
-                               <fieldset id="login_data">\r
-                                       <legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>\r
-\r
-                                       <div class="table_row">\r
-                                               <div class="table_left">\r
-                                                       <h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />\r
-                                               </div>\r
-\r
-                                               <div class="table_right">\r
-                                                       <h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />\r
-                                               </div>\r
-                                       </div>\r
-\r
-                                       <div class="clear"></div>\r
-\r
-                                       <div class="table_row">\r
-                                               <div class="table_left">\r
-                                                       <h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />\r
-                                               </div>\r
-\r
-                                               <div class="table_right">\r
-                                                       <h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />\r
-                                               </div>\r
-                                       </div>\r
-\r
-                                       <div class="clear"></div>\r
-                               </fieldset>\r
-\r
-                               <div class="table_footer">\r
-                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />\r
-                                       <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />\r
-                               </div>\r
-                       </div>\r
-               </h:form>\r
-       </div>\r
-</ui:composition>\r

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..fb8b6d0
--- /dev/null
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -0,0 +1,49 @@
+<?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
index 7c8739759a7d38b958a50a406f32514bd14d6084..15006b004be92461791460ed0d762e79439eada2 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -22,7 +22,7 @@
                        </div>
 
                        <div class="para">
-                               <ui:include id="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
+                               <ui:include id="login_form" src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
                        </div>
 
                        <div class="para">