improved activity ui

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

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;
} }

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

View file

@ -1,4 +1,5 @@
.wll.event_feed - if event.allowed?
.wll.event_feed
- if event.push? - if event.push?
- if event.new_branch? - if event.new_branch?
= image_tag gravatar_icon(event.pusher_email), :class => "avatar" = image_tag gravatar_icon(event.pusher_email), :class => "avatar"