FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix comment notifications and markdownify content

This commit is contained in:
pixeldesu 2015-09-16 22:46:33 +02:00
parent ede3ad1b92
commit 24f7ff98ec
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/layouts/_notifications.html.haml
View File

@ -39,12 +39,12 @@
.media.question-media
.media-body
%h6.notification--list-heading question
.notification--list-content= notification.target.question.content
.notification--list-content= markdown notification.target.question.content
.list-group-item
.media.question-media
.media-body
%h6.notification--list-heading answer
.notification--list-content= notification.target.content
.notification--list-content= markdown notification.target.content
- when "Relationship"
.pull-left
%img.img-rounded.notification--dropdown-img{src: notification.target.source.profile_picture.url(:small)}
@ -69,7 +69,7 @@
.media.question-media
.media-body
%h6.notification--list-heading answer
.notification--list-content= notification.target.answer.content
.notification--list-content= markdown notification.target.answer.content
- when "CommentSmile"
.pull-left
%i.fa.fa-2x.fa-fw.fa-smile-o
@ -86,7 +86,7 @@
.media.question-media
.media-body
%h6.notification--list-heading comment
.notification--list-content= notification.target.comment.content
.notification--list-content= markdown notification.target.comment.content
- when "Comment"
.pull-left
%i.fa.fa-2x.fa-fw.fa-comments
@ -100,7 +100,7 @@
- elsif notification.target.user == notification.target.answer.user
= link_to "their answer", show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)
- else
= link_to "#{notification.target.user.screen_name}'s answer", show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)
= link_to "#{notification.target.answer.user.screen_name}'s answer", show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)
= time_tooltip(notification.target)
ago
.list-group.notification--list
@ -108,12 +108,12 @@
.media.question-media
.media-body
%h6.notification--list-heading answer
.notification--list-content= notification.target.answer.content
.notification--list-content= markdown notification.target.answer.content
.list-group-item
.media.question-media
.media-body
%h6.notification--list-heading comment
.notification--list-content= notification.target.content
.notification--list-content= markdown notification.target.content
%li.text-center
%a{href: notifications_path}
%i.fa.fa-fw.fa-chevron-right

14
app/views/notifications/_notification.html.haml
View File

@ -17,12 +17,12 @@
.media.question-media
.media-body
%h6.notification--list-heading question
.notification--list-content= notification.target.question.content
.notification--list-content= markdown notification.target.question.content
.list-group-item
.media.question-media
.media-body
%h6.notification--list-heading answer
.notification--list-content= notification.target.content
.notification--list-content= markdown notification.target.content
- when "Relationship"
.pull-left
%img.img-rounded.notification--dropdown-img{src: notification.target.source.profile_picture.url(:small)}
@ -47,7 +47,7 @@
.media.question-media
.media-body
%h6.notification--list-heading answer
.notification--list-content= notification.target.answer.content
.notification--list-content= markdown notification.target.answer.content
- when "CommentSmile"
.pull-left
%i.fa.fa-2x.fa-fw.fa-smile-o
@ -64,7 +64,7 @@
.media.question-media
.media-body
%h6.notification--list-heading comment
.notification--list-content= notification.target.comment.content
.notification--list-content= markdown notification.target.comment.content
- when "Comment"
.pull-left
%i.fa.fa-2x.fa-fw.fa-comments
@ -78,7 +78,7 @@
- elsif notification.target.user == notification.target.answer.user
= link_to "their answer", show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)
- else
= link_to "#{notification.target.user.screen_name}'s answer", show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)
= link_to "#{notification.target.answer.user.screen_name}'s answer", show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)
= time_tooltip(notification.target)
ago
.list-group.notification--list
@ -86,9 +86,9 @@
.media.question-media
.media-body
%h6.notification--list-heading answer
.notification--list-content= notification.target.answer.content
.notification--list-content= markdown notification.target.answer.content
.list-group-item
.media.question-media
.media-body
%h6.notification--list-heading comment
.notification--list-content= notification.target.content
.notification--list-content= markdown notification.target.content