Pulled in the interface changes.

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

2 files changed, 72 insertions, 0 deletions

diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php
new file mode 100644
index 000000000..5f943f8ce
--- /dev/null
+++ b/mod/pages/views/default/annotation/icon.php
@@ -0,0 +1,32 @@
+<?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
new file mode 100644
index 000000000..27135b30d
--- /dev/null
+++ b/mod/pages/views/default/annotation/page.php
@@ -0,0 +1,40 @@
+<?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