From fc96cd371042a92ed180635b91924413392d3972 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 9 Nov 2017 11:34:41 +0100
Subject: load notifications links to /display via ajax if we are already in
 /display

---
 view/tpl/notifications_widget.tpl | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 6865879ad..dd4cc6377 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -26,11 +26,36 @@
 	}
 </style>
 
+{{if $module == 'display'}}
+<script>
+	$(document).on('click', '.notification', function(e) {
+		var b64mid = $(this).data('b64mid');
+
+		console.log(b64mid);
+
+		if(b64mid !== 'undefined') {
+			e.preventDefault();
+			e.stopPropagation();
+
+			$('.thread-wrapper').remove();
+			$(this).fadeOut();
+			bParam_mid = b64mid;
+			mode = 'replace';
+			page_load = true;
+			liveUpdate();
+
+			if($('#notifications_wrapper').hasClass('fs'))
+				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); //var notifications_parent is defined in redbasic.js
+		}
+	});
+</script>
+{{/if}}
+
 {{if $notifications}}
 <div id="notifications_wrapper">
 	<div id="notifications" class="navbar-nav" data-children=".nav-item">
 		<div id="nav-notifications-template" rel="template">
-			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}">
+			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}">
 				<img class="menu-img-3" data-src="{1}">
 				<span class="contactname">{2}</span>
 				<span class="dropdown-sub-text">{3}<br>{4}</span>
-- 
cgit v1.2.3


From 40a7446e3e1d52fa015ac9f2ce45b0c2b8df520f Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 9 Nov 2017 12:41:57 +0100
Subject: get the path infos from pathname instead of seperate data attribute

---
 view/tpl/notifications_widget.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index dd4cc6377..1e752c313 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -29,17 +29,16 @@
 {{if $module == 'display'}}
 <script>
 	$(document).on('click', '.notification', function(e) {
-		var b64mid = $(this).data('b64mid');
+		var mid = $(this)[0].pathname.substr(9);
+		var path = $(this)[0].pathname.substr(1,7);
 
-		console.log(b64mid);
-
-		if(b64mid !== 'undefined') {
+		if(path === 'display' && mid) {
 			e.preventDefault();
 			e.stopPropagation();
 
 			$('.thread-wrapper').remove();
 			$(this).fadeOut();
-			bParam_mid = b64mid;
+			bParam_mid = mid;
 			mode = 'replace';
 			page_load = true;
 			liveUpdate();
@@ -55,7 +54,7 @@
 <div id="notifications_wrapper">
 	<div id="notifications" class="navbar-nav" data-children=".nav-item">
 		<div id="nav-notifications-template" rel="template">
-			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}">
+			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}">
 				<img class="menu-img-3" data-src="{1}">
 				<span class="contactname">{2}</span>
 				<span class="dropdown-sub-text">{3}<br>{4}</span>
-- 
cgit v1.2.3


From 3a17225546c9cd8f74bd1b2701e974fdda5929a2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 10 Nov 2017 20:30:55 +0100
Subject: revert back to get the mid from enotify - otherwise we can not
 distinct between posts and likes

---
 view/tpl/notifications_widget.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 1e752c313..0ece84891 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -29,16 +29,16 @@
 {{if $module == 'display'}}
 <script>
 	$(document).on('click', '.notification', function(e) {
-		var mid = $(this)[0].pathname.substr(9);
+		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
 
-		if(path === 'display' && mid) {
+		if(path === 'display' && b64mid) {
 			e.preventDefault();
 			e.stopPropagation();
 
 			$('.thread-wrapper').remove();
 			$(this).fadeOut();
-			bParam_mid = mid;
+			bParam_mid = b64mid;
 			mode = 'replace';
 			page_load = true;
 			liveUpdate();
@@ -54,7 +54,7 @@
 <div id="notifications_wrapper">
 	<div id="notifications" class="navbar-nav" data-children=".nav-item">
 		<div id="nav-notifications-template" rel="template">
-			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}">
+			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}">
 				<img class="menu-img-3" data-src="{1}">
 				<span class="contactname">{2}</span>
 				<span class="dropdown-sub-text">{3}<br>{4}</span>
-- 
cgit v1.2.3


From 8d9c47acdf5644c6522cd4c0715891fab0a765dc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Nov 2017 22:35:58 +0100
Subject: move notifications full-screen handling to notifications widget

---
 view/tpl/notifications_widget.tpl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0ece84891..29892ba79 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -28,6 +28,22 @@
 
 {{if $module == 'display'}}
 <script>
+	var notifications_parent;
+	$(document).ready(function() {
+		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+		$('#notifications-btn').click(function() {
+			if($('#notifications_wrapper').hasClass('fs'))
+				$('#notifications_wrapper').prependTo('#' + notifications_parent);
+			else
+				$('#notifications_wrapper').prependTo('section');
+
+			$('#notifications_wrapper').toggleClass('fs');
+			if($('#navbar-collapse-2').hasClass('show')){
+				$('#navbar-collapse-2').removeClass('show');
+			}
+		});
+	});
+
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
-- 
cgit v1.2.3


From f50ae07560546afc50a10eae63c5e9395db968e1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Nov 2017 09:01:57 +0100
Subject: fix notifications again after recent changes

---
 view/tpl/notifications_widget.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 29892ba79..0095b8b85 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -26,7 +26,6 @@
 	}
 </style>
 
-{{if $module == 'display'}}
 <script>
 	var notifications_parent;
 	$(document).ready(function() {
@@ -44,6 +43,7 @@
 		});
 	});
 
+	{{if $module == 'display'}}
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
@@ -60,11 +60,12 @@
 			liveUpdate();
 
 			if($('#notifications_wrapper').hasClass('fs'))
-				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); //var notifications_parent is defined in redbasic.js
+				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
 		}
 	});
