From: Roland Häder <roland@mxchange.org>
Date: Tue, 25 Apr 2017 11:21:53 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a5a6521b8a0ab71fa864d4fd84c46e065454d2b3;p=jjobs-war.git

Please cherry-pick:
- WARNING: You have to update project name, maybe one day this will be moved out
  to properties file?
- updated templates as they are long out-dated
- added missing templates, a lot new has been added

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

diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index b865ba02..9c8be065 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">
-				<h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
+				#{msg.ADMIN_MENU_MAIN_TITLE}
 			</div>
 
 			<ul>
@@ -16,7 +16,7 @@
 			</ul>
 
 			<div class="menu_header">
-				<h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
+				#{msg.ADMIN_MENU_USER_TITLE}
 			</div>
 
 			<ul>
@@ -25,7 +25,15 @@
 			</ul>
 
 			<div class="menu_header">
-				<h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
+				#{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}
 			</div>
 
 			<ul>
@@ -52,7 +60,7 @@
 			</ul>
 
 			<div class="menu_header">
-				<h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
+				#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
 			</div>
 
 			<ul>
@@ -60,7 +68,7 @@
 			</ul>
 
 			<div class="menu_header">
-				<h:outputText value="#{msg.ADMIN_MENU_LOGOUT_TITLE}" />
+				#{msg.ADMIN_MENU_LOGOUT_TITLE}
 			</div>
 
 			<ul>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index 5660bc07..f7acb1ce 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -73,9 +73,7 @@
 
 				<div class="para notice">
 					<ul>
-						<li>
-							<h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" />
-						</li>
+						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
 
 						<li>
 							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 1e02c8c9..6940fd8b 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -304,9 +304,9 @@
 				<div class="table_row">
 					<div class="para notice">
 						<ul>
-							<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
-							<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}" /></li>
-							<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
+							<li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}</li>
+							<li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}</li>
+							<li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}</li>
 						</ul>
 					</div>
 				</div>
diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
index 07c5b1e4..f513f187 100644
--- a/web/WEB-INF/templates/generic/message_box.tpl
+++ b/web/WEB-INF/templates/generic/message_box.tpl
@@ -8,7 +8,7 @@
 
 	<div class="message_box">
 		<div class="message_header">
-			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+			#{msg.MESSAGE_BOX_TITLE}
 		</div>
 
 		<ui:fragment rendered="#{not empty message}">
@@ -25,9 +25,9 @@
 			</ui:fragment>
 		</ui:fragment>
 
-		<ui:fragment rendered="#{empty message}">
+		<ui:fragment id="output_message" rendered="#{empty message}">
 			<div class="errors para">
-				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+				#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}
 			</div>
 		</ui:fragment>
 	</div>
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 5fffa6f7..e06950f2 100644
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -34,7 +34,7 @@
 				</li>
 			</ui:fragment>
 
-			<li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
+			<li class="footer_copyright">Copyright (c) 2016 Galdora e.K.</li>
 		</ul>
 	</div>
 
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index 13cd78a3..a2ab5b59 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -15,9 +15,15 @@
 				<li>
 					<h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
 				</li>
+			</ul>
 
+			<div class="menu_header">
+				<h:outputText value="#{msg.MENU_RECRUIITER_TITLE}" />
+			</div>
+
+			<ul>
 				<li>
-					<h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+					<h:link title="#{msg.LINK_RERUITER_LOGIN_TITLE}" outcome="recruiter_login" value="#{msg.LINK_RERUITER_LOGIN}" />
 				</li>
 			</ul>
 
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index fe656323..a3807770 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -23,8 +23,7 @@
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
 					<h:outputText value="&#160;" />
 					<h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
-					<h:outputText value="&#160;" />
-					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
+					#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}
 				</div>
 
 				<div class="clear"></div>
@@ -46,8 +45,7 @@
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
 					<h:outputText value="&#160;" />
 					<h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
-					<h:outputText value="&#160;" />
-					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
+					#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}
 				</div>
 
 				<div class="clear"></div>
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 12ea9db4..f31190a0 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -13,7 +13,6 @@
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 			<ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
 		</ui:fragment>
-
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
 				<ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index 138ee1f6..f5299b62 100644
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -29,7 +29,7 @@
 				</li>
 			</ui:fragment>
 
-			<li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
+			<li class="footer_copyright">Copyright (c) 2016 Galdora e.K.</li>
 		</ul>
 	</div>
 
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index de026340..ef9d1ae4 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">
-				<h:outputText value="#{msg.MENU_HOME_TITLE}" />
+				#{msg.MENU_HOME_TITLE}
 			</div>
 
 			<ul>
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
index 0d45fc32..f5431636 100644
--- a/web/WEB-INF/templates/user/userid_error.tpl
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -7,7 +7,7 @@
 
 	<h:panelGroup styleClass="table" layout="block">
 		<div class="table_header">
-			<h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
+			#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
 		</div>
 
 		<div class="para">