diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-10 10:58:41 -0500 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-10 10:58:41 -0500 |
commit | c7011c88901c7fa8972f02444bd5e3feef698ca4 (patch) | |
tree | 6aee9dbf789e3cb04e3cd192f93b959f981a7229 /app/views | |
parent | 9c576cc7e9414e64b4aac0544615e7d5e92c3558 (diff) | |
download | gitlab-ce-c7011c88901c7fa8972f02444bd5e3feef698ca4.tar.gz |
Use avatars instead of icons in activity view
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/events/event/_common.html.haml | 24 | ||||
-rw-r--r-- | app/views/events/event/_created_project.html.haml | 8 | ||||
-rw-r--r-- | app/views/events/event/_note.html.haml | 8 | ||||
-rw-r--r-- | app/views/events/event/_push.html.haml | 14 |
4 files changed, 35 insertions, 19 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index af97e9588a5..e6bb05e975e 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -1,13 +1,17 @@ -- if event.target - - if event.action_name == "opened" - .profile-icon.open-icon - = custom_icon("icon_status_open") - - elsif event.action_name == "closed" - .profile-icon.closed-icon - = custom_icon("icon_status_closed") - - else - .profile-icon.fork-icon - = custom_icon("icon_code_fork") +- if current_path?('dashboard#activity') + .system-note-image.user-avatar + = author_avatar(event, size: 32) +- else + - if event.target + - if event.action_name == "opened" + .system-note-image.open-icon + = custom_icon("icon_status_open") + - elsif event.action_name == "closed" + .system-note-image.closed-icon + = custom_icon("icon_status_closed") + - else + .system-note-image.fork-icon + = custom_icon("icon_code_fork") .event-title %span.author_name= link_to_author event diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml index fee85c94277..259533bd400 100644 --- a/app/views/events/event/_created_project.html.haml +++ b/app/views/events/event/_created_project.html.haml @@ -1,5 +1,9 @@ -.profile-icon.open-icon - = custom_icon("icon_status_open") +- if current_path?('dashboard#activity') + .system-note-image.user-avatar + = author_avatar(event, size: 32) +- else + .system-note-image.open-icon + = custom_icon("icon_status_open") .event-title %span.author_name= link_to_author event diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 83709f5e4d0..1785fe6ab16 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -1,5 +1,9 @@ -.profile-icon - = custom_icon("icon_comment_o") +- if current_path?('dashboard#activity') + .system-note-image.user-avatar + = author_avatar(event, size: 32) +- else + .system-note-image + = custom_icon("icon_comment_o") .event-title %span.author_name= link_to_author event diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index efdc8764acf..8acee9c1da0 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -1,10 +1,14 @@ - project = event.project -.profile-icon - - if event.action_name == "deleted" - = custom_icon("trash_o") - - else - = custom_icon("icon_commit") +- if current_path?('dashboard#activity') + .system-note-image.user-avatar + = author_avatar(event, size: 32) +- else + .system-note-image + - if event.action_name == "deleted" + = custom_icon("trash_o") + - else + = custom_icon("icon_commit") .event-title %span.author_name= link_to_author event |