6 files changed, 23 insertions, 11 deletions

diff --git a/mod/opendd/edit.php b/mod/opendd/edit.php
index f1b060a6c..fc4ed8d54 100644
--- a/mod/opendd/edit.php
+++ b/mod/opendd/edit.php
@@ -11,9 +11,11 @@
 
 	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 	
-	$form = elgg_view('forms/opendd/subscribe', array('entity' => get_entity(get_input('feed_guid'))));
+	$title = elgg_echo("opendd:edit");
+	$form = elgg_view_title($title);
+	$form .= elgg_view('forms/opendd/subscribe', array('entity' => get_entity(get_input('feed_guid'))));
 	
 	$body = elgg_view_layout('one_column',$form);
 	
-	page_draw(elgg_echo("opendd:edit"), $body);
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/opendd/feeds.php b/mod/opendd/feeds.php
index 69b35aa7e..493e659b6 100644
--- a/mod/opendd/feeds.php
+++ b/mod/opendd/feeds.php
@@ -11,6 +11,7 @@
 
 	$limit = get_input("limit", 10);
 	$offset = get_input("offset", 0);
+	$title = elgg_echo("opendd:feeds");
 	
 	$context = get_context();
 	
@@ -19,7 +20,7 @@
 		
 	set_context($context);
 	
-	$body = elgg_view_layout('one_column', $objects);
+	$body = elgg_view_layout('one_column', elgg_view_title($title) . $objects);
 	
-	page_draw(elgg_echo("opendd:feeds"), $body);
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/opendd/index.php b/mod/opendd/index.php
index 83b6b0368..0f1af5537 100644
--- a/mod/opendd/index.php
+++ b/mod/opendd/index.php
@@ -17,6 +17,8 @@
 	$offset = get_input("offset", 0);
 	$view = get_input("view");
 
+	$title = sprintf(elgg_echo("opendd:your"),page_owner_entity()->name);
+	
 	$opendd = get_river_entries_as_opendd(page_owner(), "", $limit, $offset);
 
 	if ($view=='odd')
@@ -54,6 +56,8 @@
 			$cnt++;
 		}
 		
+		$body = elgg_view_title($title);
+		
 		$context = get_context();
 		set_context('search');
 		$body .= elgg_view_entity_list($objects, $cnt, $offset, $limit, false);
@@ -71,6 +75,6 @@
 		$body = elgg_view_layout('one_column',$body);
 		
 		// Finally draw the page
-		page_draw(sprintf(elgg_echo("opendd:your"),page_owner_entity()->name), $body);
+		page_draw($title, $body);
 	}
 ?>
\ No newline at end of file
diff --git a/mod/opendd/manage.php b/mod/opendd/manage.php
index 1fc63b550..2b58057af 100644
--- a/mod/opendd/manage.php
+++ b/mod/opendd/manage.php
@@ -13,6 +13,7 @@
 
 	$limit = get_input("limit", 10);
 	$offset = get_input("offset", 0);
+	$title = elgg_echo("opendd:manage");
 	
 	$form = elgg_view('forms/opendd/subscribe');
 
@@ -23,7 +24,7 @@
 		
 	set_context($context);
 	
-	$body = elgg_view_layout('one_column',$form . $objects);
+	$body = elgg_view_layout('one_column',elgg_view_title($title) . $form . $objects);
 	
-	page_draw(elgg_echo("opendd:manage"), $body);
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/opendd/viewfeed.php b/mod/opendd/viewfeed.php
index 7cec15884..fabae4239 100644
--- a/mod/opendd/viewfeed.php
+++ b/mod/opendd/viewfeed.php
@@ -16,6 +16,7 @@
 	$entity = get_entity(get_input('feed_guid'));
 	$limit = get_input("limit", 10);
 	$offset = get_input("offset", 0);
+	
 		
 	$body = elgg_view('opendd/profile', array('entity' => $entity));
 	
@@ -72,6 +73,9 @@
 	else
 		$body .= sprintf(elgg_echo('opendd:nodata'), $http_response_header[0]);
 	
+	
+	$title = $entity->feedurl;
+		
 	// Finally draw the page
-	page_draw($vars['entity']->feedurl,elgg_view_layout('one_column', $body));
+	page_draw($title,elgg_view_layout('one_column', elgg_view_title($title) . $body));
 ?>
\ No newline at end of file
diff --git a/mod/opendd/viewuuid.php b/mod/opendd/viewuuid.php
index 8da644c96..fdda2434a 100644
--- a/mod/opendd/viewuuid.php
+++ b/mod/opendd/viewuuid.php
@@ -17,20 +17,20 @@
 	// Fetch the UUID as an object
 	$odd = opendd_fetch_uuid($uuid);
 	
-	$body = "";
+	$body = elgg_view_title($uuid);
 	foreach ($odd as $o)
 	{
 		if ($o instanceof ODDMetaData)
 		{
 			if (($o->getAttribute('name') == 'renderedentity') && ($o->getAttribute('type')=='volatile'))
-				$body = $o->getBody();
+				$body .= $o->getBody();
 		}
 	}
 	
 	if ($body=="")
 	{
 		$entity = opendd_odd_to_elgg($odd);
-		$body = elgg_view_entity($entity, true);
+		$body .= elgg_view_entity($entity, true);
 	}
 	
 	$body = elgg_view_layout('one_column',$body);