From 014a9b81ba3314d0f1229a926832a39e35e98f20 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 9 Apr 2016 14:09:13 +0200
Subject: [PATCH] added admin_user_add.xhtml
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 nbproject/faces-config.NavData                | 141 +++++-------------
 .../localization/bundle_de_DE.properties      |   4 +
 .../localization/bundle_en_US.properties      |   2 +
 web/WEB-INF/faces-config.xml                  |  28 +---
 web/admin/admin_user_add.xhtml                |  20 +++
 5 files changed, 72 insertions(+), 123 deletions(-)
 create mode 100644 web/admin/admin_user_add.xhtml

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index e6032f0e..0f0b3623 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -1,109 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scene Scope="Project" version="2">
-    <Scope Scope="Faces Configuration Only">
-        <Node id="login/login_shared_addressbooks.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/admin_user_delete.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="privacy.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="user/register.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/admin_user_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="terms.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/admin_user_edit.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="logout.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/admin_user_unlock.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="*" x="650" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="user/login.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="150" y="450" zoom="true"/>
-    </Scope>
+    <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="login/login_shared_addressbooks.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/admin_user_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/index.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="user/register.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/admin_user_list.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="terms.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/admin_user_edit.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/admin_user_unlock.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="*" x="150" y="900" zoom="true"/>
-        <Node id="imprint.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1150" y="450" zoom="true"/>
-    </Scope>
-    <Scope Scope="All Faces Configurations">
-        <Node id="login/login_shared_addressbooks.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/admin_user_delete.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/index.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/register.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/admin_user_list.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/admin_user_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="index.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/admin_user_delete.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="privacy.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="basket.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="user/register.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/admin_user_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="terms.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/admin_user_edit.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="index.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="errorHandler.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="900" y="750" zoom="true"/>
         <Node id="admin/admin_user_unlock.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="*" x="400" y="600" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="imprint.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/login.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="*" x="150" y="150" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/login.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="300" zoom="true"/>
     </Scope>
+    <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index cf9beb39..83d5e83c 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -346,3 +346,7 @@ CONTENT_TITLE_ADMIN_EDIT_USER=Aendern von Benutzeraccounts:
 PAGE_TITLE_ADMIN_UNLOCK_USER=Ent-/Sperren von Benutzeraccounts
 CONTENT_TITLE_ADMIN_UNLOCK_USER=Ent-/Sperren von Benutzeraccounts:
 ADMIN_MENU_USER_TITLE=Benutzerverwaltung
+#CONTENT_TITLE_ADMIN_ADD_USER
+PAGE_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen
+#CONTENT_TITLE_ADMIN_ADD_USER
+CONTENT_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index b596051b..f944823e 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -313,3 +313,5 @@ CONTENT_TITLE_ADMIN_EDIT_USER=Edit user accounts:
 PAGE_TITLE_ADMIN_UNLOCK_USER=Un-/Lock user accounts
 CONTENT_TITLE_ADMIN_UNLOCK_USER=Un-/Lock user accounts:
 ADMIN_MENU_USER_TITLE=User management
+PAGE_TITLE_ADMIN_ADD_USER=Add new user account
+CONTENT_TITLE_ADMIN_ADD_USER=Add new user account:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 27799100..e4a0b399 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -92,28 +92,12 @@
 			<to-view-id>/login/login_own_addressbooks.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>login_other_addressbooks</from-outcome>
-			<to-view-id>/login/login_other_addressbooks.xhtml</to-view-id>
+			<from-outcome>basket</from-outcome>
+			<to-view-id>/basket.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>user_list</from-outcome>
-			<to-view-id>/user/user_list.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>admin_logout</from-outcome>
-			<to-view-id>/admin/admin_logout.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>login_edit_user_data</from-outcome>
-			<to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>login_shared_addressbooks</from-outcome>
-			<to-view-id>/login/login_shared_addressbooks.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>user_profile</from-outcome>
-			<to-view-id>/user/user_profile.xhtml</to-view-id>
+			<from-outcome>item_not_changed</from-outcome>
+			<to-view-id>/errorHandler.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
@@ -131,6 +115,10 @@
 			<from-outcome>admin_unlock_user</from-outcome>
 			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_add_user</from-outcome>
+			<to-view-id>/admin/admin_user_add.xhtml</to-view-id>
+		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/user/login.xhtml</from-view-id>
diff --git a/web/admin/admin_user_add.xhtml b/web/admin/admin_user_add.xhtml
new file mode 100644
index 00000000..dbfd0e00
--- /dev/null
+++ b/web/admin/admin_user_add.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/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_ADD_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_ADD_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
-- 
2.39.5