aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-04-12 11:07:24 +0300
committerGravatar Vitaly Takmazov2018-04-12 11:07:24 +0300
commit2048543036133fd2a563664fd6d6346e4e49ebe5 (patch)
treecb5884895a20f133f5c63ea3c3467583ef2a8ef1 /juick-www/src
parent97ffb90f765078aca3e4d6d173a6c93182d9165c (diff)
www: unread discussions badge
Diffstat (limited to 'juick-www/src')
-rw-r--r--juick-www/src/main/assets/style.css1
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java1
-rw-r--r--juick-www/src/main/resources/templates/views/partial/navigation.html2
3 files changed, 3 insertions, 1 deletions
diff --git a/juick-www/src/main/assets/style.css b/juick-www/src/main/assets/style.css
index d2cb984f..077465ab 100644
--- a/juick-www/src/main/assets/style.css
+++ b/juick-www/src/main/assets/style.css
@@ -349,6 +349,7 @@ article .tags {
min-height: 1px;
}
article .tags > a,
+.badge,
.msg-tags > a {
background: #eee;
border: 1px solid #eee;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java b/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
index 5bbea56b..e840b767 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
@@ -79,6 +79,7 @@ public class MessagesWWW {
model.addAttribute("iread", userService.getUserReadLeastPopular(user.getUid(), 8));
model.addAttribute("tagStats", tagService.getUserTagStats(user.getUid())
.stream().sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).limit(20).map(t -> t.getTag().getName()).collect(Collectors.toList()));
+ model.addAttribute("unread", messagesService.getUnread(visitor));
}
@GetMapping("/")
diff --git a/juick-www/src/main/resources/templates/views/partial/navigation.html b/juick-www/src/main/resources/templates/views/partial/navigation.html
index 5affcdd8..4e3a6ae3 100644
--- a/juick-www/src/main/resources/templates/views/partial/navigation.html
+++ b/juick-www/src/main/resources/templates/views/partial/navigation.html
@@ -18,7 +18,7 @@
<nav id="global">
<ul>
{% if visitor.uid > 0 %}
- <li><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i>{{ i18n("messages","link.discuss") }}</a></li>
+ <li><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i>{{ i18n("messages","link.discuss") }}{% if unread > 0 %}<span class="badge">{{ unread }}</span>{% endif %}</a></li>
{% else %}
<li><a href="/?show=photos" rel="nofollow"><i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}</a></li>
{% endif %}