Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRaphael Sofaer <raphael@joindiaspora.com>2011-07-28 23:17:39 +0400
committerRaphael Sofaer <raphael@joindiaspora.com>2011-07-28 23:17:39 +0400
commitd043c745281a582803be1ba169e40076459afc91 (patch)
tree956b9d207e65741809b582b010c10fea9369bfa9 /app
parent06c08ec4d8bad7504bf85a964752c74702c9c86e (diff)
parentcb828ae9d46361d8448f71776f6fd8e9f16f1535 (diff)
Merge remote branch 'ticho/highlight-unread-conversations'
Diffstat (limited to 'app')
-rw-r--r--app/views/conversations/_conversation.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index 72bc1baa6..604088436 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -7,6 +7,9 @@
= person_image_tag(conversation.author)
.subject
+ - if unread_counts[conversation.id].to_i > 0
+ .unread_message_count
+ = unread_counts[conversation.id].to_i
.message_count
= conversation.messages.size