Processing with note events. reformated dashboard for more events to handle
This commit is contained in:
parent
678e5355a3
commit
f2db188dbe
8 changed files with 73 additions and 33 deletions
|
@ -1,17 +1,15 @@
|
|||
- if event.allowed?
|
||||
- if event.proper?
|
||||
%div.event-item
|
||||
= event_image(event)
|
||||
%span.cgray.right
|
||||
#{time_ago_in_words(event.created_at)} ago.
|
||||
|
||||
= image_tag gravatar_icon(event.author_email), class: "avatar s24"
|
||||
|
||||
- if event.push?
|
||||
= render "events/event/push", event: event
|
||||
- if event.note?
|
||||
.clearfix
|
||||
- elsif event.note?
|
||||
= render "events/event/note", event: event
|
||||
- else
|
||||
= render "events/event/common", event: event
|
||||
|
||||
.clearfix
|
||||
%span.cgray.right
|
||||
= time_ago_in_words(event.created_at)
|
||||
ago.
|
||||
.clearfix
|
||||
|
|
|
@ -1,9 +1,13 @@
|
|||
.event-title
|
||||
%span.author_name= link_to_author event
|
||||
%span.event_label commented on #{event.target.noteable_type_name}
|
||||
- if event.target and event.target.noteable_id
|
||||
= link_to [event.project, event.target.noteable] do
|
||||
%strong= truncate event.target.noteable_id
|
||||
- if event.target and event.note_target
|
||||
- if event.note_commit?
|
||||
= link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
|
||||
- else
|
||||
= link_to [event.project, event.note_target] do
|
||||
%strong= truncate event.note_target_id
|
||||
|
||||
- else
|
||||
%strong (deleted)
|
||||
at
|
||||
|
@ -13,4 +17,7 @@
|
|||
= event.project_name
|
||||
|
||||
.event-body
|
||||
%p.hint= truncate event.target.note, length: 70
|
||||
%span.hint
|
||||
|
||||
%i.icon-comment
|
||||
= truncate event.target.note, length: 70
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue