From 4240a2386efda806b44760563db4e4eab42282b9 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 14 Oct 2015 14:45:03 +0200
Subject: [PATCH] =?utf8?q?added=20more=20stuff=20for=20user=20list=20+=20u?=
 =?utf8?q?pdated=20jar(s)=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mx?=
 =?utf8?q?change.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/juser-core.jar                            | Bin 22886 -> 22925 bytes
 .../localization/bundle_de_DE.properties      |   7 ++++++
 .../localization/bundle_en_US.properties      |   7 ++++++
 web/login/login_own_addressbooks.xhtml        |   2 +-
 web/login/login_shared_addressbooks.xhtml     |   2 +-
 web/login/login_user_list.xhtml               |  23 ++++++++++++++++--
 web/resources/css/cssLayout.css               |   8 ++++++
 7 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 96e685b215435eea48d57c7baf4d04e46ea7de33..a260e34bc31d96d976218c0618662c9cd8ad4858 100644
GIT binary patch
delta 542
zcmaF1iLrMxBTs-gGYc030|x`c<Fbi7noN(%CYn!Y0<teCfXGjpKytDyqcMmIVzdQO
z6B(UBR3MY)Bqi?2TufXbo*0uQM9>bbgvk|1ZN9<uk`Y87X31d#(T3a+Odz_OH-ZI3
zKNYkD(+Xm}%pm@H$t*A}ExR5}pHVo$%=@^^&%G;c2IFdR28Pv}7pkapGuBK#sc)&_
z>F4Jfq~PW6>8DUyoLW?@;25k>s^Aag>4Esp`FSOY$t4Q5oB!)eGBQR@)-#ZwY+)$Q
zT98<jn7cW`ke?f5XQs`4up7J_k8pta0$y7|Zk>EQz!Df3lbHe?Ks=W~0}xdf2=?X1
zKyV0r3-kpEx&{S<s98aNAnH|+Cxj<6IWX7=#B2=?1yOf`(?OJLNH&Pt6p|03ltZgP
z)cnvg5G5X#38I?93PIG@uv`$85?+KF29qC$2PuF;#a~1A%5)Y61`yU^K!7EUEjE)A
znN%h(U}l+I8zBTTWnzR3Q>r6e^m>FiNc00xRNHIvLMH9W_q7Eldqs+|JqQ391ORKg
B$YB5g

