From 375ebcabfd2b5c086d0b2602114f7b751c205440 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 1 Mar 2012 20:47:57 +0200
Subject: [PATCH] improved activity ui

---
 app/assets/stylesheets/common.scss |  2 +
 app/models/event.rb                |  5 +++
 app/views/events/_event.html.haml  | 61 +++++++++++++++---------------
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 44f0a417..5ea1cffe 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -616,6 +616,7 @@ p.time {
 
     .wll { 
       padding:5px;
+      margin-top:5px;
       border:none;
       &:hover { 
         background:none;
@@ -632,6 +633,7 @@ p.time {
         }
         ul { 
           margin-left:50px;
+          margin-bottom:5px;
           .avatar { 
             width:24px;
           }
diff --git a/app/models/event.rb b/app/models/event.rb
index e1732f00..c40de6a4 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -21,6 +21,11 @@ class Event < ActiveRecord::Base
     end
   end
 
+  # For now only push events enabled for system
+  def allowed?
+    push?
+  end
+
   def push?
     action == self.class::Pushed
   end
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index e5d24077..b6fd4258 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -1,31 +1,32 @@
-.wll.event_feed
-  - if event.push?
-    - if event.new_branch?
-      = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
-      %strong #{event.pusher_name} 
-      pushed new branch
-      = link_to project_commits_path(event.project, :ref => event.branch_name) do
-        %strong= event.branch_name
-      at 
-      %strong= link_to event.project.name, event.project
-      %span.cgray
-        = time_ago_in_words(event.created_at)
-        ago.
-    - else 
-      = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
-      %strong #{event.pusher_name}
-      pushed to 
-      = link_to project_commits_path(event.project, :ref => event.branch_name) do
-        %strong= event.branch_name
-      at 
-      %strong= link_to event.project.name, event.project
-      %span.cgray
-        = time_ago_in_words(event.created_at)
-        ago.
-      - if event.commits.count > 1
-        = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do 
-          Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
-      - @project = event.project  
-      %ul.unstyled
-        = render event.commits
+- if event.allowed?
+  .wll.event_feed
+    - if event.push?
+      - if event.new_branch?
+        = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
+        %strong #{event.pusher_name} 
+        pushed new branch
+        = link_to project_commits_path(event.project, :ref => event.branch_name) do
+          %strong= event.branch_name
+        at 
+        %strong= link_to event.project.name, event.project
+        %span.cgray
+          = time_ago_in_words(event.created_at)
+          ago.
+      - else 
+        = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
+        %strong #{event.pusher_name}
+        pushed to 
+        = link_to project_commits_path(event.project, :ref => event.branch_name) do
+          %strong= event.branch_name
+        at 
+        %strong= link_to event.project.name, event.project
+        %span.cgray
+          = time_ago_in_words(event.created_at)
+          ago.
+        - if event.commits.count > 1
+          = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do 
+            Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
+        - @project = event.project  
+        %ul.unstyled
+          = render event.commits