]> git.mxchange.org Git - addressbook-war.git/commitdiff
Renamed login/login_show_adressbook* -> user/show_addressbook* and maybe all language...
authorRoland Haeder <roland@mxchange.org>
Fri, 16 Oct 2015 12:53:20 +0000 (14:53 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 16 Oct 2015 12:57:37 +0000 (14:57 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

nbproject/faces-config.NavData
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/login/login_own_addressbooks.xhtml
web/login/login_shared_addressbooks.xhtml
web/login/login_show_addressbook.xhtml [deleted file]
web/login/login_show_addressbook_entries.xhtml [deleted file]
web/user/show_addressbook.xhtml [new file with mode: 0644]
web/user/show_addressbook_entries.xhtml [new file with mode: 0644]

index 574d022620f7723e2198a18aca500540a31ee457..f0eec34e75a2dc856303f21d405e3f7ca1cc4f85 100644 (file)
@@ -16,7 +16,7 @@
                <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
        </Scope>
        <Scope Scope="Project">
-               <Node id="login/login_show_addressbook.xhtml" x="1650" y="150" zoom="true"/>
+               <Node id="user/show_addressbook.xhtml" x="1650" y="150" zoom="true"/>
                <Node id="user/login.xhtml" x="900" y="150" zoom="true"/>
                <Node id="login/login_other_addressbooks.xhtml" x="650" y="450" zoom="true"/>
                <Node id="user/login_error.xhtml" x="1400" y="150" zoom="true"/>
@@ -36,7 +36,7 @@
                <Node id="user/register_done.xhtml" x="1150" y="300" zoom="true"/>
                <Node id="bye.xhtml" x="650" y="300" zoom="true"/>
                <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
-               <Node id="login/login_show_addressbook_entries.xhtml" x="650" y="750" zoom="true"/>
+               <Node id="user/show_addressbook_entries.xhtml" x="650" y="750" zoom="true"/>
                <Node id="index.xhtml" x="650" y="600" zoom="true"/>
                <Node id="imprint.xhtml" x="900" y="450" zoom="true"/>
                <Node id="login/login_index.xhtml" x="150" y="750" zoom="true"/>
index c9ed444dff0dc6cffacbf340e3fb9e3fd0133a95..0623ee56fb8ec0301b06ac5265f9a835b7964ade 100644 (file)
@@ -178,12 +178,12 @@ ADDRESSBOOK_NAME=Addressbuchname:
 ADDRESSBOOK_NAME_TITLE=Name des Adressbuches
 ADDRESSBOOK_CREATED=Erstellt:
 ADDRESSBOOK_CREATED_TITLE=Wann das Adressbuch erstellt wurde.
-LINK_LOGIN_SHOW_ADDRESS_BOOK_TITLE=Adressbuch anzeigen
-PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK=Adressbuch anzeigen
-CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK=Anzeigen des ausgew\u00e4hlten Adressbuchs:
+LINK_SHOW_ADDRESSBOOK_TITLE=Adressbuch anzeigen
+PAGE_TITLE_USER_SHOW_ADDRESSBOOK=Adressbuch anzeigen
+CONTENT_TITLE_USER_SHOW_ADDRESSBOOK=Anzeigen des ausgew\u00e4hlten Adressbuchs:
 ADDRESSBOOK_TOTAL_ENTRIES=Eintr\u00e4ge:
-PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Adressbucheintr\u00e4ge zeigen
-CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Alle Adressbuchentr\u00e4ge anzeigen:
+PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Adressbucheintr\u00e4ge zeigen
+CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Alle Adressbuchentr\u00e4ge anzeigen:
 ADDRESSBOOK_TOTAL_ENTRIES_TITLE=Eintr\u00e4ge im Adressbuch
 PARAMETER_ADDRESSBOOK_ID_MISSING=Bitte diese Seite mit Id-Nummer aufrufen.
 PARAMETER_ADDRESSBOOK_ID_INVALID=Id-Nummer f\u00fcr Adressbuch ung\u00fcltig. Bitte links weiter navigieren.
index 9bf4873b8c41af975c26da8b3a6aa2dbcadd758c..6b104835e0d30c574c210b6cd2ab6087b3314eff 100644 (file)
@@ -178,12 +178,12 @@ ADDRESSBOOK_NAME=Address book name:
 ADDRESSBOOK_NAME_TITLE=Name of the address book
 ADDRESSBOOK_CREATED=Created:
 ADDRESSBOOK_CREATED_TITLE=When the address book was created.
-LINK_LOGIN_SHOW_ADDRESS_BOOK_TITLE=Show address book
-PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK=Show address book
-CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK=Show selected address book:
+LINK_SHOW_ADDRESSBOOK_TITLE=Show address book
+PAGE_TITLE_USER_SHOW_ADDRESSBOOK=Show address book
+CONTENT_TITLE_USER_SHOW_ADDRESSBOOK=Show selected address book:
 ADDRESSBOOK_TOTAL_ENTRIES=Entries:
-PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Show address book entries
-CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Show all address book entries:
+PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Show address book entries
+CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Show all address book entries:
 ADDRESSBOOK_TOTAL_ENTRIES_TITLE=Entries in address book
 PARAMETER_ADDRESSBOOK_ID_MISSING=Please call this web page with id number.
 PARAMETER_ADDRESSBOOK_ID_INVALID=Id number for address book invalid. Please continue navigating on left menu.
index b41a48a2d1e318a541fde626df646cd6d7d25577..d7c7b34f9644148aaf43b86a8d68e93fe9480dd2 100644 (file)
                        <to-view-id>/login/login_add_addressbook.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_show_addressbook</from-outcome>
-                       <to-view-id>/login/login_show_addressbook.xhtml</to-view-id>
+                       <from-outcome>user_show_addressbook</from-outcome>
+                       <to-view-id>/user/show_addressbook.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_show_addressbook_entries</from-outcome>
-                       <to-view-id>/login/login_show_addressbook_entries.xhtml</to-view-id>
+                       <from-outcome>show_addressbook_entries</from-outcome>
+                       <to-view-id>/login/show_addressbook_entries.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_show_addressbook.xhtml</from-view-id>
+               <from-view-id>/user/show_addressbook.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_start_sharing_addressbook</from-outcome>
                        <to-view-id>/login/login_start_sharing_addressbook.xhtml</to-view-id>
index f6c414f87c2f81e8b9b146fb6e5e106d6b670ebd..7fe3565e17dc7bcbe4fa1bf78bd455167e7a6ed5 100644 (file)
@@ -30,8 +30,8 @@
                                                <h:column>
                                                        <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
 
-                                                       <h:link outcome="login_show_addressbook" title="#{msg.LINK_LOGIN_SHOW_ADDRESS_BOOK_TITLE}">
-                                                               <f:param name="addressbook_id" value="#{addressbook.addressbookId}" />
+                                                       <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
+                                                               <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
                                                                <h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />
                                                        </h:link>
                                                </h:column>
@@ -39,8 +39,8 @@
                                                <h:column>
                                                        <f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
 
-                                                       <h:link outcome="login_show_addressbook_entries" title="#{msg.LINK_LOGIN_SHOW_ADDRESS_BOOK_ENTRIES_TITLE}">
-                                                               <f:param name="addressbook_id" value="#{addressbook.addressbookId}" />
+                                                       <h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
+                                                               <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
                                                                <h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />
                                                        </h:link>
                                                </h:column>
index 2f6ba09a02f71437f31ba7ce78847bf420d52cbd..c6b56daad284f5b20a18ce1ccb5bae21b74bfec4 100644 (file)
@@ -24,8 +24,8 @@
                                                <h:column>
                                                        <f:facet name="header">#{msg.SHARED_ADDRESSBOOK}</f:facet>
 
-                                                       <h:link outcome="login_show_addressbook" title="#{msg.LINK_LOGIN_SHOW_ADDRESS_BOOK_TITLE}">
-                                                               <f:param name="addressbook_id" value="#{share.shareAddressbook.addressbookId}" />
+                                                       <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
+                                                               <f:param name="addressbookId" value="#{share.shareAddressbook.addressbookId}" />
                                                                <h:outputText id="addressbookName" value="#{share.shareAddressbook.addressbookName}" title="#{msg.SHARED_ADDRESSBOOK_TITLE}" />
                                                        </h:link>
                                                </h:column>
diff --git a/web/login/login_show_addressbook.xhtml b/web/login/login_show_addressbook.xhtml
deleted file mode 100644 (file)
index c5ab81a..0000000
+++ /dev/null
@@ -1,65 +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"
-         >
-
-       <f:metadata>
-               <f:viewParam id="addressbookId" name="addressbook_id" 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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_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_LOGIN_SHOW_ADDRESSBOOK}
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{addressbookController.isAddressbookLoaded()}">
-                               <div class="table_big">
-                                       <div class="table_header">
-                                               #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}
-                                       </div>
-
-                                       <div class="para">
-                                               <h:panelGrid headerClass="table_header_column" columns="5">
-                                                       <f:facet name="header">#{msg.ADDRESSBOOK_ID}</f:facet>
-                                                       <h:outputText id="addressbookId" value="#{addressbookController.addressbookId}" />
-
-                                                       <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
-                                                       <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
-
-                                                       <f:facet name="header">#{msg.ADDRESSBOOK_OWNER}</f:facet>
-                                                       <h:link id="addressbookUser" outcome="user_profile" value="#{addressbookController.addressbookUser.userName}" />
-
-                                                       <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
-                                                       <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>
-
-                                                       <f:facet name="header">#{msg.ADDRESSBOOK_STATUS}</f:facet>
-                                                       <h:outputFormat id="addressbookCreated" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
-                                               </h:panelGrid>
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <ui:fragment rendered="#{addressbookController.isOwnAddressbook()}">
-                                                       <h:link id="startSharing" outcome="login_start_sharing_addressbook" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE}" />
-                                               </ui:fragment>
-
-                                               <ui:fragment rendered="#{addressbookController.isOtherAddressbook()}">
-                                                       Bla bla
-                                               </ui:fragment>
-                                       </div>
-                               </div>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/login/login_show_addressbook_entries.xhtml b/web/login/login_show_addressbook_entries.xhtml
deleted file mode 100644 (file)
index 5f53e61..0000000
+++ /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/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES}
-               </ui:define>
-
-               <ui:define name="content">
-                       Here goes your content.
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml
new file mode 100644 (file)
index 0000000..9bf683e
--- /dev/null
@@ -0,0 +1,65 @@
+<?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"
+         >
+
+       <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/#{loginController.templateType}/#{loginController.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">
+                       <ui:fragment rendered="#{addressbookController.isAddressbookLoaded()}">
+                               <div class="table_big">
+                                       <div class="table_header">
+                                               #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}
+                                       </div>
+
+                                       <div class="para">
+                                               <h:panelGrid headerClass="table_header_column" columns="5">
+                                                       <f:facet name="header">#{msg.ADDRESSBOOK_ID}</f:facet>
+                                                       <h:outputText id="addressbookId" value="#{addressbookController.addressbookId}" />
+
+                                                       <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
+                                                       <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
+
+                                                       <f:facet name="header">#{msg.ADDRESSBOOK_OWNER}</f:facet>
+                                                       <h:link id="addressbookUser" outcome="user_profile" value="#{addressbookController.addressbookUser.userName}" />
+
+                                                       <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
+                                                       <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>
+
+                                                       <f:facet name="header">#{msg.ADDRESSBOOK_STATUS}</f:facet>
+                                                       <h:outputFormat id="addressbookCreated" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
+                                               </h:panelGrid>
+                                       </div>
+
+                                       <div class="table_footer">
+                                               <ui:fragment rendered="#{addressbookController.isOwnAddressbook()}">
+                                                       <h:link id="startSharing" outcome="login_start_sharing_addressbook" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE}" />
+                                               </ui:fragment>
+
+                                               <ui:fragment rendered="#{addressbookController.isOtherAddressbook()}">
+                                                       Bla bla
+                                               </ui:fragment>
+                                       </div>
+                               </div>
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/show_addressbook_entries.xhtml b/web/user/show_addressbook_entries.xhtml
new file mode 100644 (file)
index 0000000..e4cb5ae
--- /dev/null
@@ -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/login/login_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>