2 files changed, 30 insertions, 16 deletions

diff --git a/views/default/user/default.php b/views/default/user/default.php
index 71eb273f0..c0c18f85f 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -6,25 +6,26 @@
  * @uses $vars['size']   Size of the icon
  */
 
-$user = $vars['entity'];
+$entity = $vars['entity'];
 $size = elgg_extract('size', $vars, 'tiny');
 
-$icon = elgg_view_entity_icon($user, $size);
+$icon = elgg_view_entity_icon($entity, $size);
 
 // Simple XFN
 $rel = '';
-if (elgg_get_logged_in_user_guid() == $user->guid) {
+if (elgg_get_logged_in_user_guid() == $entity->guid) {
 	$rel = 'rel="me"';
-} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $user->guid)) {
+} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $entity->guid)) {
 	$rel = 'rel="friend"';
 }
 
-$title = "<a href=\"" . $user->getUrl() . "\" $rel>" . $user->name . "</a>";
+$title = "<a href=\"" . $entity->getUrl() . "\" $rel>" . $entity->name . "</a>";
 
-
-$metadata = "<ul class=\"elgg-menu elgg-menu-metadata\"><li>$user->location</li>";
-$metadata .= elgg_view("entity/metadata", array('entity' => $user));
-$metadata .= "</ul>";
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $entity,
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
 
 if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
 	$metadata = '';
@@ -33,24 +34,24 @@ if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
 if (elgg_get_context() == 'gallery') {
 	echo $icon;
 } else {
-	if ($user->isBanned()) {
+	if ($entity->isBanned()) {
 		$banned = elgg_echo('banned');
 		$params = array(
-			'entity' => $user,
+			'entity' => $entity,
 			'title' => $title,
-			'metadata' => '<ul class="elgg-menu elgg-menu-metadata"><li>$banned</li></ul>',
+			'metadata' => $metadata,
 		);
 	} else {
 		$params = array(
-			'entity' => $user,
+			'entity' => $entity,
 			'title' => $title,
 			'metadata' => $metadata,
-			'subtitle' => $user->briefdescription,
-			'content' => elgg_view('user/status', array('entity' => $user)),
+			'subtitle' => $entity->briefdescription,
+			'content' => elgg_view('user/status', array('entity' => $entity)),
 		);
 	}
 
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('user/elements/summary', $params);
 
 	echo elgg_view_image_block($icon, $list_body);
 }
diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php
new file mode 100644
index 000000000..46d11c14c
--- /dev/null
+++ b/views/default/user/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * User summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);