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

diff --git a/friends/index.php b/friends/index.php
index 7ddbd45cc290713bd538a5daf5f37098f02304e9..23dd098d51395e8afa80cc2f2c7ea81f404a6790 100644 (file)
--- 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 f8c3b1981d37f2e9575fb048175314140d4955c8..d3668d587c266d9f03f1967b84655fec7ca3d6a1 100644 (file)
--- 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 805bcc3e1a56fc285594576e0163670f195e765f..d66c97bed14b50a9373edefe5a0366911e04f9e7 100644 (file)
--- 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 942910bc3d56270170f549976fd9c8f150427884..e53f9df7547ce7c2aa62e950cfb06204a2bbcbb6 100644 (file)
--- 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 6cd92dd99f59db236f9ac08c5979a39f3e845b2f..8b46f4b1867066a57101a324a792f77159b3538f 100644 (file)
--- 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 b30e8a396ea570cf39723834b75792e1faaf3ded..6485a3bac0961cc042d749a3be198d4356b2a265 100644 (file)
--- 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 91d93acf5557d7d5316f8231d3288be355d592f6..d81ea3c89b5f4f97fb1872f2afcafec922a6a3b9 100644 (file)
--- 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;