From: Roland Häder <roland@mxchange.org>
Date: Tue, 25 Apr 2017 13:17:02 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=451398aed1ca448d79b5409209afec9346704809;p=addressbook-war.git

Please cherry-pick:
- no recruiter here
- used h:outputText for wrapping text

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 2b73e16d..e4fb5731 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -507,7 +507,7 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_1=Ja, ich habe die
 GUEST_AGREE_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit an.
 LINK_GUEST_TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen
 LINK_GUEST_PRIVACY_STATEMENTS=Datenschutzbestimmungen
-ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie die Kontaktdaten des Recruiters ein:
+ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie die Kontaktdaten des Benutzers ein:
 ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email-Adresse:
 ERROR_CONTACT_ID_NOT_FOUND=Fehler: Kontaktdaten nicht gefunden.
 GUEST_REGISTRATION_PAGE1_TITLE=Anmeldeseite 1
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 9c8be065..b865ba02 100644
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -8,7 +8,7 @@
 	<div class="menu_outer">
 		<div class="menu">
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_MAIN_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
 			</div>
 
 			<ul>
@@ -16,7 +16,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_USER_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
 			</div>
 
 			<ul>
@@ -25,15 +25,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_RECRUITER_TITLE}
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_RECRUITER_TITLE}" outcome="admin_list_recruiter" value="#{msg.LINK_ADMIN_LIST_RECRUITER}" /></li>
-			</ul>
-
-			<div class="menu_header">
-				#{msg.ADMIN_MENU_CONTACT_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
 			</div>
 
 			<ul>
@@ -60,7 +52,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
 			</div>
 
 			<ul>
@@ -68,7 +60,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_LOGOUT_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_LOGOUT_TITLE}" />
 			</div>
 
 			<ul>
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index a2ab5b59..8453b9e3 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="menu_outer">
-		<div class="menu">
+		<h:outputText styleClass="menu">
 			<div class="menu_header">
 				<h:outputText value="#{msg.MENU_HOME_TITLE}" />
 			</div>
@@ -17,16 +17,6 @@
 				</li>
 			</ul>
 
-			<div class="menu_header">
-				<h:outputText value="#{msg.MENU_RECRUIITER_TITLE}" />
-			</div>
-
-			<ul>
-				<li>
-					<h:link title="#{msg.LINK_RERUITER_LOGIN_TITLE}" outcome="recruiter_login" value="#{msg.LINK_RERUITER_LOGIN}" />
-				</li>
-			</ul>
-
 			<div class="menu_header">
 				<h:outputText value="#{msg.MENU_USER_TITLE}" />
 			</div>
@@ -56,6 +46,6 @@
 					</li>
 				</ui:fragment>
 			</ul>
-		</div>
+		</h:outputText>
 	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 15dda796..1f16134b 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -18,7 +18,7 @@
 
 					<div class="table_right">
 						<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-							<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
+							<!-- <f:validator for="currentPassword" validatorId="AddressbookUserPasswordValidator" /> //-->
 						</h:inputSecret>
 					</div>
 
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index e37eafa7..2466876b 100644
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -8,7 +8,7 @@
 	<div class="menu_outer">
 		<div class="menu">
 			<div class="menu_header">
-				#{msg.MENU_HOME_TITLE}
+				<h:outputText value="#{msg.MENU_HOME_TITLE}" />
 			</div>
 
 			<ul>