+	{{/if}}
 </script>
-{{/if}}
+
 
 {{if $notifications}}
 <div id="notifications_wrapper">
-- 
cgit v1.2.3


From ed0d7890abaf5566b8d5d71f689d750b87b79dec Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Nov 2017 09:07:33 +0100
Subject: move notifications style to widgets.css

---
 view/tpl/notifications_widget.tpl | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0095b8b85..3ef7bff7d 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -1,31 +1,3 @@
-<style>
-	.notification-content {
-		max-height: 70vh;
-		overflow: auto;
-	}
-
-	.notification-content.collapsing {
-		overflow: hidden;
-	}
-
-	.fs {
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		padding: 4.5rem .5rem 1rem .5rem;
-		background-color: white;
-		width: 100%;
-		max-width: 100%;
-		height: 100%;
-		z-index: 1029;
-		overflow: auto;
-	}
-
-	#notifications {
-		margin-bottom: 1rem;
-	}
-</style>
-
 <script>
 	var notifications_parent;
 	$(document).ready(function() {
-- 
cgit v1.2.3


From 76af8fa754467e13bcd8c83620ac1c174e777170 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 17 Nov 2017 13:54:53 +0100
Subject: inroduce the HQ module - a module with the potential to become a nice
 landing page for hubzilla. It is nothing more than a downgraded mod display
 atm.

---
 view/tpl/notifications_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 3ef7bff7d..ce64671d2 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -15,7 +15,7 @@
 		});
 	});
 
-	{{if $module == 'display'}}
+	{{if $module == 'display' || $module == 'hq'}}
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
-- 
cgit v1.2.3


From fbc57fa8e36e468abe81e4f3d72b3115cbdd794c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 18 Nov 2017 22:16:06 +0100
Subject: some more work on mod hq

---
 view/tpl/notifications_widget.tpl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index ce64671d2..136b14abd 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -18,18 +18,30 @@
 	{{if $module == 'display' || $module == 'hq'}}
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
+		var notify_id = $(this).data('notify_id');
 		var path = $(this)[0].pathname.substr(1,7);
 
