improved activity ui

Dmitriy Zaporozhets
1 parent c94159ab
Showing 3 changed files with 38 additions and 30 deletions Show diff stats
app/assets/stylesheets/common.scss
app/models/event.rb
app/views/events/_event.html.haml
@@ -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;
           }
@@ -21,6 +21,11 @@ class Event &lt; ActiveRecord::Base
     end
   end
+  # For now only push events enabled for system
+  def allowed?
+    push?
+  end
+
   def push?
     action == self.class::Pushed
   end
-.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
1	-.wll.event_feed
2	- - if event.push?
3	- - if event.new_branch?
4	- = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
5	- %strong #{event.pusher_name}
6	- pushed new branch
7	- = link_to project_commits_path(event.project, :ref => event.branch_name) do
8	- %strong= event.branch_name
9	- at
10	- %strong= link_to event.project.name, event.project
11	- %span.cgray
12	- = time_ago_in_words(event.created_at)
13	- ago.
14	- - else
15	- = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
16	- %strong #{event.pusher_name}
17	- pushed to
18	- = link_to project_commits_path(event.project, :ref => event.branch_name) do
19	- %strong= event.branch_name
20	- at
21	- %strong= link_to event.project.name, event.project
22	- %span.cgray
23	- = time_ago_in_words(event.created_at)
24	- ago.
25	- - if event.commits.count > 1
26	- = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
27	- Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
28	- - @project = event.project
29	- %ul.unstyled
30	- = render event.commits	1	+- if event.allowed?
		2	+ .wll.event_feed
		3	+ - if event.push?
		4	+ - if event.new_branch?
		5	+ = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
		6	+ %strong #{event.pusher_name}
		7	+ pushed new branch
		8	+ = link_to project_commits_path(event.project, :ref => event.branch_name) do
		9	+ %strong= event.branch_name
		10	+ at
		11	+ %strong= link_to event.project.name, event.project
		12	+ %span.cgray
		13	+ = time_ago_in_words(event.created_at)
		14	+ ago.
		15	+ - else
		16	+ = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
		17	+ %strong #{event.pusher_name}
		18	+ pushed to
		19	+ = link_to project_commits_path(event.project, :ref => event.branch_name) do
		20	+ %strong= event.branch_name
		21	+ at
		22	+ %strong= link_to event.project.name, event.project
		23	+ %span.cgray
		24	+ = time_ago_in_words(event.created_at)
		25	+ ago.
		26	+ - if event.commits.count > 1
		27	+ = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do
		28	+ Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
		29	+ - @project = event.project
		30	+ %ul.unstyled
		31	+ = render event.commits
31		32