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

Add markdown to events abstract

Browse source
This commit is contained in:
Ana 2016-08-09 00:05:16 +02:00
parent 60877e9593
commit 72cd463dc7
8 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/serializers/event_serializer.rb
View file

@ -25,15 +25,6 @@ class EventSerializer < ActiveModel::Serializer
object.track.try(:guid) object.track.try(:guid)
end end
def abstract
# This should never happen
if object.abstract.blank?
nil
else
simple_format(object.abstract).gsub('\n', '')
end
end
def length def length
object.event_type.try(:length) || EventType::LENGTH_STEP object.event_type.try(:length) || EventType::LENGTH_STEP
end end

2
app/views/admin/events/_proposal.html.haml
View file

@ -145,7 +145,7 @@
%tr %tr
%td %td
%b Abstract %b Abstract
%td= simple_format(@event.abstract) %td= markdown(@event.abstract)
%tr %tr
%td %td
%b Description %b Description

2
app/views/conference/_schedule_splashpage.html.haml
View file

@ -39,7 +39,7 @@
%p.text-center %p.text-center
%b= event.title %b= event.title
%h5.text-center %h5.text-center
= simple_format truncate(event.abstract, length: 500, separator: ' ') = markdown truncate(event.abstract, length: 500, separator: ' ')
= link_to "Read More", conference_program_proposal_path(@conference.short_title, event) = link_to "Read More", conference_program_proposal_path(@conference.short_title, event)
= content_for :splash_nav do = content_for :splash_nav do

4
app/views/proposal/_proposal_form.html.haml
View file

@ -33,8 +33,8 @@
%span{ class: 'help-block select-help-text collapse event_difficulty_level_id', id: "#{difficulty_level.id}-help" } %span{ class: 'help-block select-help-text collapse event_difficulty_level_id', id: "#{difficulty_level.id}-help" }
= difficulty_level.description = difficulty_level.description
= f.input :abstract, input_html: { rows: 5 }, = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } },
required: true, 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(link_to('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

4
app/views/proposal/new.html.haml
View file

@ -43,8 +43,8 @@
:javascript :javascript
$("##{@program.event_types.first.id}-help").collapse('show'); $("##{@program.event_types.first.id}-help").collapse('show');
= f.input :abstract, input_html: { rows: 5, required: true }, = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } },
required: true, 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(link_to('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/proposal/show.html.haml
View file

@ -64,7 +64,7 @@
.row .row
.col-md-12 .col-md-12
%p %p
= simple_format(@event.abstract) = markdown(@event.abstract)
%dl#proposal-info %dl#proposal-info
.col-md-12 .col-md-12
%dt Date: %dt Date:

2
app/views/schedules/_event.html.haml
View file

@ -12,7 +12,7 @@
%h4 %h4
presented by #{event.speaker_names} presented by #{event.speaker_names}
%p %p
= truncate(event.abstract, :length => 400) = markdown(truncate(event.abstract, :length => 400))
= link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400 = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400
- if event_schedule.present? - if event_schedule.present?
%span.track %span.track

4
spec/serializers/event_serializer_spec.rb
View file

@ -12,7 +12,7 @@ describe EventSerializer, type: :serializer do
length: 30, length: 30,
scheduled_date: '', scheduled_date: '',
language: nil, language: nil,
abstract: '<p>Lorem ipsum dolor sit amet</p>', abstract: 'Lorem ipsum dolor sit amet',
speaker_ids: [], speaker_ids: [],
type: 'Example Event Type', type: 'Example Event Type',
room: nil, room: nil,
@ -44,7 +44,7 @@ describe EventSerializer, type: :serializer do
length: 30, length: 30,
scheduled_date: ' 2014-03-04T00:00:00+0000 ', scheduled_date: ' 2014-03-04T00:00:00+0000 ',
language: 'English', language: 'English',
abstract: '<p>Lorem ipsum dolor sit amet</p>', abstract: 'Lorem ipsum dolor sit amet',
speaker_ids: [speaker.user.id], speaker_ids: [speaker.user.id],
type: 'Example Event Type', type: 'Example Event Type',
room: room.guid, room: room.guid,