Events improved & refactored. Dashboard pollished

app/views/events/_event.html.haml

@@ -1,12 +1,8 @@
 - if event.allowed?
   .event_feed
-    - if event.new_issue? 
-      = render "events/event_new_issue", :event => event
-    - elsif event.new_merge_request? 
-      = render "events/event_new_merge_request", :event => event
-    - elsif event.changed_merge_request? 
-      = render "events/event_changed_merge_request", :event => event
-    - elsif event.changed_issue? 
-      = render "events/event_changed_issue", :event => event
+    - if event.issue? 
+      = render "events/event_issue", :event => event
+    - elsif event.merge_request? 
+      = render "events/event_merge_request", :event => event
     - elsif event.push?
       = render "events/event_push", :event => event

app/views/events/_event_changed_issue.html.haml

@@ -1,15 +0,0 @@
-= image_tag gravatar_icon(event.author_email), :class => "avatar"
-%strong #{event.author_name} 
-%span.label.important
-  - if event.closed?
-    closed
-  - else 
-    reopened
- issue 
-= link_to project_issue_path(event.project, event.issue) do
-  %strong= truncate event.issue_title
-at 
-%strong= link_to event.project.name, event.project
-%span.cgray
-  = time_ago_in_words(event.created_at)
-  ago.

app/views/events/_event_changed_merge_request.html.haml

@@ -1,20 +0,0 @@
-= image_tag gravatar_icon(event.author_email), :class => "avatar"
-%strong #{event.author_name} 
-%span.label.important
-  - if event.closed?
-    closed
-  - else 
-    reopened
- merge request 
-= link_to project_merge_request_path(event.project, event.merge_request) do
-  %strong= truncate event.merge_request_title
-at 
-%strong= link_to event.project.name, event.project
-%span.cgray
-  = time_ago_in_words(event.created_at)
-  ago.
-%br
-%span.label= event.merge_request.source_branch
-→
-%span.label= event.merge_request.target_branch
-

app/views/events/_event_issue.html.haml

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

app/views/events/_event_merge_request.html.haml

@@ -1,7 +1,7 @@
 = image_tag gravatar_icon(event.author_email), :class => "avatar"
 %strong #{event.author_name} 
-%span.label.success requested 
- merge  
+%span.event_label= event.action_name
+ merge request 
 = link_to project_merge_request_path(event.project, event.merge_request) do
   %strong= truncate event.merge_request_title
 at 
@@ -10,7 +10,7 @@ at
   = time_ago_in_words(event.created_at)
   ago.
 %br
-%span.label= event.merge_request.source_branch
+%span= event.merge_request.source_branch
 →
-%span.label= event.merge_request.target_branch
+%span= event.merge_request.target_branch
 

app/views/events/_event_push.html.haml

@@ -1,45 +1,28 @@
-- if event.new_branch? || event.new_tag?
+%div
   = image_tag gravatar_icon(event.author_email), :class => "avatar"
   %strong #{event.author_name} 
-  %span.label.pushed pushed
-   new 
-  - if event.new_tag?
-    tag
-    = link_to project_commits_path(event.project, :ref => event.tag_name) do
-      %strong= event.tag_name
-  - else 
-    branch
-    = link_to project_commits_path(event.project, :ref => event.branch_name) do
-      %strong= event.branch_name
+  %span.event_label= event.push_action_name
+  = link_to project_commits_path(event.project, :ref => event.ref_name) do
+    %strong= event.ref_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.author_email), :class => "avatar"
-  %strong #{event.author_name}
-  %span.label.pushed 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 
-      %strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
-  - project = event.project  
-  %ul.unstyled.event_commits
-    - if event.commits.size > 3
-      - event.commits[0...2].each do |commit|
-        = render "events/commit", :commit => commit, :project => project
-      %li
-        %br
-        \... and #{event.commits.size - 2} more commits
-    - else 
-      - event.commits.each do |commit|
-        = render "events/commit", :commit => commit, :project => project
+
+  - if event.md_ref?
+    - 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 
+        %strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
+    - project = event.project  
+    %ul.unstyled.event_commits
+      - if event.commits.size > 3
+        - event.commits[0...2].each do |commit|
+          = render "events/commit", :commit => commit, :project => project
+        %li
+          %br
+          \... and #{event.commits.size - 2} more commits
+      - else 
+        - event.commits.each do |commit|
+          = render "events/commit", :commit => commit, :project => project