diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss index 44239f38f..557afc871 100644 --- a/app/assets/stylesheets/notifications.scss +++ b/app/assets/stylesheets/notifications.scss @@ -348,6 +348,9 @@ } } } + .single-notification { + cursor: default; + } .unseen { @include themeable( background, diff --git a/app/models/comment.rb b/app/models/comment.rb index 555f4f25c..e699d6c29 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -164,6 +164,8 @@ class Comment < ApplicationRecord end def title + return "[deleted]" if deleted + ActionController::Base.helpers.truncate(ActionController::Base.helpers.strip_tags(processed_html), length: 80) end diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb index 14ed792af..9f4f646cd 100644 --- a/app/views/comments/index.html.erb +++ b/app/views/comments/index.html.erb @@ -1,5 +1,5 @@ <% if @root_comment.present? %> - <% title truncate(strip_tags(@root_comment.processed_html), length: 100) + " — DEV" %> + <% title @root_comment.title + " — DEV" %> <% else %> <% title "Discussion of " + @commentable.title + " — DEV" %> <% end %> diff --git a/app/views/notifications/_notifications_list.html.erb b/app/views/notifications/_notifications_list.html.erb index fc18de2c4..641f0df28 100644 --- a/app/views/notifications/_notifications_list.html.erb +++ b/app/views/notifications/_notifications_list.html.erb @@ -2,7 +2,7 @@ <% @notifications.each do |notification| %> <% next if notification.notified_at < 24.hours.ago && notification.aggregated? %> <% notification_count += 1 %> -