From 6bd4606f00ad1b35a873dc18dc7836c41f396bb8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 5 May 2016 16:04:57 +0200
Subject: [PATCH] re-organized pages: - moved /user/ -> /guest/user/ as these
 are pages for current guest but later users - moved /login/ -> /user/ as
 these are pages for current (logged-in) users

---
 nbproject/faces-config.NavData                | 11 ++--
 web/WEB-INF/faces-config.xml                  |  4 +-
 web/{ => guest}/user/user_list.xhtml          |  0
 web/{ => guest}/user/user_profile.xhtml       |  0
 .../login_add_addressbook.xhtml               |  0
 .../login_change_email_address.xhtml          |  0
 .../login_change_password.xhtml               |  0
 .../login_change_personal_data.xhtml          |  0
 .../login_contact_data_saved.xhtml            |  0
 web/{login => user}/login_data_saved.xhtml    |  0
 .../login_edit_user_data.xhtml                |  0
 web/{login => user}/login_index.xhtml         |  0
 .../login_own_addressbooks.xhtml              |  0
 .../login_user_data_saved.xhtml               |  0
 web/user/show_addressbook.xhtml               | 56 -------------------
 15 files changed, 7 insertions(+), 64 deletions(-)
 rename web/{ => guest}/user/user_list.xhtml (100%)
 rename web/{ => guest}/user/user_profile.xhtml (100%)
 rename web/{login => user}/login_add_addressbook.xhtml (100%)
 rename web/{login => user}/login_change_email_address.xhtml (100%)
 rename web/{login => user}/login_change_password.xhtml (100%)
 rename web/{login => user}/login_change_personal_data.xhtml (100%)
 rename web/{login => user}/login_contact_data_saved.xhtml (100%)
 rename web/{login => user}/login_data_saved.xhtml (100%)
 rename web/{login => user}/login_edit_user_data.xhtml (100%)
 rename web/{login => user}/login_index.xhtml (100%)
 rename web/{login => user}/login_own_addressbooks.xhtml (100%)
 rename web/{login => user}/login_user_data_saved.xhtml (100%)
 delete mode 100644 web/user/show_addressbook.xhtml

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index b63f5899..48acfd5e 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -18,34 +18,33 @@
         <Node id="customer/lost_passwd.xhtml" x="400" y="900" zoom="true"/>
         <Node id="index.xhtml" x="150" y="750" zoom="true"/>
         <Node id="customer/checkout_done.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="*" x="900" y="750" zoom="true"/>
         <Node id="customer/login.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="*" x="900" y="750" zoom="true"/>
         <Node id="admin/customer/admin_customer_unlock.xhtml" x="150" y="1050" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2150" y="150" zoom="true"/>
         <Node id="admin/product/admin_product_edit.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="450" zoom="true"/>
         <Node id="admin/country/admin_country_list.xhtml" x="650" y="750" zoom="true"/>
         <Node id="login/login_contact_data_saved.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="450" zoom="true"/>
         <Node id="admin/customer/admin_customer_edit.xhtml" x="1400" y="450" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="150" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2150" y="300" zoom="true"/>
         <Node id="customer/checkout.xhtml" x="1650" y="450" zoom="true"/>
         <Node id="admin/product/admin_product_delete.xhtml" x="650" y="900" zoom="true"/>
         <Node id="basket.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1150" y="750" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1150" y="300" zoom="true"/>
         <Node id="exception.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1150" y="750" zoom="true"/>
         <Node id="admin/category/admin_category_delete.xhtml" x="1900" y="300" zoom="true"/>
         <Node id="admin/user/admin_user_edit.xhtml" x="1400" y="300" zoom="true"/>
         <Node id="terms.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="150" zoom="true"/>
         <Node id="admin/contact/admin_contact_edit.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="150" zoom="true"/>
         <Node id="admin/user/admin_user_list.xhtml" x="150" y="900" zoom="true"/>
         <Node id="admin/country/admin_country_delete.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="1150" y="600" zoom="true"/>
         <Node id="admin/category/admin_category_edit.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="450" zoom="true"/>
         <Node id="admin/country/admin_country_edit.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="logout.xhtml" x="400" y="450" zoom="true"/>
         <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="1200" zoom="true"/>
         <Node id="imprint.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1150" y="900" zoom="true"/>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 13317a99..a0e81346 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -93,7 +93,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_index</from-outcome>
