2 files changed, 59 insertions, 71 deletions
diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php
deleted file mode 100644
index 5f943f8ce..000000000
--- a/mod/pages/views/default/annotation/icon.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-	/**
-	 * Elgg Pages
-	 * 
-	 * @package ElggPages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-
-	$annotation = $vars['annotation'];
-	$entity = get_entity($annotation->entity_guid);
-	
-	// Get size
-	if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar')))
-		$vars['size'] = "medium";
-			
-	// Get any align and js
-	if (!empty($vars['align'])) {
-		$align = " align=\"{$vars['align']}\" ";
-	} else {
-		$align = "";
-	}
-	
-	
-?>
-
-<div class="groupicon">
-<a href="<?php echo $entity->getURL() . "?rev=" . $annotation->id; ?>"><img src="<?php echo $entity->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> <?php echo $vars['js']; ?> /></a>
-</div>
-\ No newline at end of file
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index 27135b30d..ecb289092 100644
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -1,40 +1,60 @@
 <?php
-	/**
-	 * Elgg Pages
-	 * 
-	 * @package ElggPages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	$annotation = $vars['annotation'];
-	$entity = get_entity($annotation->entity_guid);
-	
-	$icon = elgg_view(
-		"annotation/icon", array(
-		'annotation' => $vars['annotation'],
-		'size' => 'small',
-	  )
-	);
-	
-	$owner_guid = $annotation->owner_guid;
-	$owner = get_entity($owner_guid);
-			
-	$rev = sprintf(elgg_echo('pages:revision'), 
-		friendly_time($annotation->time_created),
-		
-		"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
-	);
-	
-	$link = $entity->getURL() . "?rev=" . $annotation->id;
-	
-	$info = <<< END
-	
-<div><a href="$link">{$entity->title}</a></div>
-<div>$rev</div>
-END;
-
-	echo elgg_view_listing($icon, $info);
-?>
-\ No newline at end of file
+/**
+ * Revision view for history page
+ *
+ * @package ElggPages
+ */
+
+$annotation = $vars['annotation'];
+$page = get_entity($annotation->entity_guid);
+
+$icon = elgg_view("pages/icon", array(
+	'annotation' => $annotation,
+	'size' => 'small',
+));
+
+$owner_guid = $annotation->owner_guid;
+$owner = get_entity($owner_guid);
+if (!$owner) {
+
+}
+$owner_link = elgg_view('output/url', array(
+	'href' => $owner->getURL(),
+	'text' => $owner->name,
+	'is_trusted' => true,
+));
+
+$date = elgg_view_friendly_time($annotation->time_created);
+
+$title_link = elgg_view('output/url', array(
+	'href' => $annotation->getURL(),
+	'text' => $page->title,
+	'is_trusted' => true,
+));
+
+$subtitle = elgg_echo('pages:revision:subtitle', array($date, $owner_link));
+
+$body = <<< HTML
+<h3>$title_link</h3>
+<p class="elgg-subtext">$subtitle</p>
+HTML;
+
+if (!elgg_in_context('widgets')) {
+	$menu = elgg_view_menu('annotation', array(
+		'annotation' => $annotation,
+		'sort_by' => 'priority',
+		'class' => 'elgg-menu-hz float-alt',
+	));
+}
+
+$body = <<<HTML
+<div class="mbn">
+	$menu
+	<h3>$title_link</h3>
+	<span class="elgg-subtext">
+		$subtitle
+	</span>
+</div>
+HTML;
+
+echo elgg_view_image_block($icon, $body);
+\ No newline at end of file