From: Roland Haeder <roland@mxchange.org>
Date: Fri, 8 Apr 2016 11:19:04 +0000 (+0200)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ec6c521e8391ab978ded9d472753655a8b724836;p=addressbook-war.git

Continued a bit:
- renamed bye.xhtml -> logout.xhtml

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 63d1cc11..d693e4d9 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only">
-        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
         <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="450" zoom="true"/>
         <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
         <Node id="*" x="1150" y="150" zoom="true"/>
         <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
@@ -17,38 +17,37 @@
     </Scope>
     <Scope Scope="Project">
         <Node id="login/login_shared_addressbooks.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="300" zoom="true"/>
         <Node id="login/login_change_password.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="150" y="300" zoom="true"/>
         <Node id="login/login_start_sharing_addressbook.xhtml" x="900" y="450" zoom="true"/>
         <Node id="user/register.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="900" y="600" zoom="true"/>
         <Node id="user/resend_link.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="900" y="600" zoom="true"/>
         <Node id="login/login_add_addressbook.xhtml" x="1900" y="150" zoom="true"/>
         <Node id="login/login_own_addressbooks.xhtml" x="150" y="150" zoom="true"/>
         <Node id="admin/admin_logout.xhtml" x="150" y="900" zoom="true"/>
         <Node id="terms.xhtml" x="900" y="150" zoom="true"/>
         <Node id="user/user_list.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="bye.xhtml" x="650" y="750" zoom="true"/>
         <Node id="index.xhtml" x="650" y="450" zoom="true"/>
         <Node id="user/register_done.xhtml" x="1400" y="300" zoom="true"/>
         <Node id="login/login_change_personal_data.xhtml" x="150" y="600" zoom="true"/>
         <Node id="user/user_profile.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="*" x="650" y="150" zoom="true"/>
         <Node id="imprint.xhtml" x="1150" y="150" zoom="true"/>
         <Node id="user/show_addressbook.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="*" x="650" y="150" zoom="true"/>
         <Node id="user/login_error.xhtml" x="1150" y="450" zoom="true"/>
         <Node id="login/login_other_addressbooks.xhtml" x="650" y="600" zoom="true"/>
         <Node id="user/show_addressbook_entries.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="admin/admin_index.xhtml" x="650" y="300" zoom="true"/>
         <Node id="login/login_change_email_address.xhtml" x="150" y="1050" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/login.xhtml" x="400" y="450" zoom="true"/>
         <Node id="login/login_list_sharing_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="400" y="450" zoom="true"/>
         <Node id="login/login_edit_user_data.xhtml" x="150" y="750" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations">
-        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
         <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="450" zoom="true"/>
         <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
         <Node id="*" x="1150" y="150" zoom="true"/>
         <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 60dd8560..27312254 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -73,7 +73,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>logout</from-outcome>
-			<to-view-id>/bye.xhtml</to-view-id>
+			<to-view-id>/logout.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_index</from-outcome>
diff --git a/web/bye.xhtml b/web/bye.xhtml
deleted file mode 100644
index e8f4fa13..00000000
--- a/web/bye.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://java.sun.com/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_FOO}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/logout.xhtml b/web/logout.xhtml
new file mode 100644
index 00000000..e8f4fa13
--- /dev/null
+++ b/web/logout.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_INDEX_FOO}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>