gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix markdown issue

Browse source
This commit is contained in:
hitman 2017-03-06 20:54:21 +05:30
parent 040db7990b
commit 226d16dc63
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/osem.css.scss
View file

@ -89,4 +89,4 @@ p.comment-body {
.changeset{ .changeset{
display: none; display: none;
} }

4
app/helpers/application_helper.rb
View file

@ -295,12 +295,12 @@ module ApplicationHelper
space_after_headers: true, space_after_headers: true,
no_intra_emphasis: true no_intra_emphasis: true
} }
markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(escape_html: false), options) markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(escape_html: true), options)
markdown.render(text).html_safe markdown.render(text).html_safe
end end
def markdown_hint(text='') def markdown_hint(text='')
markdown("#{text} Please look at #{link_to '**Markdown Syntax**', 'https://daringfireball.net/projects/markdown/syntax', target: '_blank'} to format your text") markdown("#{text}\n\nPlease look at [**Markdown Syntax**](https://daringfireball.net/projects/markdown/syntax) to format your text")
end end
def omniauth_configured def omniauth_configured

2
app/views/proposals/_proposal_form.html.haml
View file

@ -31,7 +31,7 @@
= difficulty_level.description = difficulty_level.description
= f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } },
hint: markdown_hint(link_to('Tips to improve your presentations.', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx')) hint: markdown_hint('[Tips to improve your presentations.](http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx)')
%p %p
You have used You have used

2
app/views/proposals/new.html.haml
View file

@ -41,7 +41,7 @@
= event_type.description = event_type.description
= f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } },
hint: markdown_hint(link_to('Tips to improve your presentations.', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx')) hint: markdown_hint('[Tips to improve your presentations.](http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx)')
%p %p
You have used You have used