if startpage is /hq redirect all notifications links to /hq and minor notifications and hq fixes

6 files changed, 44 insertions, 48 deletions

diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index a9c3bb8e2..c305fdb3b 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -29,6 +29,8 @@ class Hq extends \Zotlabs\Web\Controller {
 			);
 		}
 
+		killme();
+
 	}
 
 	function get($update = 0, $load = false) {
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 5a0c1f3d5..322a7b60a 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -145,7 +145,8 @@ class Notifications {
 			'$module' => \App::$module,
 			'$notifications' => $notifications,
 			'$no_notifications' => t('Sorry, you have got no notifications at the moment'),
-			'$loading' => t('Loading')
+			'$loading' => t('Loading'),
+			'$startpage' => get_pconfig(local_channel(), 'system', 'startpage')
 		));
 
 		return $o;
diff --git a/boot.php b/boot.php
index cb682de31..c4c4dbc5b 100755
--- a/boot.php
+++ b/boot.php
@@ -51,7 +51,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.1.4' );
+define ( 'STD_VERSION',             '3.1.5' );
 define ( 'ZOT_REVISION',            '1.3' );
 
 define ( 'DB_UPDATE_VERSION',       1198  );
diff --git a/view/js/main.js b/view/js/main.js
index 13d002968..35f723a58 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -456,11 +456,7 @@ function handleNotificationsItems(notifyType, data) {
 		notify_menu.append(html);
 	});
 
-	$(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){
-		// Replace data-src attribute with src attribute for every image
-		$(el).attr('src', $(el).data("src"));
-		$(el).removeAttr("data-src");
-	});
+	datasrc2src('#notifications .notification img[data-src]');
 
 	if($('#tt-' + notifyType + '-only').hasClass('active'))
 		$('#nav-' + notifyType + '-menu [data-thread_top=false]').hide();
@@ -834,7 +830,7 @@ function liveUpdate(notify_id) {
 		// else data was valid - reset the recursion counter
 		liveRecurse = 0;
 
-		if(typeof notify_id !== 'undefined') {
+		if(typeof notify_id !== 'undefined' && notify_id !== 'undefined') {
 			$.post(
 				"hq",
 				{
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl
index fce11ff83..099d892bb 100755
--- a/view/tpl/hq.tpl
+++ b/view/tpl/hq.tpl
@@ -1,13 +1,3 @@
-{{if $no_messages}}
-<div class="alert alert-warning alert-dismissible fade show" role="alert">
-	<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-		<span aria-hidden="true">&times;</span>
-	</button>
-	<h3>{{$no_messages_label.0}}</h3>
-	<br>
-	{{$no_messages_label.1}}
-</div>
-{{/if}}
 <div id="jot-popup">
 {{$editor}}
 </div>
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 69e5e15bc..e10062aed 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -21,7 +21,7 @@
 		};
 	});
 
-	{{if $module == 'display' || $module == 'hq'}}
+	{{if $module == 'display' || $module == 'hq' || $startpage == 'hq'}}
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var notify_id = $(this).data('notify_id');
@@ -31,30 +31,37 @@
 		if(b64mid === 'undefined' && notify_id === 'undefined')
 			return;
 
-		{{if $module == 'display'}}
-		history.pushState(stateObj, '', 'display/' + b64mid);
-		{{/if}}
-		{{if $module == 'hq'}}
-		history.pushState(stateObj, '', 'hq/' + b64mid);
-		{{/if}}
-
-		{{if $module == 'hq'}}
-		if(b64mid !== 'undefined') {
-		{{else}}
-		if(path === 'display' && b64mid) {
-		{{/if}}
+		{{if $module != 'hq' && $startpage == 'hq'}}
 			e.preventDefault();
-
-			if(! page_load) {
-				if($(this).parent().attr('id') !== 'nav-pubs-menu')
-					$(this).fadeOut();
-
-				getData(b64mid, notify_id);
+			window.location.href = 'hq/' + b64mid;
+			return;
+		{{else}}
+			{{if $module == 'display'}}
+			history.pushState(stateObj, '', 'display/' + b64mid);
+			{{/if}}
+
+			{{if $module == 'hq'}}
+			history.pushState(stateObj, '', 'hq/' + b64mid);
+			{{/if}}
+
+			{{if $module == 'hq'}}
+			if(b64mid !== 'undefined') {
+			{{else}}
+			if(path === 'display' && b64mid) {
+			{{/if}}
+				e.preventDefault();
+
+				if(! page_load) {
+					if($(this).parent().attr('id') !== 'nav-pubs-menu')
+						$(this).fadeOut();
+
+					getData(b64mid, notify_id);
+				}
+
+				if($('#notifications_wrapper').hasClass('fs'))
+					$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
 			}
-
-			if($('#notifications_wrapper').hasClass('fs'))
-				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
-		}
+		{{/if}}
 	});
 	{{/if}}
 
@@ -115,14 +122,14 @@
 	<div id="no_notifications" class="d-xl-none">
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 	</div>
-	<div id="nav-notifications-template" rel="template">
-		<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
-			<img class="menu-img-3" data-src="{1}">
-			<span class="contactname">{2}</span>
-			<span class="dropdown-sub-text">{3}<br>{4}</span>
-		</a>
-	</div>
 	<div id="notifications" class="navbar-nav">
+		<div id="nav-notifications-template" rel="template">
+			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
+				<img class="menu-img-3" data-src="{1}">
+				<span class="contactname">{2}</span>
+				<span class="dropdown-sub-text">{3}<br>{4}</span>
+			</a>
+		</div>
 		{{foreach $notifications as $notification}}
 		<div class="collapse {{$notification.type}}-button">
 			<a class="list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-type="{{$notification.type}}">