From 1f3323f9088b897220dc4989ac8da0ef71001ce1 Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Sun, 30 Oct 2011 17:41:57 +0400 Subject: [PATCH] use helper to markdown text --- app/helpers/application_helper.rb | 4 ++++ app/views/notes/_show.html.haml | 2 +- app/views/projects/_recent_messages.html.haml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 599d1e5c..fbca5ea5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,6 +30,10 @@ module ApplicationHelper end end + def markdown(text) + RDiscount.new(text, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe + end + def search_autocomplete_source projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } } default_nav = [ diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml index 1907e9cc..187d0a3c 100644 --- a/app/views/notes/_show.html.haml +++ b/app/views/notes/_show.html.haml @@ -2,7 +2,7 @@ %div.note_author = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" %div.note_content.left - = raw RDiscount.new(note.note, :smart, :filter_html).to_html + = markdown(note.note) - if note.attachment.url Attachment: = link_to note.attachment_identifier, note.attachment.url, :target => "_blank" diff --git a/app/views/projects/_recent_messages.html.haml b/app/views/projects/_recent_messages.html.haml index 67f3449b..b38ba483 100644 --- a/app/views/projects/_recent_messages.html.haml +++ b/app/views/projects/_recent_messages.html.haml @@ -40,7 +40,7 @@ %p{:style => "margin-bottom: 3px;"} %span.author = note.author.name - = link_to truncate(note.note, :length => 200), link_to_item + "#note_#{note.id}" + = link_to truncate(markdown(note.note), :length => 200), link_to_item + "#note_#{note.id}" - if note.attachment.url %br Attachment: