From f157509b3cd60f227c9f5aca0b3d4c9cdd13dfe3 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 11 Mar 2010 15:22:18 +0000
Subject: Updated friends/members listings when there is a latest wire post to
 display.

git-svn-id: http://code.elgg.org/elgg/trunk@5364 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 friends/index.php                             | 2 +-
 friends/of.php                                | 2 +-
 mod/members/views/default/members/css.php     | 4 ----
 mod/profile/views/default/profile/listing.php | 4 ++--
 mod/thewire/views/default/thewire/css.php     | 3 +++
 views/default/admin/statistics_opt/online.php | 2 +-
 views/default/css.php                         | 7 ++++++-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/friends/index.php b/friends/index.php
index 7ddbd45cc..23dd098d5 100644
--- a/friends/index.php
+++ b/friends/index.php
@@ -16,7 +16,7 @@ if (!$owner = page_owner_entity()) {
 $friends = sprintf(elgg_echo("friends:owned"),$owner->name);
 
 $area1 = elgg_view_title($friends);
-$area2 = list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false);
+$area2 = "<div class='members_list'>".list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false)."</div>";
 $body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2);
 
 page_draw($friends, $body);
diff --git a/friends/of.php b/friends/of.php
index f8c3b1981..d3668d587 100644
--- a/friends/of.php
+++ b/friends/of.php
@@ -16,7 +16,7 @@ if (!$owner = page_owner_entity()) {
 $friends_of = sprintf(elgg_echo("friends:of:owned"),$owner->name);
 
 $area1 = elgg_view_title($friends_of);
-$area2 = list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false);
+$area2 = "<div class='members_list'>".list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false)."</div>";
 $body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2);
 
 page_draw($friends_of, $body);
diff --git a/mod/members/views/default/members/css.php b/mod/members/views/default/members/css.php
index 805bcc3e1..d66c97bed 100644
--- a/mod/members/views/default/members/css.php
+++ b/mod/members/views/default/members/css.php
@@ -9,10 +9,6 @@
  * @link http://elgg.com/
  */
 ?>
-
-.members_list {
-
-}
 .members .group_count {
 	font-weight: bold;
 	color: #666666;
diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php
index 942910bc3..e53f9df75 100644
--- a/mod/profile/views/default/profile/listing.php
+++ b/mod/profile/views/default/profile/listing.php
@@ -29,12 +29,12 @@ else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid
 		
 if (!$banned) {
 	$info .= "<p class='entity_title user'><a href=\"" . $vars['entity']->getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "</a></p>";
-	//create a view that a status plugin could extend - in the default case, this is the wire
-	$info .= elgg_view("profile/status", array("entity" => $vars['entity']));
 	$location = $vars['entity']->location;
 	if (!empty($location)) {
 		$info .= "<p class='entity_subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
 	}
+	//create a view that a status plugin could extend - in the default case, this is the wire
+	$info .= elgg_view("profile/status", array("entity" => $vars['entity']));
 }else{
 	$info .= "<p class='entity_title user banned'>";
 	if (isadminloggedin())
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index 6cd92dd99..8b46f4b18 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -56,6 +56,9 @@
 	background-repeat: no-repeat;
 	background-position: right bottom; 
 }
+.members_list .wire_post { /* when displayed in lists of friends */
+	margin-top:4px;
+}
 .wire_post_contents {
 	background-color: #eeeeee;
 	margin:0;
diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php
index b30e8a396..6485a3bac 100644
--- a/views/default/admin/statistics_opt/online.php
+++ b/views/default/admin/statistics_opt/online.php
@@ -15,7 +15,7 @@ if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
 	get_context('admin');
 	?>
 	
-	<div class="admin_settings users_online">
+	<div class="admin_settings members_list users_online">
 		<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
 		<?php echo $users_online; ?>
 	</div>
diff --git a/views/default/css.php b/views/default/css.php
index 91d93acf5..d81ea3c89 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -991,7 +991,10 @@ select.styled .select_option {
 	padding-top:2px;
 	width:26px;
 }
-
+/* override hover for lists of site users/members */
+.members_list .entity_listing:hover {
+	background-color:white;
+}
 
 /* ***************************************
 	USER SETTINGS & ADMIN AREA 
@@ -1002,10 +1005,12 @@ select.styled .select_option {
 .admin_settings {
 	margin-bottom:20px;
 }
+/*
 .user_settings p,
 .admin_settings p {
 	margin-bottom:6px;
 }
+*/
 .user_settings h3,
 .admin_settings h3 {
 	background:#e4e4e4;
-- 
cgit v1.2.3