From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Mar 2010 17:53:05 +0000
Subject: Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/page_elements/owner_block.php | 41 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'views/default/page_elements/owner_block.php')

diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 1a3440135..eb18a733e 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -12,24 +12,25 @@
 
 $contents = "";
 
-// Is there a page owner?
-$owner = page_owner_entity();
-if ($owner instanceof ElggEntity) {
-	$icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
-	if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
-		$info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+if(is_plugin_enabled('profile')) {
+	// Is there a page owner?
+	$owner = page_owner_entity();
+	if ($owner instanceof ElggEntity) {
+		$icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+		if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
+			$info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+		}
+		$display = "<div id='owner_block_icon'>" . $icon . "</div>";
+		$display .= "<div id='owner_block_content'>" . $info . "</div><div class='clearfloat ownerblockline'></div>";
+	
+		if ($owner->briefdescription) {
+			$desc = $owner->briefdescription;
+			$display .= "<div id='owner_block_desc'>" . $desc . "</div>";
+		}
+	
+		$contents .= "<div id='owner_block'>".$display."</div><div id='owner_block_bottom'></div>";
 	}
-	$display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
-	$display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";
-
-	if ($owner->briefdescription) {
-		$desc = $owner->briefdescription;
-		$display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
-	}
-
-	$contents .= $display;
 }
-
 // Are there feeds to display?
 global $autofeed;
 
@@ -43,7 +44,7 @@ if (isset($autofeed) && $autofeed == true) {
 	$label = elgg_echo('feed:rss');
 	$contents .= <<<END
 
-<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>
+<div id="rss_link"><a href="{$url}" rel="nofollow">{$label}</a></div>
 
 END;
 }
@@ -55,13 +56,11 @@ $contents .= elgg_view('owner_block/extend');
 if (isset($vars['content']))
 	$contents .= $vars['content'];
 
-// Initialise the submenu (plugins can add to the submenu)
+// Initialise the current tool/page submenu (plugins can add to the submenu)
 $submenu = get_submenu(); 
 if (!empty($submenu))
-	$contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; 
+	$contents .= "<div class='submenu page_navigation'>" . $submenu . "</div>"; 
 
 if (!empty($contents)) {
-	echo "<div id=\"owner_block\">";
 	echo $contents;
-	echo "</div><div id=\"owner_block_bottom\"></div>";
 }
\ No newline at end of file
-- 
cgit v1.2.3