sse: template fixes, fix missing forum notifications and minor impovements

4 files changed, 12 insertions, 8 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 95eb1daad..e8b8051bb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -736,6 +736,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 					'delete' => t('Delete'),
 					'preview_lbl' => $preview_lbl,
 					'id' => (($preview) ? 'P0' : $item['item_id']),
+					'mids' => json_encode(['b64.' . base64url_encode($item['mid'])]),
 					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url),
 					'profile_url' => $profile_link,
 					'thread_action_menu' => thread_action_menu($item,$mode),
diff --git a/view/js/main.js b/view/js/main.js
index 043718839..8dd9d5b80 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -722,6 +722,8 @@ function updateConvItems(mode,data) {
 
 	if(followUpPageLoad)
 		sse_bs_counts();
+	else
+		sse_bs_init();
 
 	// reset rotators and cursors we may have set before reaching this place
 
@@ -870,7 +872,9 @@ function updateInit() {
 	if(src) {
 		liveUpdate();
 	}
-	sse_bs_init();
+	else {
+		sse_bs_init();
+	}
 
 	if($('#live-photos').length || $('#live-cards').length || $('#live-articles').length ) {
 		if(liking) {
@@ -1672,18 +1676,16 @@ function sse_bs_notifications(e, replace, followup) {
 function sse_handleNotifications(obj, replace, followup) {
 
 	var primary_notifications = ['home', 'intros', 'register', 'mail', 'notify', 'files'];
-	var secondary_notifications = ['network', 'all_events', 'pubs'];
+	var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
 	var all_notifications = primary_notifications.concat(secondary_notifications);
 
 	all_notifications.forEach(function(type, index) {
 		if(obj[type] && obj[type].count) {
 			$('.' + type + '-button').fadeIn();
-
 			if(replace || followup)
 				$('.' + type + '-update').html(Number(obj[type].count));
 			else
 				$('.' + type + '-update').html(Number(obj[type].count) + Number($('.' + type + '-update').html()));
-
 		}
 		if(obj[type] && obj[type].notifications.length)
 			sse_handleNotificationsItems(type, obj[type].notifications, replace, followup);
@@ -1780,8 +1782,9 @@ function sse_updateNotifications(type, mid, interactive) {
 			sse_setNotificationsStatus();
 		});
 	}
-	else
+	else {
 		$('.' + type + '-update').html(count);
+	}
 
 	if(! interactive)
 		return true;
@@ -1794,7 +1797,7 @@ function sse_updateNotifications(type, mid, interactive) {
 
 function sse_setNotificationsStatus() {
 	var primary_notifications = ['home', 'intros', 'register', 'mail', 'notify', 'files'];
-	var secondary_notifications = ['network', 'all_events', 'pubs'];
+	var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
 	var all_notifications = primary_notifications.concat(secondary_notifications);
 
 	var primary_available = false;
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index b244311bb..11c5ce792 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}}" data-b64mid="{{$item.mid}}">
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}}" data-b64mids='{{$item.mids}}'>
 		<a name="item_{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 3197fb893..198b71e9c 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -1,4 +1,4 @@
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} clearfix generic-content-wrapper{{/if}}">
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} clearfix generic-content-wrapper{{/if}}" data-b64mids='{{$item.mids}}'>
 	<a name="{{$item.id}}" ></a>
 	<div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}">