delta 493
zcmeC(%=l~*BTs-gGYc030|x^`ZQev4O{SW>iRROpfb0tjAo7zYken>bXbhr)7;Qn+
zL`G*2709GHNr`(h7ZVqVC&pw65wrs<VR8jhn{P0^WCYQNS#sDwv>|r{6Nv8SjbH)M
zPX#T(w1QYKGl;)lG7C&g%dQ90XB18_^Va71xktR$H);`QU})LAP(_`aF>vxpeap?d
z24akiag!qr<R>Q^igP;q`?+}r`MSDnt~cc81{pWO=04c?LdPQ<AilZRR**9$zYDMg
z`g5{opaY1P9cTce<_3a2a3c`xIoTjzkYG+wFo-%B<OiYzgFPWUnaLHwMj+;z;7}07
z9Fh*Aaze5})Xk855aktG1)`3HmVqd{uuKrOGOQ3p$%N;EsP6D0RPRmZiU<Np#6`$3
z#oA16bkvx<Bti%zvI8h$=Li%rp3E7^qW}t&#|eiD!`T=ZK-hr+0hTnfcuii&q&+zy
LQk`vQ07wD=IIE!$

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 89344e29..6ed629a0 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -206,3 +206,10 @@ PUBLIC_USER_PROFILE_FLAG=Soll Ihr Profil im Internet einsehbar sein?
 PUBLIC_USER_PROFILE_NOT_CHOOSEN_MESSAGE=Bitte w\u00e4hlen Sie aus, ob Ihr Profil im Internet sichtbar sein soll.
 PUBLIC_PROFILE_ENABLED=Ist sichtbar
 PUBLIC_PROFILE_DISABLED=Ist nicht sichtbar
+USER_ID=Benutzernummer:
+USER_NAME=Benutzername:
+USER_CREATED=Beigetreten:
+USER_CREATED_TITLE=Wann der Benutzer dieser Community beigetreten ist.
+USER_LIST_SHARING_ADDRESSBOOKS=Freigegebene Adressb\u00fccher:
+LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS=Auflisten
+LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE=Listet alle mit dem Benutzer geteilte Adressb\u00fccher auf.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 3b49186f..192f6ee1 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -206,3 +206,10 @@ PUBLIC_USER_PROFILE_FLAG=Should your profile be visible in Internet?
 PUBLIC_USER_PROFILE_NOT_CHOOSEN_MESSAGE=Please choose whether your profile should be visible in Internet.
 PUBLIC_PROFILE_ENABLED=Is visible
 PUBLIC_PROFILE_DISABLED=Is not visible
+USER_ID=User id:
+USER_NAME=User name:
+USER_CREATED=Joined:
+USER_CREATED_TITLE=When the user has joined this community.
+USER_LIST_SHARING_ADDRESSBOOKS=Shared address books:
+LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS=List
+LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE=Lists all with this user shared address books.
diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml
index b69f47db..f6c414f8 100644
--- a/web/login/login_own_addressbooks.xhtml
+++ b/web/login/login_own_addressbooks.xhtml
@@ -20,7 +20,7 @@
 				</div>
 
 				<div class="para">
-					<h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
+					<h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
 						<h:column>
 							<f:facet name="header">#{msg.ADDRESSBOOK_ID}</f:facet>
 
diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml
index 6dbc57d1..e7b3b12a 100644
--- a/web/login/login_shared_addressbooks.xhtml
+++ b/web/login/login_shared_addressbooks.xhtml
@@ -19,7 +19,7 @@
 					#{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS}
 				</div>
 
-				<h:dataTable id="sharedAddressbooks" summary="#{msg.TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS}" var="shares" value="#{addressbookController.allShares()}" rendered="#{shareController.isSharingAddressbooks()}">
+				<h:dataTable id="sharedAddressbooks" var="shares" value="#{addressbookController.allShares()}" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks()}">
 				</h:dataTable>
 
 				<h:outputText class="notice" value="#{msg.LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks() == false}" />
diff --git a/web/login/login_user_list.xhtml b/web/login/login_user_list.xhtml
index 28b68bef..134990f6 100644
--- a/web/login/login_user_list.xhtml
+++ b/web/login/login_user_list.xhtml
@@ -14,12 +14,31 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<div class="table">
+			<div class="table_big">
 				<div class="table_header">
 					#{msg.LOGIN_TABLE_HEADER_USER_LIST}
 				</div>
 
-				<h:dataTable id="userList" summary="#{msg.TABLE_SUMMARY_LOGIN_USER_LIST}" var="user" value="#{userController.allPublicUsers()}" rendered="#{userController.isPublicUserRegistered()}">
+				<h:dataTable id="userList" var="user" value="#{userController.allPublicUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_LOGIN_USER_LIST}" rendered="#{userController.isPublicUserRegistered()}">
+					<f:facet name="header">#{msg.USER_ID}</f:facet>
+					<h:link outcome="login_user_profile" value="#{user.userId}">
+						<f:param name="profile" value="#{user.userId}" />
+					</h:link>
+
+					<f:facet name="header">#{msg.USER_NAME}</f:facet>
+					<h:link outcome="login_user_profile" value="#{user.userName}">
+						<f:param name="profile" value="#{user.userId}" />
+					</h:link>
+
+					<f:facet name="header">#{msg.USER_CREATED}</f:facet>
+					<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}">
+						<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
+					</h:outputFormat>
+
+					<f:facet name="header">#{msg.USER_LIST_SHARING_ADDRESSBOOKS}</f:facet>
+					<h:link outcome="login_list_sharing_addressbooks" value="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS}" title="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE}">
+						<f:param name="profile" value="#{user.userId}" />
+					</h:link>
 				</h:dataTable>
 			</div>
 		</ui:define>
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 38ebbf28..2a3317fc 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -65,6 +65,10 @@ table, .table {
 	width: 500px;
 }
 
+.table_big {
+	width: 100%;
+}
+
 .table_row {
 	width: 100%;
 	min-height: 20px;
@@ -141,6 +145,10 @@ ul.footer_nav li.footer_copyright {
 	width: 100px;
 }
 
+.table_header_column25 {
+	width: 25%;
+}
+
 .table_data_column {
 	width: 100px;
 }
-- 
2.39.5