+		{{if $module == 'hq'}}
+		if(b64mid !== 'undefined') {
+		{{else}}
 		if(path === 'display' && b64mid) {
+		{{/if}}
 			e.preventDefault();
 			e.stopPropagation();
 
 			$('.thread-wrapper').remove();
-			$(this).fadeOut();
+
+			if(! page_load)
+				$(this).fadeOut();
+
 			bParam_mid = b64mid;
 			mode = 'replace';
 			page_load = true;
+			{{if $module == 'hq'}}
+			hqLiveUpdate(notify_id);
+			{{else}}
 			liveUpdate();
+			{{/if}}
 
 			if($('#notifications_wrapper').hasClass('fs'))
 				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
@@ -43,7 +55,7 @@
 <div id="notifications_wrapper">
 	<div id="notifications" class="navbar-nav" data-children=".nav-item">
 		<div id="nav-notifications-template" rel="template">
-			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}">
+			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}">
 				<img class="menu-img-3" data-src="{1}">
 				<span class="contactname">{2}</span>
 				<span class="dropdown-sub-text">{3}<br>{4}</span>
-- 
cgit v1.2.3


From 1c75e71eb3f634dd3cbd24d58f0cf3a483954fd9 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 18 Nov 2017 22:31:32 +0100
Subject: pubstream is not yet supported in mod hq

---
 view/tpl/notifications_widget.tpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 136b14abd..fda2d3511 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -21,8 +21,10 @@
 		var notify_id = $(this).data('notify_id');
 		var path = $(this)[0].pathname.substr(1,7);
 
+		console.log(path);
+
 		{{if $module == 'hq'}}
