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 b865ba022208e5e19d6b8e2870e857a4c5941030..9c8be065bd2ffe1b80170d1e2ec59b87613c1a13 100644 (file)
--- 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 5660bc07dae91b9c98676ae1141083b2faade378..f7acb1ce2792b7000ce5a8234315b4ecc142dd92 100644 (file)
--- 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 1e02c8c9b5339e178b471cb09c553ceda00ebe82..6940fd8b0eda3158dd793782597008526bab125d 100644 (file)
--- 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 07c5b1e412f980807fd594b58382b46e143277a8..f513f187d327bacb44abf73dc47b3e7d0bdd8918 100644 (file)
--- 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 5fffa6f7bc22597a555a2461104b6a218db6b096..e06950f226bec7cd1f9b9e11d27a4114182adbe8 100644 (file)
--- 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 13cd78a31c27bb993b5a353f892ec711a8e15559..a2ab5b5953df4b8fa5d88dab4a3a57cdced1e2e7 100644 (file)
--- 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 fe6563235856281a4dd157715bbc2831ffd18b08..a38077708b25d2ff347b3102d3567ee211ab4afc 100644 (file)
--- 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 12ea9db41cedcdcf951cf97f8fb8ea10409eacfe..f31190a007257d99b04920c5d068d265f1ef0c1b 100644 (file)
--- 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 138ee1f6a28942ba2845f4849551f5dd3fa535f9..f5299b623000614f655fbfe005552cd72942b74b 100644 (file)
--- 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 de026340a693d238c9b010e13c0824f8680532fd..ef9d1ae4c83b9f15363d95a882159bcf6b619681 100644 (file)
--- 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 0d45fc32c7b720963fad2d6f203833974a40ff92..f54316367bb8b634fab7d8e026b2a59a3befea2b 100644 (file)
--- 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">