diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 08398bb43a27ddbd1ff2f9e1c6cc38634a1a7120..e7f9bbbc62f77262508da7178a00126adc86acb6 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,14 +4,14 @@
*/
.event-item {
font-size: $gl-font-size;
- padding: $gl-padding-top 0 $gl-padding-top ($gl-avatar-size + $gl-padding-top);
+ padding: $gl-padding-top 0 $gl-padding-top 40px;
border-bottom: 1px solid $white-normal;
color: $list-text-color;
+ position: relative;
&.event-inline {
- .avatar {
- position: relative;
- top: -2px;
+ .profile-icon {
+ top: 20px;
}
.event-title,
@@ -24,8 +24,28 @@
color: $gl-text-color;
}
- .avatar {
- margin-left: -($gl-avatar-size + $gl-padding-top);
+ .profile-icon {
+ position: absolute;
+ left: 0;
+ top: 14px;
+
+ svg {
+ width: 20px;
+ height: auto;
+ fill: $gl-text-color-secondary;
+ }
+
+ &.open-icon svg {
+ fill: $green-300;
+ }
+
+ &.closed-icon svg {
+ fill: $red-300;
+ }
+
+ &.fork-icon svg {
+ fill: $blue-300;
+ }
}
.event-title {
@@ -163,7 +183,7 @@
max-width: 100%;
}
- .avatar {
+ .profile-icon {
display: none;
}
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index a0bd14df2096cd7462c29bcd701f04431f8a89ed..53a33adc14dcf20c62450e17e146618016c22465 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -3,8 +3,6 @@
.event-item-timestamp
#{time_ago_with_tooltip(event.created_at)}
- = author_avatar(event, size: 40)
-
- if event.created_project?
= render "events/event/created_project", event: event
- elsif event.push?
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 2fb6b5647dab42df16a2680a1c83c4f9429ae986..2a98e58a03a0b1201fb17efdedd60c6cd985ea48 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -1,5 +1,15 @@
+- 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("code_fork")
+
.event-title
- %span.author_name= link_to_author event
%span{ class: event.action_name }
- if event.target
= event.action_name
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 80cf2344fe12fde0cef50711db040d5136b61eec..340d8c61026f505d9e696a3f61eec00826cce60a 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -1,5 +1,7 @@
+.profile-icon.open-icon
+ = custom_icon("icon_status_open")
+
.event-title
- %span.author_name= link_to_author event
%span{ class: event.action_name }
= event_action_name(event)
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 64b5a733b77987b54c1dd0e78626f0727a584aa9..603bed6d7050bacfcdd9f212bfdc472bb6ec80d1 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -1,5 +1,7 @@
+.profile-icon
+ = custom_icon("comment_o")
+
.event-title
- %span.author_name= link_to_author event
= event.action_name
= event_note_title_html(event)
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index efd13aabf20743c1cf17628230a67b1f50c4e1aa..1583f3807371ecb11538382a83eafda75055f1c9 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -1,7 +1,12 @@
- project = event.project
+.profile-icon
+ - if event.action_name == "deleted"
+ = custom_icon("trash_o")
+ - else
+ = custom_icon("icon_commit")
+
.event-title
- %span.author_name= link_to_author event
%span.pushed #{event.action_name} #{event.ref_type}
%strong
- commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name)
@@ -48,4 +53,3 @@
.event-body
%ul.well-list.event_commits
= render "events/commit", commit: last_commit, project: project, event: event
-
diff --git a/app/views/shared/icons/_code_fork.svg b/app/views/shared/icons/_code_fork.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8347dce2d5b2972b725bc9b34dee9c46eec8ef53
--- /dev/null
+++ b/app/views/shared/icons/_code_fork.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/views/shared/icons/_comment_o.svg b/app/views/shared/icons/_comment_o.svg
new file mode 100644
index 0000000000000000000000000000000000000000..55807f0840a43f670fe6de4e2962d733f843ef5c
--- /dev/null
+++ b/app/views/shared/icons/_comment_o.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/views/shared/icons/_icon_commit.svg b/app/views/shared/icons/_icon_commit.svg
index 0e96035b7b74ec9232d18f33ba094f4f2bdb9bb7..15e83dfdb531bf2fe9087288313c36b57e9225b8 100644
--- a/app/views/shared/icons/_icon_commit.svg
+++ b/app/views/shared/icons/_icon_commit.svg
@@ -1,3 +1 @@
-
+
\ No newline at end of file
diff --git a/app/views/shared/icons/_icon_status_closed.svg b/app/views/shared/icons/_icon_status_closed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..de448ee11940e6198ae69e07bc461f5b0fd25b58
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_closed.svg
@@ -0,0 +1 @@
+
diff --git a/app/views/shared/icons/_icon_status_open.svg b/app/views/shared/icons/_icon_status_open.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ed58d23c6266967c5b8d40c9202a6a355103706e
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_open.svg
@@ -0,0 +1 @@
+
diff --git a/app/views/shared/icons/_trash_o.svg b/app/views/shared/icons/_trash_o.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ea073d7fe67ee597043689f6e4856a2c730b0b78
--- /dev/null
+++ b/app/views/shared/icons/_trash_o.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/changelogs/unreleased/29128-profile-page-icons.yml b/changelogs/unreleased/29128-profile-page-icons.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0215f5c0e8f2c6492df17fab505c1a52ede0492a
--- /dev/null
+++ b/changelogs/unreleased/29128-profile-page-icons.yml
@@ -0,0 +1,4 @@
+---
+title: Add helpful icons to profile events
+merge_request:
+author:
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 782009a32a7328c29ead608c3353f8cd4b234abb..4ee879fe922b3e3a5803e612c595a6e86633a57c 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -97,7 +97,7 @@ module SharedProject
step 'I should see project "Shop" activity feed' do
project = Project.find_by(name: "Shop")
- expect(page).to have_content "#{@user.name} pushed new branch fix at #{project.name_with_namespace}"
+ expect(page).to have_content "pushed new branch fix at #{project.name_with_namespace}"
end
step 'I should see project settings' do
diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb
index 49d93db58a930faaa8d53a89851c362f36eaffca..d62839a09ef299b0df088e67d2be2d17caea853b 100644
--- a/spec/features/dashboard/project_member_activity_index_spec.rb
+++ b/spec/features/dashboard/project_member_activity_index_spec.rb
@@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do
context 'when a user joins the project' do
before { visit_activities_and_wait_with_event(Event::JOINED) }
- it { is_expected.to eq("#{user.name} joined project") }
+ it { is_expected.to eq("joined project") }
end
context 'when a user leaves the project' do
before { visit_activities_and_wait_with_event(Event::LEFT) }
- it { is_expected.to eq("#{user.name} left project") }
+ it { is_expected.to eq("left project") }
end
context 'when a users membership expires for the project' do
before { visit_activities_and_wait_with_event(Event::EXPIRED) }
it "presents the correct message" do
- message = "#{user.name} removed due to membership expiration from project"
+ message = "removed due to membership expiration from project"
is_expected.to eq(message)
end
end