From: Roland Häder <roland@mxchange.org>
Date: Tue, 31 May 2016 13:55:18 +0000 (+0200)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d8f1848f54a6bca8b200cae165f3ed5b1789703e;p=jjobs-war.git

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 e492c25d..afc94824 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,67 +2,67 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="400" y="1200" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="index.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="index.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="400" y="150" zoom="true"/>
         <Node id="*" x="1400" y="600" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="guest/user/login_error.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="terms.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="logout.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="user/login/login_data_saved.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="exception.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="imprint.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/login/login_data_saved.xhtml" x="650" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 58c0af52..4739537d 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -173,14 +173,6 @@
 			<from-outcome>user_add_addressbook</from-outcome>
 			<to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
 		</navigation-case>
-		<navigation-case>
-			<from-outcome>user_show_addressbook</from-outcome>
-			<to-view-id>/guest/user/show_addressbook.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>show_addressbook_entries</from-outcome>
-			<to-view-id>/guest/user/show_addressbook_entries.xhtml</to-view-id>
-		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index c9de554d..561a516b 100644
--- 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>
@@ -15,7 +15,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_USER_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
 			</div>
 
 			<ul>
@@ -23,7 +23,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_CONTACT_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
 			</div>
 
 			<ul>
@@ -32,7 +32,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_COUNTRY_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_COUNTRY_TITLE}" />
 			</div>
 
 			<ul>
@@ -40,7 +40,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
+				<h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
 			</div>
 
 			<ul>
@@ -48,11 +48,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 be83b4a1..716799b6 100644
--- 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 9b153dda..f8961247 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>
@@ -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,7 +32,7 @@
 			</ul>
 
 			<div class="menu_header">
-				#{msg.MENU_APPLICATIONS_TITLE}
+				<h:outputText value="#{msg.MENU_APPLICATIONS_TITLE}" />
 			</div>
 
 			<ul>
@@ -42,7 +42,7 @@
 			</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 d4a9658c..2bce29de 100644
--- 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 b013deae..4b3fec3c 100644
--- 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">