gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add markdown formatting for sponsor descriptions

Browse source
This commit is contained in:
James Mason 2018-12-27 22:53:55 -08:00
parent 4e96f76926
commit ef4b7fda92
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/sponsors/_form.html.haml
View file

@ -10,7 +10,7 @@
.col-md-8 .col-md-8
= semantic_form_for(@sponsor, url: (@sponsor.new_record? ? admin_conference_sponsors_path : admin_conference_sponsor_path(@conference.short_title, @sponsor))) do |f| = semantic_form_for(@sponsor, url: (@sponsor.new_record? ? admin_conference_sponsors_path : admin_conference_sponsor_path(@conference.short_title, @sponsor))) do |f|
= f.input :name, input_html: { autofocus: true } = f.input :name, input_html: { autofocus: true }
= f.input :description = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
= image_tag f.object.picture.thumb.url if f.object.picture? = image_tag f.object.picture.thumb.url if f.object.picture?
= f.input :picture = f.input :picture
= f.input :website_url = f.input :website_url

2
app/views/admin/sponsors/index.html.haml
View file

@ -24,7 +24,7 @@
%td %td
= sponsor.name = sponsor.name
%td %td
= truncate(sponsor.description) = truncate(markdown(sponsor.description))
%td %td
= sponsor.website_url = sponsor.website_url
%td %td

2
app/views/conferences/_modal_description.haml
View file

@ -18,6 +18,6 @@
- if object.picture? - if object.picture?
= image_tag get_logo(object), class: img_classes = image_tag get_logo(object), class: img_classes
%p.description %p.description
= object.description = markdown(object.description)
.modal-footer .modal-footer
= link_to nil, object.website_url, target: '_blank' = link_to nil, object.website_url, target: '_blank'