1 files changed, 40 insertions, 55 deletions
diff --git a/views/default/object/default.php b/views/default/object/default.php
index d49463bf8..70e098742 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -1,63 +1,48 @@
 <?php
 /**
- * ElggEntity default view.
+ * ElggObject default view.
+ *
+ * @warning This view may be used for other ElggEntity objects
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
-if ($vars['full']) {
-	echo elgg_view('export/entity', $vars);
-} else {
-
-	$icon = elgg_view(
-			'graphics/icon', array(
-			'entity' => $vars['entity'],
-			'size' => 'small',
-		)
-	);
-
-
-	$title = $vars['entity']->title;
-	if (!$title) {
-		$title = $vars['entity']->name;
-	}
-	if (!$title) {
-		$title = get_class($vars['entity']);
-	}
-
-	$controls = "";
-	if ($vars['entity']->canEdit()) {
-		$delete = elgg_view('output/confirm_link', array(
-			'href' => "{$vars['url']}action/entities/delete?guid={$vars['entity']->guid}", 
-			'text' => elgg_echo('delete')
-		));
-		$controls .= " ($delete)";
-	}
-
-	$info = "<div><p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $title . "</a></b> $controls </p></div>";
-
-	if (get_input('search_viewtype') == "gallery") {
-		$icon = "";
-	}
-
-	$owner = $vars['entity']->getOwnerEntity();
-	$ownertxt = elgg_echo('unknown');
-	if ($owner) {
-		$ownertxt = "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>";
-	}
-
-	$info .= "<div>".sprintf(elgg_echo("entity:default:strapline"),
-		friendly_time($vars['entity']->time_created),
-		$ownertxt
-	);
-
-	$info .= "</div>";
-
-	$info = "<span title=\"" . elgg_echo('entity:default:missingsupport:popup') . "\">$info</span>";
-	$icon = "<span title=\"" . elgg_echo('entity:default:missingsupport:popup') . "\">$icon</span>";
-
-	echo elgg_view_listing($icon, $info);
+$icon = elgg_view_entity_icon($vars['entity'], 'small');
+
+$title = $vars['entity']->title;
+if (!$title) {
+	$title = $vars['entity']->name;
+}
+if (!$title) {
+	$title = get_class($vars['entity']);
+}
+
+if (elgg_instanceof($vars['entity'], 'object')) {
+	$metadata = elgg_view('navigation/menu/metadata', $vars);
 }
+
+$owner_link = '';
+$owner = $vars['entity']->getOwnerEntity();
+if ($owner) {
+	$owner_link = elgg_view('output/url', array(
+		'href' => $owner->getURL(),
+		'text' => $owner->name,
+		'is_trusted' => true,
+	));
+}
+
+$date = elgg_view_friendly_time($vars['entity']->time_created);
+
+$subtitle = "$owner_link $date";
+
+$params = array(
+	'entity' => $vars['entity'],
+	'title' => $title,
+	'metadata' => $metadata,
+	'subtitle' => $subtitle,
+);
+$params = $params + $vars;
+$body = elgg_view('object/elements/summary', $params);
+
+echo elgg_view_image_block($icon, $body, $vars);