Continued a bit:

- removed admin_logout
- added missing h:outputText

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 2d89abb6aecfb0ac69f7dc82218b7b73c3cc57b3..664fffd54d3748531521cd4c750430d04055aac6 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,80 +2,80 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="privacy.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="2650" y="300" zoom="true"/>
-        <Node id="customer/register.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="1900" y="750" zoom="true"/>
-        <Node id="item_added.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="index.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="1650" y="900" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="customer/login.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="*" x="400" y="300" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="150" y="1650" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="user/login.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="2400" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1150" y="1200" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="basket.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="2150" y="600" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="terms.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1900" y="750" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="privacy.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="1350" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1650" y="900" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="1150" y="1200" zoom="true"/>
+        <Node id="customer/register.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="item_added.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="*" x="150" y="450" zoom="true"/>
+        <Node id="customer/login.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="2650" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="1400" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="2400" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="basket.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="exception.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="2150" y="450" zoom="true"/>
         <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="logout.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1400" y="1050" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="imprint.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="2150" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="2900" y="150" zoom="true"/>
         <Node id="admin/customer/admin_customer_list.xhtml" x="650" y="900" zoom="true"/>
         <Node id="guest/user/register.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="400" y="900" zoom="true"/>
         <Node id="admin/product/admin_product_list.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="900" y="1350" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="900" y="1200" zoom="true"/>
         <Node id="customer/empty_basket.xhtml" x="1400" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>

diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 35f6b88d7b564d8331393fc45ced2de9a9623ef7..c7edb29fee96201ca1c58d8e73067838344fdf49 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -7,7 +7,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>
@@ -25,7 +25,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_USER_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
                        </div>
 
                        <ul>
@@ -33,7 +33,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_CONTACT_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
                        </div>
 
                        <ul>
@@ -42,7 +42,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_COUNTRY_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_COUNTRY_TITLE}" />
                        </div>
 
                        <ul>
@@ -50,7 +50,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
                        </div>
 
                        <ul>
@@ -58,11 +58,11 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_LOGOUT_TITLE}
+                               <h:outputText value="#{msg.ADMIN_MENU_LOGOUT_TITLE}" />
                        </div>
 
                        <ul>
-                               <li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li>
                                <li><h:link title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" /></li>
                        </ul>
                </div>

diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index 4b00f1c5d99ec4de673ed61e4c60cebebca90b42..90c55dc9b608d26d146a93fd12ee25c93472b173 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_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>
@@ -22,7 +22,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.MENU_USER_TITLE}
+                               <h:outputText value="#{msg.MENU_USER_TITLE}" />
                        </div>
 
                        <ul>

diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index 88d293f02e1c48f120d86c0afe1478c8e983f7d7..2b75d5a24fa221a5b9e2c8ff40ed169d71386cf5 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>
@@ -22,7 +22,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.MENU_EDIT_PROFILE_TITLE}
+                               <h:outputText value="#{msg.MENU_EDIT_PROFILE_TITLE}" />
                        </div>
 
                        <ul>
@@ -32,17 +32,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.MENU_APPLICATIONS_TITLE}
-                       </div>
-
-                       <ul>
-                               <li>
-                                       <h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="login_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
-                               </li>
-                       </ul>
-
-                       <div class="menu_header">
-                               #{msg.MENU_LOGOUT_TITLE}
+                               <h:outputText value="#{msg.MENU_LOGOUT_TITLE}" />
                        </div>
 
                        <ul>

diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl
index d4a9658cdc71d0fe5b477f8c1730cc9774d20209..2bce29de87fc4362cf1463735e51f8e07d3c9d1c 100644 (file)
--- a/web/WEB-INF/templates/user/user_not_logged_in.tpl
+++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl
@@ -7,7 +7,7 @@
 
        <div class="table">
                <div class="table_header">
-                       #{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}
+                       <h:outputText value="#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}" />
                </div>
 
                <div class="para errors">

diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
index b013deae7ec762d17e80eb5cc58e772bf28ee8cb..4b3fec3c569d4e4adfe6ba841aa9675b54c93f7b 100644 (file)
--- a/web/WEB-INF/templates/user/userid_error.tpl
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -7,7 +7,7 @@
 
        <div class="table">
                <div class="table_header">
-                       #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
+                       <h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
                </div>
 
                <div class="para">