Merge pull request #908 from zzottel/master

set html title to item title in channel/mid and display pages

3 files changed, 17 insertions, 2 deletions

diff --git a/mod/channel.php b/mod/channel.php
index 788bacf70..109c9a596 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -329,8 +329,11 @@ function channel_content(&$a, $update = 0, $load = false) {
 		$o .= conversation($a,$items,'channel',$update,'traditional');
 	}
 
-	if((! $update) || ($_COOKIE['jsAvailable'] != 1))
+	if((! $update) || ($_COOKIE['jsAvailable'] != 1)) {
 		$o .= alt_pager($a,count($items));
+		if ($mid && $items[0]['title'])
+			$a->page['title'] = $items[0]['title'] . " - " . $a->page['title'];
+	}
 
 	if($mid) 
 		$o .= '<div id="content-complete"></div>';
diff --git a/mod/display.php b/mod/display.php
index c2e5c2426..d4a1acc5d 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -228,6 +228,9 @@ function display_content(&$a, $update = 0, $load = false) {
 		$o .= conversation($a, $items, 'display', $update, 'client');
 	} else {
 		$o .= conversation($a, $items, 'display', $update, 'traditional');
+		if ($items[0]['title'])
+			$a->page['title'] = $items[0]['title'] . " - " . $a->page['title'];
+
 	}
 
 	if($updateable) {
diff --git a/view/js/main.js b/view/js/main.js
index 18004726e..a10e91449 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -563,10 +563,19 @@ function updateConvItems(mode,data) {
 			}
 			prev = ident;
 		});
-
+		
 		if(loadingPage) {
 			loadingPage = false;
 		}
+
+		if (window.location.search.indexOf("mid=") != -1 || window.location.pathname.indexOf("display") != -1) {
+			var title = $(".wall-item-title").text();
+			title.replace(/^\s+/, '');
+			title.replace(/\s+$/, '');
+			if (title)
+				document.title = title + " - " + document.title;
+		}
+
 	}
 
 	$('.like-rotator').spin(false);