Events improved & refactored. Dashboard pollished

8 files changed, 41 insertions, 95 deletions

diff --git a/app/views/dashboard/_projects_feed.html.haml b/app/views/dashboard/_projects_feed.html.haml
index e3f61e66ae8..b41b1e5fd5d 100644
--- a/app/views/dashboard/_projects_feed.html.haml
+++ b/app/views/dashboard/_projects_feed.html.haml
@@ -1,11 +1,13 @@
 - projects.first(5).each do |project|
   %div.dash_project_item
-    = link_to project do 
-      %h4
+    %h4
+      = link_to project, :class => "project_link" do 
         %span.ico.project
-        = truncate project.name, :length => 30
+        = truncate project.name, :length => 24
+      %small
+        last activity at 
+        = project.last_activity_date.stamp("Aug 25, 2011")
+
+      .right 
         %small
-          last activity at 
-          = project.last_activity_date.stamp("Aug 25, 2011")
-        %span.right.arrow
-          →
+          %strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "vlink"
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 3bd411da58c..d25c7562a5f 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -21,8 +21,8 @@
     .dashboard_block
       .row
         .span4.right
-          %div.borders.ipadded
-            %h1
+          %div.lborder.ipadded
+            %h3
               = pluralize current_user.projects.count, "project", "projects"
             - if current_user.can_create_project?
               %hr
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index f091fff5a9e..ed45e27a7b7 100644
--- a/app/views/events/_event.html.haml
+++ b/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
diff --git a/app/views/events/_event_changed_issue.html.haml b/app/views/events/_event_changed_issue.html.haml
deleted file mode 100644
index 4f5d78af40e..00000000000
--- a/app/views/events/_event_changed_issue.html.haml
+++ /dev/null
@@ -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.
diff --git a/app/views/events/_event_changed_merge_request.html.haml b/app/views/events/_event_changed_merge_request.html.haml
deleted file mode 100644
index 1a4da6cd251..00000000000
--- a/app/views/events/_event_changed_merge_request.html.haml
+++ /dev/null
@@ -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
-
diff --git a/app/views/events/_event_new_issue.html.haml b/app/views/events/_event_issue.html.haml
index 3d38d844ca5..f527cb26391 100644
--- a/app/views/events/_event_new_issue.html.haml
+++ b/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 
diff --git a/app/views/events/_event_new_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml
index ecb86710e82..ecb0e9ff394 100644
--- a/app/views/events/_event_new_merge_request.html.haml
+++ b/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
 
diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml
index b24d2970533..fb4ffc56738 100644
--- a/app/views/events/_event_push.html.haml
+++ b/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