-		if(b64mid !== 'undefined') {
+		if(b64mid !== 'undefined' && path !== 'pubstre') {
 		{{else}}
 		if(path === 'display' && b64mid) {
 		{{/if}}
-- 
cgit v1.2.3


From 3efe144fa0c455529a3f6244557d1253885134cf Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 19 Nov 2017 21:41:45 +0100
Subject: revisit media breakpoints - do not switch to mobile view to early.

---
 view/tpl/notifications_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index fda2d3511..8168866ad 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -2,7 +2,7 @@
 	var notifications_parent;
 	$(document).ready(function() {
 		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
-		$('#notifications-btn').click(function() {
+		$('.notifications-btn').click(function() {
 			if($('#notifications_wrapper').hasClass('fs'))
 				$('#notifications_wrapper').prependTo('#' + notifications_parent);
 			else
-- 
cgit v1.2.3


From 159d6469fd45818dd24137894ce1792531753417 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 21 Nov 2017 10:19:50 +0100
Subject: make browser history buttons work with ajax calls in /display and /hq

---
 view/tpl/notifications_widget.tpl | 42 +++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 13 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 8168866ad..8ab9a79a0 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -1,5 +1,6 @@
 <script>
 	var notifications_parent;
+
 	$(document).ready(function() {
 		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
 		$('.notifications-btn').click(function() {
@@ -13,6 +14,11 @@
 				$('#navbar-collapse-2').removeClass('show');
 			}
 		});
+
+		window.onpopstate = function(e) {
+			if(e.state !== null)
+				getData(e.state.b64mid, '');
+		};
 	});
 
 	{{if $module == 'display' || $module == 'hq'}}
@@ -20,8 +26,14 @@
 		var b64mid = $(this).data('b64mid');
 		var notify_id = $(this).data('notify_id');
 		var path = $(this)[0].pathname.substr(1,7);
+		var stateObj = { b64mid: b64mid };
 
-		console.log(path);
+		{{if $module == 'display'}}
+		history.pushState(stateObj, '', 'display/' + b64mid);
+		{{/if}}
+		{{if $module == 'hq'}}
+		history.pushState(stateObj, '', 'hq/' + b64mid);
+		{{/if}}
 
 		{{if $module == 'hq'}}
 		if(b64mid !== 'undefined' && path !== 'pubstre') {
@@ -31,25 +43,29 @@
 			e.preventDefault();
 			e.stopPropagation();
 
-			$('.thread-wrapper').remove();
-
-			if(! page_load)
+			if(! page_load) {
 				$(this).fadeOut();
-
-			bParam_mid = b64mid;
-			mode = 'replace';
-			page_load = true;
-			{{if $module == 'hq'}}
-			hqLiveUpdate(notify_id);
-			{{else}}
-			liveUpdate();
-			{{/if}}
+				getData(b64mid, notify_id);
+			}
 
 			if($('#notifications_wrapper').hasClass('fs'))
 				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
 		}
 	});
 	{{/if}}
+
+	function getData(b64mid, notify_id) {
+		$('.thread-wrapper').remove();
+		bParam_mid = b64mid;
+		mode = 'replace';
+		page_load = true;
+		{{if $module == 'hq'}}
+		hqLiveUpdate(notify_id);
+		{{/if}}
+		{{if $module == 'display'}}
+		liveUpdate();
+		{{/if}}
+	}
 </script>
 
 
-- 
cgit v1.2.3


From 4b2bd871b765e0287f329ad398a15f20cb6a6425 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 25 Nov 2017 10:44:47 +0100
Subject: implement pubstream items in mod hq

---
 view/tpl/notifications_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 8ab9a79a0..eeb2011cd 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -36,7 +36,7 @@
 		{{/if}}
 
 		{{if $module == 'hq'}}
-		if(b64mid !== 'undefined' && path !== 'pubstre') {
+		if(b64mid !== 'undefined') {
 		{{else}}
 		if(path === 'display' && b64mid) {
 		{{/if}}
-- 
cgit v1.2.3


From 56772e4807de635b6cc127f0d2a22f7877cf77ff Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 27 Nov 2017 12:59:14 +0100
Subject: do not stop click propagation

---
 view/tpl/notifications_widget.tpl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index eeb2011cd..e8d51caca 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -41,7 +41,6 @@
 		if(path === 'display' && b64mid) {
 		{{/if}}
 			e.preventDefault();
-			e.stopPropagation();
 
 			if(! page_load) {
 				$(this).fadeOut();
-- 
cgit v1.2.3


From e6a59ad36fcdbe4dcb534ff700663d9588b5d734 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Nov 2017 11:22:59 +0100
Subject: allow an optional notify_id arg for liveUpdate()

---
 view/tpl/notifications_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index e8d51caca..60acb1654 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -59,7 +59,7 @@
 		mode = 'replace';
 		page_load = true;
 		{{if $module == 'hq'}}
-		hqLiveUpdate(notify_id);
+		liveUpdate(notify_id);
 		{{/if}}
 		{{if $module == 'display'}}
 		liveUpdate();
-- 
cgit v1.2.3


From bc0f4b4fa5dc80f314eb72256c17051b66ba3979 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Nov 2017 11:26:33 +0100
Subject: an additional on touch event might improve things for mobile handling

---
 view/tpl/notifications_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 60acb1654..18f3ef12d 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -22,7 +22,7 @@
 	});
 
 	{{if $module == 'display' || $module == 'hq'}}
-	$(document).on('click', '.notification', function(e) {
+	$(document).on('click touch', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var notify_id = $(this).data('notify_id');
 		var path = $(this)[0].pathname.substr(1,7);
-- 
cgit v1.2.3


From dcad9ce26a0de72ba3ad5b86ddb62298598ac380 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 1 Dec 2017 21:00:39 +0100
Subject: add a filter for notification to show new posts only

---
 view/tpl/notifications_widget.tpl | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 18f3ef12d..90f03faf0 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -22,7 +22,7 @@
 	});
 
 	{{if $module == 'display' || $module == 'hq'}}
-	$(document).on('click touch', '.notification', function(e) {
+	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var notify_id = $(this).data('notify_id');
 		var path = $(this)[0].pathname.substr(1,7);
@@ -53,6 +53,16 @@
 	});
 	{{/if}}
 
+	{{foreach $notifications as $notification}}
+	{{if $notification.filter}}
+	$(document).on('click', '#tt-{{$notification.type}}-only', function(e) {
+		e.preventDefault();
+		$('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle();
+		$(this).toggleClass('active');
+	});
+	{{/if}}
+	{{/foreach}}
+
 	function getData(b64mid, notify_id) {
 		$('.thread-wrapper').remove();
 		bParam_mid = b64mid;
@@ -72,7 +82,7 @@
 <div id="notifications_wrapper">
 	<div id="notifications" class="navbar-nav" data-children=".nav-item">
 		<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}">
+			<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}">
 				<img class="menu-img-3" data-src="{1}">
 				<span class="contactname">{2}</span>
 				<span class="dropdown-sub-text">{3}<br>{4}</span>
@@ -91,9 +101,14 @@
 				</a>
 				{{/if}}
 				{{if $notification.markall}}
-				<a class="list-group-item text-dark" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">
+				<div class="list-group-item" id="nav-{{$notification.type}}-mark-all" onclick="markRead('{{$notification.type}}'); return false;">
 					<i class="fa fa-fw fa-check"></i> {{$notification.markall.label}}
-				</a>
+				</div>
+				{{/if}}
+				{{if $notification.filter}}
+				<div class="list-group-item" id="tt-{{$notification.type}}-only">
+					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.label}}
+				</div>
 				{{/if}}
 				{{$loading}}
 			</div>
-- 
cgit v1.2.3


From 9a04b49585f06b61cbdd31065bee0e3be52ad16a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 1 Dec 2017 21:06:44 +0100
Subject: add a cursor-pointer class

---
 view/tpl/notifications_widget.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 90f03faf0..9751f2e75 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -101,12 +101,12 @@
 				</a>
 				{{/if}}
 				{{if $notification.markall}}
-				<div class="list-group-item" id="nav-{{$notification.type}}-mark-all" onclick="markRead('{{$notification.type}}'); return false;">
+				<div class="list-group-item cursor-pointer" id="nav-{{$notification.type}}-mark-all" onclick="markRead('{{$notification.type}}'); return false;">
 					<i class="fa fa-fw fa-check"></i> {{$notification.markall.label}}
 				</div>
 				{{/if}}
 				{{if $notification.filter}}
-				<div class="list-group-item" id="tt-{{$notification.type}}-only">
+				<div class="list-group-item cursor-pointer" id="tt-{{$notification.type}}-only">
 					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.label}}
 				</div>
 				{{/if}}
-- 
cgit v1.2.3


From 5b1ef760a06dd892a6decf6a621e710b5ae4e7bd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 11 Dec 2017 16:50:25 +0100
Subject: notification: slight animation for loading... and do not remove
 public stream items on click (we can not mark them read)

---
 view/tpl/notifications_widget.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 9751f2e75..0974045fe 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -43,7 +43,9 @@
 			e.preventDefault();
 
 			if(! page_load) {
-				$(this).fadeOut();
+				if($(this).parent().attr('id') !== 'nav-pubs-menu')
+					$(this).fadeOut();
+
 				getData(b64mid, notify_id);
 			}
 
@@ -110,7 +112,7 @@
 					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.label}}
 				</div>
 				{{/if}}
-				{{$loading}}
+				{{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 			</div>
 		</div>
 		{{/foreach}}
-- 
cgit v1.2.3


From ab3b126ff6a3dd76292c6c96482ed6835df966f6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 18 Dec 2017 12:46:37 +0100
Subject: notifications: only handle item otype notify_ids

---
 view/tpl/notifications_widget.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0974045fe..299c07592 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -28,6 +28,9 @@
 		var path = $(this)[0].pathname.substr(1,7);
 		var stateObj = { b64mid: b64mid };
 
+		if(b64mid === 'undefined' && notify_id === 'undefined')
+			return;
+
 		{{if $module == 'display'}}
 		history.pushState(stateObj, '', 'display/' + b64mid);
 		{{/if}}
-- 
cgit v1.2.3


From ffe058d48f5a8c4d38c893ece09cdaac8078e9e5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 6 Jan 2018 12:16:45 +0100
Subject: make active notifications filter sticky

---
 view/tpl/notifications_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 299c07592..095fa8056 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -63,7 +63,7 @@
 	$(document).on('click', '#tt-{{$notification.type}}-only', function(e) {
 		e.preventDefault();
 		$('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle();
-		$(this).toggleClass('active');
+		$(this).toggleClass('active sticky-top');
 	});
 	{{/if}}
 	{{/foreach}}
-- 
cgit v1.2.3


From fefc78a849ade52927f6ae88a3c1f03501d66930 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 7 Jan 2018 19:14:19 +0100
Subject: start with nonactive state for the notifications button and display
 some text if there are no notifications on small screens only

---
 view/tpl/notifications_widget.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 095fa8056..9d2e08c41 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -85,6 +85,9 @@
 
 {{if $notifications}}
 <div id="notifications_wrapper">
+	<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="notifications" class="navbar-nav" data-children=".nav-item">
 		<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}">
-- 
cgit v1.2.3