Continued:

- rewrote div-set to full panel grid
- fixed link target
- added CSS class table_label
- ignored some strings for i18n
- updated jar(s)

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index b5f18b6022dd905e6d89bdcf9879c99ee71629b2..c2de43d60cf9c954aee5af584e3669c569c4cc4d 100644 (file)
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 0366960c7a937add1673cd47c2056907661b0a6d..c86495c7e7c050e1a3601f996a49d4a280760bf4 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ

diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar
index 772d6e1b3a18076282333ec3092e776e11cd93f9..abcaef84108457319ee82b2cef4f98f34167a28c 100644 (file)
Binary files a/lib/jcontacts-lib.jar and b/lib/jcontacts-lib.jar differ

diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar
index 49c92f01894dfb815c1d919ba93ab65d1115e445..03fd6ddec7cb6afa0e4aebdcba3f326ebaccc00b 100644 (file)
Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ

diff --git a/lib/jcore.jar b/lib/jcore.jar
index b29ea6784671c9828ce3f3dea67b2cb530b511ec..88b7a44ddf14adc8aa4682d7fffd48ff6317d488 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 34dab31b1103ed439320ee2b691c9a0236fac76a..d3b339c867fb1f1961023e28570976fe43fd2d0b 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index 0bead8b648f4af014405b55d7156804a57dfe9ba..a4ca64879ae0c0f7d0d6c1706b65c1e6da7ff60d 100644 (file)
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index eec6972ea0bf3abb4183919486c5384cd4c89967..c9d5f503a7eb5b20e55e3e25fe059a49f3cf9785 100644 (file)
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index b7c2d60f403461e5d3999b0c9849eac180a9607b..8ec885568dd80e945c627cd2a49856fc6ee1b99d 100644 (file)
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ

diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar
index dcd598a1f9b05aad4a42861467a004488af83aea..1e1d78671130111afc6017b45dddc25771fe7dcf 100644 (file)
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index f0eec34e75a2dc856303f21d405e3f7ca1cc4f85..4ef739c7d1024129acc22ad6160fadaba6cb5d51 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -1,61 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scene Scope="Project" version="2">
-       <Scope Scope="Faces Configuration Only">
-               <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
-               <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
-               <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
-               <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-               <Node id="*" x="1150" y="150" zoom="true"/>
-               <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
-               <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
-               <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
-               <Node id="index.xhtml" x="900" y="150" zoom="true"/>
-               <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
-               <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
-               <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
-               <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
-       </Scope>
-       <Scope Scope="Project">
-               <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"/>
-               <Node id="privacy.xhtml" x="400" y="750" zoom="true"/>
-               <Node id="admin/admin_index.xhtml" x="400" y="450" zoom="true"/>
-               <Node id="user/user_list.xhtml" x="150" y="150" zoom="true"/>
-               <Node id="user/user_profile.xhtml" x="1400" y="300" zoom="true"/>
-               <Node id="login/login_list_sharing_addressbooks.xhtml" x="900" y="600" zoom="true"/>
-               <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
-               <Node id="login/login_add_addressbook.xhtml" x="150" y="900" zoom="true"/>
-               <Node id="login/login_edit_address.xhtml" x="150" y="300" zoom="true"/>
-               <Node id="login/login_edit_user_data.xhtml" x="1150" y="150" zoom="true"/>
-               <Node id="user/lost_passwd.xhtml" x="900" y="300" zoom="true"/>
-               <Node id="*" x="650" y="150" zoom="true"/>
-               <Node id="login/login_own_addressbooks.xhtml" x="400" y="150" zoom="true"/>
-               <Node id="terms.xhtml" x="150" y="600" zoom="true"/>
-               <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="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"/>
-               <Node id="user/register.xhtml" x="400" y="300" zoom="true"/>
-               <Node id="user/resend_link.xhtml" x="150" y="450" zoom="true"/>
-       </Scope>
-       <Scope Scope="All Faces Configurations">
-               <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
-               <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
-               <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
-               <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-               <Node id="*" x="1150" y="150" zoom="true"/>
-               <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
-               <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
-               <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
-               <Node id="index.xhtml" x="900" y="150" zoom="true"/>
-               <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
-               <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
-               <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
-               <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
-       </Scope>
+    <Scope Scope="Faces Configuration Only">
+        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="*" x="1150" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+    </Scope>
+    <Scope Scope="Project">
+        <Node id="login/login_shared_addressbooks.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="login/login_edit_address.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="privacy.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/register.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="bye.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="imprint.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="*" x="900" y="150" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/admin_index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/login.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1650" y="150" zoom="true"/>
+    </Scope>
+    <Scope Scope="All Faces Configurations">
+        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="*" x="1150" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+    </Scope>
 </Scene>

diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java
index a6c7832780d4df5f6ebec9488f4ae6826308d81e..4752b3ed76d0d28dcbc963201ce4821d4226dc38 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java
@@ -74,7 +74,7 @@ public class UserLoginWebBean implements UserLoginWebController {
         * Template type for pages that might be displayed in guest area and login
         * area. Default is guest area.
         */
-       private String templateType = "guest";
+       private String templateType = "guest"; //NOI18N
 
        /**
         * User controller

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index d7c7b34f9644148aaf43b86a8d68e93fe9480dd2..74bb3322780ed9a178f1bb0afab367b4b0ca1b17 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -149,7 +149,7 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>show_addressbook_entries</from-outcome>
-                       <to-view-id>/login/show_addressbook_entries.xhtml</to-view-id>
+                       <to-view-id>/user/show_addressbook_entries.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>

diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index b3730ead5a713fba41f65bb08fdeaebede5a2258..eb81f7e87e494dceaf42c0f9538209e99b52af89 100644 (file)
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -129,7 +129,7 @@ ul.footer_nav li.footer_copyright {
        padding-left: 5px;
 }
 
-.table_header {
+.table_header, .table_label {
        text-align: center;
        font-weight: bold;
 }

diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml
index 9bf683e4f151f26bdc630303b80e41ad69896c7f..8e46e559e8c8f58214e2c605903f5de58ba99356 100644 (file)
--- a/web/user/show_addressbook.xhtml
+++ b/web/user/show_addressbook.xhtml
@@ -23,42 +23,38 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{addressbookController.isAddressbookLoaded()}">
-                               <div class="table_big">
-                                       <div class="table_header">
-                                               #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}
-                                       </div>
+                               <h:panelGrid headerClass="table_header" styleClass="table" columns="2">
+                                       <f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
 
-                                       <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}" />
+                                       <h:outputLabel for="addressbookId" class="table_label">#{msg.ADDRESSBOOK_ID}</h:outputLabel>
+                                       <h:outputText id="addressbookId" value="#{addressbookController.addressbookId}" />
 
-                                                       <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
-                                                       <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
+                                       <h:outputLabel for="addressbookName" class="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
+                                       <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}" />
+                                       <h:outputLabel for="addressbookUser" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
+                                       <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>
+                                       <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>
 
-                                                       <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>
+                                       <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}" />
 
-                                       <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>
+                                       <f:facet name="footer">
+                                               <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                                                       <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 rendered="#{addressbookController.isOtherAddressbook()}">
+                                                               Bla bla
+                                                       </ui:fragment>
                                                </ui:fragment>
-                                       </div>
-                               </div>
+                                       </f:facet>
+                               </h:panelGrid>
                        </ui:fragment>
                </ui:define>
        </ui:composition>