Please cherry-pick:

- no recruiter here
- used h:outputText for wrapping text

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 5f01a74121c10b990c0ef875bde5005eb763496d..24b4d8bee9243cc8f2fed9ae36c2f98a909eb764 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">
-                               #{msg.ADMIN_MENU_MAIN_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
                        </div>
 
                        <ul>
@@ -26,7 +26,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_USER_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
                        </div>
 
                        <ul>
@@ -35,15 +35,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>
@@ -70,7 +62,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
                        </div>
 
                        <ul>
@@ -78,7 +70,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 3aaaebb5b4ac6912f2512a19fb63e0efab12007d..8453b9e3117ada439e627409013372dfe6117311 100644 (file)
--- 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_TO_BASKET_TITLE}" outcome="basket" value="#{msg.LINK_BASKET}" />
-                               </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 f8de86cc82ba7861eab42a19e35697b262a83256..881e30c151e0755e125bc3677895e7e3d4f0ebd2 100644 (file)
--- 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="PizzaUserPasswordValidator" /> //-->
                                                </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 b769753556c07a35db16f101dd3e8cc768e2a23e..7ec730a1fad8efbb94c5997f6bfe2ede54fede8b 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">
-                               #{msg.MENU_HOME_TITLE}
+                               <h:outputText value="#{msg.MENU_HOME_TITLE}" />
                        </div>
 
                        <ul>
@@ -54,7 +54,7 @@
                        </ui:fragment>
 
                        <div class="menu_header">
-                               #{msg.MENU_APPLICATIONS_TITLE}
+                               <h:outputText value="#{msg.MENU_APPLICATIONS_TITLE}" />
                        </div>
 
                        <ul>
@@ -64,7 +64,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.MENU_LOGOUT_TITLE}
+                               <h:outputText value="#{msg.MENU_LOGOUT_TITLE}" />
                        </div>
 
                        <ul>