Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-17 09:21:16 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-17 09:21:16 +0400
commit494cd02b38eb2bfbeeb69dec0688a7a1e7ccf50f (patch)
tree0af44634117eb25883ab2edb1190d31202d22973 /app/views/events
parenta3bb9ca1fa2e6c3e6a75d416e09cbdcb61fcd1e0 (diff)
Colored labels for events on dashboard
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/_event_issue.html.haml4
-rw-r--r--app/views/events/_event_merge_request.html.haml4
-rw-r--r--app/views/events/_event_push.html.haml2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/events/_event_issue.html.haml b/app/views/events/_event_issue.html.haml
index 13fb20cd379..4293be8204e 100644
--- a/app/views/events/_event_issue.html.haml
+++ b/app/views/events/_event_issue.html.haml
@@ -1,7 +1,7 @@
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
-%span.event_label= event.action_name
-&nbsp;issue
+%span.event_label{:class => event.action_name}= event.action_name
+issue
= link_to project_issue_path(event.project, event.issue) do
%strong= truncate event.issue_title
at
diff --git a/app/views/events/_event_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml
index e59a74b9554..774921a7f2a 100644
--- a/app/views/events/_event_merge_request.html.haml
+++ b/app/views/events/_event_merge_request.html.haml
@@ -2,8 +2,8 @@
.event_icon= image_tag "event_mr_merged.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
-%span.event_label= event.action_name
-&nbsp;merge request
+%span.event_label{:class => event.action_name}= event.action_name
+merge request
= link_to project_merge_request_path(event.project, event.merge_request) do
%strong= truncate event.merge_request_title
at
diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml
index 3aadd226614..59d8962bb16 100644
--- a/app/views/events/_event_push.html.haml
+++ b/app/views/events/_event_push.html.haml
@@ -2,7 +2,7 @@
.event_icon= image_tag "event_push.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
- %span.event_label= event.push_action_name
+ %span.event_label.pushed= event.push_action_name
= event.ref_type
= link_to project_commits_path(event.project, :ref => event.ref_name) do
%strong= event.ref_name