deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Colored labels for events

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-09-24 13:33:51 +03:00
parent d23022c6f6
commit 6667f3dbf9
6 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
app/assets/stylesheets/sections/events.scss
View file

@ -3,33 +3,35 @@
* *
*/ */
.event_label { .event_label {
/*@extend .label;*/ &.pushed {
/*background-color: #999;*/ padding:0 2px;
@extend .alert;
@extend .alert-info;
}
/*&.pushed {*/ &.opened {
/*background-color: #4A97BD;*/ padding:0 2px;
/*}*/ @extend .alert;
@extend .alert-success;
}
/*&.opened {*/ &.closed {
/*background-color: #469847;*/ padding:0 2px;
/*}*/ @extend .alert;
@extend .alert-error;
}
/*&.closed {*/ &.merged {
/*background-color: #B94A48;*/ padding:0 2px;
/*}*/ @extend .alert;
@extend .alert-success;
}
/*&.merged {*/ &.left,
/*background-color: #2A2;*/ &.joined {
/*}*/ padding:0 2px;
@extend .alert;
/*&.joined {*/ }
/*background-color: #1ca9dd;*/
/*}*/
/*&.left {*/
/*background-color: #888;*/
/*float:none;*/
/*}*/
} }
/** /**
@ -43,13 +45,16 @@
color:#333; color:#333;
font-weight: bold; font-weight: bold;
.author_name { .author_name {
color:#777; color:#333;
} }
} }
.event-body { .event-body {
p { p {
color:#666; color:#666;
} }
.event-info {
color:#666;
}
} }
.avatar { .avatar {
width:32px; width:32px;

1
app/models/event.rb
View file

@ -132,6 +132,7 @@ class Event < ActiveRecord::Base
end end
end end
delegate :name, :email, to: :author, prefix: true, allow_nil: true delegate :name, :email, to: :author, prefix: true, allow_nil: true
delegate :title, to: :issue, prefix: true, allow_nil: true delegate :title, to: :issue, prefix: true, allow_nil: true
delegate :title, to: :merge_request, prefix: true, allow_nil: true delegate :title, to: :merge_request, prefix: true, allow_nil: true

3
app/views/events/_event_issue.html.haml
View file

@ -1,8 +1,7 @@
= image_tag gravatar_icon(event.author_email), class: "avatar" = image_tag gravatar_icon(event.author_email), class: "avatar"
.event-title .event-title
%strong.author_name #{event.author_name} %strong.author_name #{event.author_name}
%span.event_label{class: event.action_name}= event.action_name %span.event_label{class: event.action_name} #{event.action_name} issue
issue
= link_to project_issue_path(event.project, event.issue) do = link_to project_issue_path(event.project, event.issue) do
%strong= truncate event.issue_title %strong= truncate event.issue_title
at at

3
app/views/events/_event_membership_changed.html.haml
View file

@ -1,8 +1,7 @@
= image_tag gravatar_icon(event.author_email), class: "avatar" = image_tag gravatar_icon(event.author_email), class: "avatar"
.event-title .event-title
%strong.author_name #{event.author_name} %strong.author_name #{event.author_name}
%span.event_label{class: event.action_name}= event.action_name %span.event_label{class: event.action_name} #{event.action_name} project
project
%strong= link_to event.project_name, event.project %strong= link_to event.project_name, event.project
%span.cgray %span.cgray
= time_ago_in_words(event.created_at) = time_ago_in_words(event.created_at)

10
app/views/events/_event_merge_request.html.haml
View file

@ -3,14 +3,14 @@
= image_tag gravatar_icon(event.author_email), class: "avatar" = image_tag gravatar_icon(event.author_email), class: "avatar"
.event-title .event-title
%strong.author_name #{event.author_name} %strong.author_name #{event.author_name}
%span.event_label{class: event.action_name}= event.action_name %span.event_label{class: event.action_name} #{event.action_name} merge request
merge request
= link_to project_merge_request_path(event.project, event.merge_request) do = link_to project_merge_request_path(event.project, event.merge_request) do
%strong= truncate event.merge_request_title %strong= truncate event.merge_request_title
at at
%strong= link_to event.project.name, event.project %strong= link_to event.project.name, event.project
.event-body .event-body
%span= event.merge_request.source_branch .event-info
&rarr; %span= event.merge_request.source_branch
%span= event.merge_request.target_branch &rarr;
%span= event.merge_request.target_branch

3
app/views/events/_event_push.html.haml
View file

@ -4,8 +4,7 @@
.event-title .event-title
%strong.author_name #{event.author_name} %strong.author_name #{event.author_name}
%span.event_label.pushed= event.push_action_name %span.event_label.pushed #{event.push_action_name} #{event.ref_type}
= event.ref_type
= link_to project_commits_path(event.project, ref: event.ref_name) do = link_to project_commits_path(event.project, ref: event.ref_name) do
%strong= event.ref_name %strong= event.ref_name
at at