Renamed ADDRESSBOOKS to APPLICATIONS as (job) applications are being handled here.

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 38d417beac31872abd0f2d0987c9fc61453c51be..50a0e4bd0098530a83e13713f8360906bb9a16b1 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,14 +2,12 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
         <Node id="login/login_edit_address.xhtml" x="150" y="750" zoom="true"/>
         <Node id="privacy.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="650" y="750" zoom="true"/>
         <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="900" y="300" zoom="true"/>
         <Node id="user/resend_link.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="650" y="150" zoom="true"/>
         <Node id="login/login_own_addressbooks.xhtml" x="400" y="450" zoom="true"/>
         <Node id="admin/admin_logout.xhtml" x="150" y="300" zoom="true"/>
         <Node id="terms.xhtml" x="1400" y="300" zoom="true"/>
@@ -18,16 +16,14 @@
         <Node id="index.xhtml" x="650" y="450" zoom="true"/>
         <Node id="user/register_done.xhtml" x="400" y="150" zoom="true"/>
         <Node id="user/user_profile.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="*" x="400" y="300" zoom="true"/>
         <Node id="user/show_addressbook.xhtml" x="900" y="150" zoom="true"/>
         <Node id="imprint.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="*" x="400" y="300" zoom="true"/>
         <Node id="user/login_error.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="900" y="450" zoom="true"/>
         <Node id="user/show_addressbook_entries.xhtml" x="1150" y="150" zoom="true"/>
         <Node id="admin/admin_index.xhtml" x="400" y="600" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="1400" y="150" zoom="true"/>
         <Node id="user/login.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="login/login_edit_user_data.xhtml" x="1150" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 8d13f8bc45bc558949b682a6225c7ef7dbe4c805..228d1aae462d55820d6f4162f8b6cec350486fd9 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -126,9 +126,10 @@ GUEST_ALREADY_USER_CONTINUE_LOGIN_2=einloggen.
 PAGE_TITLE_LOGIN_HOME=Willkommen zum Benutzerbereich
 CONTENT_TITLE_LOGIN_HOME=\u00dcbersicht Ihrer Bewerbungen:
 LINK_LOGIN_LOGOUT=Ausloggen
-LINK_LOGIN_OWN_ADDRESSBOOKS=Meine Adressb\u00fccher
+LINK_LOGIN_ALL_APPLICATIONS=Alle Bewerbungen
 LINK_LOGIN_LOGOUT_TITLE=Aus dem Benutzerbereich ausloggen
-LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Meine eigenen Adressb\u00fccher verwalten
+LINK_LOGIN_ALL_APPLICATIONS_TITLE=Meine Bewerbungen verwalten
+MENU_APPLICATIONS_TITLE=Bewerbungen
 MENU_ADDRESSBOOKS_TITLE=Adressb\u00fccher verwalten
 PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Meine Adressb\u00fccher verwalten
 CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Verwalten Sie Ihre eigenen Adressb\u00fccher:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 8553c94501cd7d8296c3655b05b82c00aea53c57..b6599648b0a947812cd6a321bcda6af4806a5d3b 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -126,10 +126,10 @@ GUEST_ALREADY_USER_CONTINUE_LOGIN_2=to login.
 PAGE_TITLE_LOGIN_HOME=Welcome to user area
 CONTENT_TITLE_LOGIN_HOME=Overview of your applications:
 LINK_LOGIN_LOGOUT=Logout
-LINK_LOGIN_OWN_ADDRESSBOOKS=My address books
+LINK_LOGIN_ALL_APPLICATIONS=My address books
 LINK_LOGIN_LOGOUT_TITLE=Logout from user area
-LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE=Manage my own address books
-MENU_ADDRESSBOOKS_TITLE=Manage address books
+LINK_LOGIN_ALL_APPLICATIONS_TITLE=Manage my own address books
+MENU_APPLICATIONS_TITLE=Manage address books
 PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage my address books
 CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage your own address books:
 LINK_USER_LIST=User list

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 71d40e2063250447ed1142db1f36020f8b495862..5125f2cd1641d2b6d999d9c2b869f0d3336328da 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -84,8 +84,8 @@
                        <to-view-id>/user/resend_link.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_own_addressbooks</from-outcome>
-                       <to-view-id>/login/login_own_addressbooks.xhtml</to-view-id>
+                       <from-outcome>login_all_applications</from-outcome>
+                       <to-view-id>/login/login_all_applications.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_list</from-outcome>

diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl
index e9ada82000b8d3f4bc2ca91d20985e8e5fb8b83f..8421aee98977721af3286015e2cf6340f21f060a 100644 (file)
--- a/web/WEB-INF/templates/login/login_menu.tpl
+++ b/web/WEB-INF/templates/login/login_menu.tpl
@@ -34,12 +34,12 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.MENU_ADDRESSBOOKS_TITLE}
+                               #{msg.MENU_APPLICATIONS_TITLE}
                        </div>
 
                        <ul>
                                <li>
-                                       <h:link title="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS_TITLE}" outcome="login_own_addressbooks" value="#{msg.LINK_LOGIN_OWN_ADDRESSBOOKS}" />
+                                       <h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="login_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
                                </li>
                        </ul>