-			<to-view-id>/login/index.xhtml</to-view-id>
+			<to-view-id>/user/index.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -139,7 +139,7 @@
 		<from-view-id>/admin/product/admin_product_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>contact_data_saved</from-outcome>
-			<to-view-id>/login/login_contact_data_saved.xhtml</to-view-id>
+			<to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_product</from-outcome>
diff --git a/web/user/user_list.xhtml b/web/guest/user/user_list.xhtml
similarity index 100%
rename from web/user/user_list.xhtml
rename to web/guest/user/user_list.xhtml
diff --git a/web/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
similarity index 100%
rename from web/user/user_profile.xhtml
rename to web/guest/user/user_profile.xhtml
diff --git a/web/login/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
similarity index 100%
rename from web/login/login_add_addressbook.xhtml
rename to web/user/login_add_addressbook.xhtml
diff --git a/web/login/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
similarity index 100%
rename from web/login/login_change_email_address.xhtml
rename to web/user/login_change_email_address.xhtml
diff --git a/web/login/login_change_password.xhtml b/web/user/login_change_password.xhtml
similarity index 100%
rename from web/login/login_change_password.xhtml
rename to web/user/login_change_password.xhtml
diff --git a/web/login/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
similarity index 100%
rename from web/login/login_change_personal_data.xhtml
rename to web/user/login_change_personal_data.xhtml
diff --git a/web/login/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
similarity index 100%
rename from web/login/login_contact_data_saved.xhtml
rename to web/user/login_contact_data_saved.xhtml
diff --git a/web/login/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
similarity index 100%
rename from web/login/login_data_saved.xhtml
rename to web/user/login_data_saved.xhtml
diff --git a/web/login/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
similarity index 100%
rename from web/login/login_edit_user_data.xhtml
rename to web/user/login_edit_user_data.xhtml
diff --git a/web/login/login_index.xhtml b/web/user/login_index.xhtml
similarity index 100%
rename from web/login/login_index.xhtml
rename to web/user/login_index.xhtml
diff --git a/web/login/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
similarity index 100%
rename from web/login/login_own_addressbooks.xhtml
rename to web/user/login_own_addressbooks.xhtml
diff --git a/web/login/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
similarity index 100%
rename from web/login/login_user_data_saved.xhtml
rename to web/user/login_user_data_saved.xhtml
diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml
deleted file mode 100644
index 3b02ff9d..00000000
--- a/web/user/show_addressbook.xhtml
+++ /dev/null
@@ -1,56 +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
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core">
-
-	<f:metadata>
-		<f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
-			<f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-			<f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
-		</f:viewParam>
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
-				<f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
-
-				<h:outputLabel for="addressbookName" class="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
-				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
-
-				<h:outputLabel for="userProfileLink" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
-				<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-					<ui:param name="user" value="#{addressbookController.addressbookUser}" />
-				</ui:include>
-
-				<h:outputLabel for="addressbookCreated" class="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
-				<h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-					<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-				</h:outputFormat>
-
-				<h:outputLabel for="addressbookStatus" class="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
-				<h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
-
-				<f:facet name="footer">
-					<h:outputText id="ownProfileInvible" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
-					<h:outputText id="ownProfileInvible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />
-
-					<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">
-						<h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />
-					</ui:fragment>
-				</f:facet>
-			</h:panelGrid>
-		</ui:define>
-	</ui:composition>
-</html>
-- 
2.39.5