added admin_user_add.xhtml

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index e6032f0e9b57ddca01bb00053aaf88e652782053..0f0b3623344e748ca13ad709fba6bf611e84bb28 100644 (file)
--- 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 cf9beb39700f72f6c327c8595c959176529ffbd2..83d5e83ca76ed03bbf9f4d0c0d0e357e3103aa67 100644 (file)
--- 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 b596051b913bb6a934fcf39267f4f520f81f1e69..f944823e930d431345fc9a4322708095552dbbc3 100644 (file)
--- 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 27799100f3de460cc1200c81e5bb0e585a18f7fe..e4a0b39911d463a3b71c23359a3fd61cec43cdb6 100644 (file)
--- 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 (file)
index 0000000..dbfd0e0
--- /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>