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

improved activity ui

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-01 20:47:57 +02:00
parent c94159ab08
commit 375ebcabfd
3 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/common.scss
View file

@ -616,6 +616,7 @@ p.time {
.wll { .wll {
padding:5px; padding:5px;
margin-top:5px;
border:none; border:none;
&:hover { &:hover {
background:none; background:none;
@ -632,6 +633,7 @@ p.time {
} }
ul { ul {
margin-left:50px; margin-left:50px;
margin-bottom:5px;
.avatar { .avatar {
width:24px; width:24px;
} }

5
app/models/event.rb
View file

@ -21,6 +21,11 @@ class Event < ActiveRecord::Base
end end
end end
# For now only push events enabled for system
def allowed?
push?
end
def push? def push?
action == self.class::Pushed action == self.class::Pushed
end end

61
app/views/events/_event.html.haml
View file

@ -1,31 +1,32 @@
.wll.event_feed - if event.allowed?
- if event.push? .wll.event_feed
- if event.new_branch? - if event.push?
= image_tag gravatar_icon(event.pusher_email), :class => "avatar" - if event.new_branch?
%strong #{event.pusher_name} = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
pushed new branch %strong #{event.pusher_name}
= link_to project_commits_path(event.project, :ref => event.branch_name) do pushed new branch
%strong= event.branch_name = link_to project_commits_path(event.project, :ref => event.branch_name) do
at %strong= event.branch_name
%strong= link_to event.project.name, event.project at
%span.cgray %strong= link_to event.project.name, event.project
= time_ago_in_words(event.created_at) %span.cgray
ago. = time_ago_in_words(event.created_at)
- else ago.
= image_tag gravatar_icon(event.pusher_email), :class => "avatar" - else
%strong #{event.pusher_name} = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
pushed to %strong #{event.pusher_name}
= link_to project_commits_path(event.project, :ref => event.branch_name) do pushed to
%strong= event.branch_name = link_to project_commits_path(event.project, :ref => event.branch_name) do
at %strong= event.branch_name
%strong= link_to event.project.name, event.project at
%span.cgray %strong= link_to event.project.name, event.project
= time_ago_in_words(event.created_at) %span.cgray
ago. = time_ago_in_words(event.created_at)
- if event.commits.count > 1 ago.
= link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do - if event.commits.count > 1
Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]} = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
- @project = event.project Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
%ul.unstyled - @project = event.project
= render event.commits %ul.unstyled
= render event.commits