First pass at standardizing pages.

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

2 files changed, 45 insertions, 57 deletions

diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php
index 3e0195e5f..42d32b021 100644
--- a/mod/pages/views/default/annotation/icon.php
+++ b/mod/pages/views/default/annotation/icon.php
@@ -1,30 +1,24 @@
 <?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/
-	 */
+/**
+ * @todo What is this doing here?
+ *
+ * @package ElggPages
+ */
 
+$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 = "";
+}
 
-	$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">
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index ecfd0a302..c59c80567 100644
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -1,40 +1,34 @@
 <?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(
+/**
+ * Default page listing?
+ *
+ * @package ElggPages
+ */
+
+$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
-	
+	)
+);
+
+$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);
-?>
+echo elgg_view_listing($icon, $info);