aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-22 21:01:58 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-22 21:01:58 +0200
commit0061ac8584feb6d18962518263ab18617dbf8dc5 (patch)
treef3e357a7a0b3dee0440989d0557b7dfdf4f78fbb /view
parentc80f4feb6234ff195171a92704d7ebe24aff4336 (diff)
downloadvolse-hubzilla-0061ac8584feb6d18962518263ab18617dbf8dc5.tar.gz
volse-hubzilla-0061ac8584feb6d18962518263ab18617dbf8dc5.tar.bz2
volse-hubzilla-0061ac8584feb6d18962518263ab18617dbf8dc5.zip
do not show seen notifys in notifications - show them in mod notifications instead. Update notifications count also on notifications updates
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js1
-rwxr-xr-xview/tpl/notify.tpl11
2 files changed, 10 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index b4c2bcf5d..882f50e8a 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -946,6 +946,7 @@ function notify_popup_loader(notifyType) {
$("#navbar-" + notifyType + "-menu").html(notifications_all + notifications_mark);
$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark);
+ $("." + notifyType + "-update").html(data.notify.length);
$(data.notify).each(function() {
html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
index ae6e160b1..b5bccc8a4 100755
--- a/view/tpl/notify.tpl
+++ b/view/tpl/notify.tpl
@@ -1,3 +1,10 @@
-<div class="mb-2 notif-item">
- <a href="{{$item_link}}"><img src="{{$item_image}}" class="menu-img-1">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+<div class="mb-4 notif-item">
+ {{if ! $item_seen}}
+ <span class="float-right badge badge-pill badge-success text-uppercase">{{$new}}</span>
+ {{/if}}
+ <a href="{{$item_link}}">
+ <img src="{{$item_image}}" class="menu-img-3">
+ <span class="{{if $item_seen}}text-muted{{/if}}">{{$item_text}}</span><br>
+ <span class="dropdown-sub-text">{{$item_when}}</span>
+ </a>
</div>