From 08e52a5624f3534f3b7ad9f9c88ef2f35a8ff77a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 7 Jun 2013 18:46:33 +0300
Subject: [PATCH] Refactor event title for notes

---
 app/helpers/events_helper.rb           | 28 ++++++++++++++++++++++++++++
 app/views/events/event/_note.html.haml | 20 +-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 80dcc12..7c1aee7 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -91,4 +91,32 @@ module EventsHelper
       url_for([event.project, event.note_target])
     end
   end
+
+  def event_note_title_html(event)
+    if event.note_target
+      if event.note_commit?
+        link_to project_commit_path(event.project, event.note_commit_id), class: "commit_short_id" do
+          "#{event.note_target_type} #{event.note_short_commit_id}"
+        end
+      elsif event.note_project_snippet?
+        link_to(project_snippet_path(event.project, event.note_target)) do
+          content_tag :strong do
+            "#{event.note_target_type} ##{truncate event.note_target_id}"
+          end
+        end
+      else
+        link_to event_note_target_path(event) do
+          content_tag :strong do
+            "#{event.note_target_type} ##{truncate event.note_target_id}"
+          end
+        end
+      end
+    elsif event.wall_note?
+      link_to 'wall', project_wall_path(event.project)
+    else
+      content_tag :strong do
+        "(deleted)"
+      end
+    end
+  end
 end
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index d1f318e..9dd0767 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -1,24 +1,6 @@
 .event-title
   %span.author_name= link_to_author event
-  %span.event_label commented on
-  - if event.note_target
-    - if event.note_commit?
-      = event.note_target_type
-      = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
-    - elsif event.note_project_snippet?
-      = link_to project_snippet_path(event.project, event.note_target) do
-        %strong
-          #{event.note_target_type} ##{truncate event.note_target_id}
-    - else
-      = link_to event_note_target_path(event) do
-        %strong
-          #{event.note_target_type} ##{truncate event.note_target_id}
-
-  - elsif event.wall_note?
-    = link_to 'wall', project_wall_path(event.project)
-  - else
-    %strong (deleted)
-  at
+  %span.event_label commented on #{event_note_title_html(event)} at
   - if event.project
     = link_to_project event.project
   - else
--
libgit2 0.21.2