updated owner blocks for users and groups

git-svn-id: http://code.elgg.org/elgg/trunk@7721 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 40 insertions, 7 deletions

diff --git a/views/default/user/default.php b/views/default/user/default.php
index 744a54595..3e2b9f433 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -6,12 +6,45 @@
  * @subpackage Core
  */
 
-if ($vars['full']) {
-	echo elgg_view("profile/userdetails",$vars);
+$user = $vars['entity'];
+
+$icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny'));
+
+// Simple XFN
+$rel = '';
+if (get_loggedin_userid() == $user->guid) {
+	$rel = 'rel="me"';
+} elseif (check_entity_relationship(get_loggedin_userid(), 'friend', $user->guid)) {
+	$rel = 'rel="friend"';
+}
+
+$title = "<a href=\"" . $user->getUrl() . "\" $rel>" . $user->name . "</a>";
+
+
+$metadata = "<ul class=\"elgg-list-metadata\"><li>$user->location</li>";
+$metadata .= elgg_view("entity/metadata", array('entity' => $user));
+$metadata .= "</ul>";
+
+if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+if ($user->isBanned()) {
+	$params = array(
+		'entity' => $user,
+		'title' => $title,
+		'metadata' => '<ul class="elgg-list-metadata"><li>banned</li></ul>',
+	);
 } else {
-	if (get_input('listtype') == "gallery") {
-		echo elgg_view('profile/gallery',$vars);
-	} else {
-		echo elgg_view("profile/listing",$vars);
-	}
+	$params = array(
+		'entity' => $user,
+		'title' => $title,
+		'metadata' => $metadata,
+		'subtitle' => $user->briefdescription,
+		'content' => elgg_view('user/status', array('entity' => $user)),
+	);
 }
+
+$list_body = elgg_view('layout/objects/list/body', $params);
+
+echo elgg_view_image_block($icon, $list_body);