diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index 355d2eb7..c2dffbeb 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -25,15 +25,6 @@ class EventSerializer < ActiveModel::Serializer object.track.try(:guid) end - def abstract - # This should never happen - if object.abstract.blank? - nil - else - simple_format(object.abstract).gsub('\n', '') - end - end - def length object.event_type.try(:length) || EventType::LENGTH_STEP end diff --git a/app/serializers/speaker_serializer.rb b/app/serializers/speaker_serializer.rb index 64fb8936..c017fb31 100644 --- a/app/serializers/speaker_serializer.rb +++ b/app/serializers/speaker_serializer.rb @@ -6,12 +6,4 @@ class SpeakerSerializer < ActiveModel::Serializer def name object.name end - - def biography - if object.biography.blank? - nil - else - simple_format(object.biography).gsub('\n', '') - end - end end diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml index 4414dee6..118f6034 100644 --- a/app/views/admin/events/_proposal.html.haml +++ b/app/views/admin/events/_proposal.html.haml @@ -133,7 +133,7 @@ %td %b Biography %td - = simple_format(@event.submitter.biography) + = markdown(@event.submitter.biography) %tr %td %b Submitted on @@ -145,7 +145,7 @@ %tr %td %b Abstract - %td= simple_format(@event.abstract) + %td= markdown(@event.abstract) %tr %td %b Description diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index e945bad7..a2d8cf97 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -4,6 +4,7 @@ = f.input :name, :as => :string = f.input :email = f.input :affiliation, :as => :string - = f.input :biography, :input_html => {:rows => 10} + = f.input :biography, input_html: { rows: 10, data: { provide: 'markdown-editable' } }, + hint: markdown_hint = f.actions do = f.action :submit, :button_html => {:class => "btn btn-primary"} diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 0670665f..48f2908b 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -29,6 +29,9 @@ - if attr == 'roles' %td = show_roles(@user.get_roles) + - elsif attr == 'biography' + %td + = markdown(@user.biography) - else %td= @user.send(attr) #submissions-content.tab-pane{class: "#{'active' if params[:tab] == 'submissions-content'}"} diff --git a/app/views/conference/_schedule_splashpage.html.haml b/app/views/conference/_schedule_splashpage.html.haml index af23f8d7..67bd52e4 100644 --- a/app/views/conference/_schedule_splashpage.html.haml +++ b/app/views/conference/_schedule_splashpage.html.haml @@ -39,7 +39,7 @@ %p.text-center %b= event.title %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) = content_for :splash_nav do diff --git a/app/views/proposal/_proposal_form.html.haml b/app/views/proposal/_proposal_form.html.haml index 4df88438..73ad0b06 100644 --- a/app/views/proposal/_proposal_form.html.haml +++ b/app/views/proposal/_proposal_form.html.haml @@ -33,8 +33,8 @@ %span{ class: 'help-block select-help-text collapse event_difficulty_level_id', id: "#{difficulty_level.id}-help" } = difficulty_level.description - = f.input :abstract, input_html: { rows: 5 }, - 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') + = 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')) %p You have used diff --git a/app/views/proposal/new.html.haml b/app/views/proposal/new.html.haml index 658afa18..5281ec37 100644 --- a/app/views/proposal/new.html.haml +++ b/app/views/proposal/new.html.haml @@ -43,8 +43,8 @@ :javascript $("##{@program.event_types.first.id}-help").collapse('show'); - = f.input :abstract, input_html: { rows: 5, required: true }, - 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') + = 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')) %p You have used diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml index e350164a..bc08c14c 100644 --- a/app/views/proposal/show.html.haml +++ b/app/views/proposal/show.html.haml @@ -36,7 +36,7 @@ from = @speaker.affiliation -if @speaker.biography? - = simple_format(@speaker.biography) + = markdown(@speaker.biography) .col-md-9 .row .col-md-12 @@ -64,7 +64,7 @@ .row .col-md-12 %p - = simple_format(@event.abstract) + = markdown(@event.abstract) %dl#proposal-info .col-md-12 %dt Date: diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 1be0e685..abd3143d 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -12,7 +12,7 @@ %h4 presented by #{event.speaker_names} %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 - if event_schedule.present? %span.track diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 4fa47b82..825cd9f1 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -14,7 +14,8 @@ = link_to 'Change your avatar here', 'https://gravatar.com' = f.input :affiliation, as: :string, hint: 'This could be a company, a user group, or nothing at all.' - = f.input :biography, input_html: { rows: 5, 'onkeyup' => "word_count(this, 'biography-count', 150)" } + = f.input :biography, input_html: { rows: 5, data: { provide: 'markdown-editable' }, 'onkeyup' => "word_count(this, 'biography-count', 150)" }, + hint: markdown_hint You have used %span#bio_length = @user.biography ? @user.biography.split.length : 0 diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 0b172898..355cda88 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -8,7 +8,7 @@ %small = @user.nickname %p - = @user.biography + = markdown(@user.biography) .row .col-md-12 - if @user.events.confirmed.any? diff --git a/spec/serializers/event_serializer_spec.rb b/spec/serializers/event_serializer_spec.rb index e4f96e53..b4edc2d1 100644 --- a/spec/serializers/event_serializer_spec.rb +++ b/spec/serializers/event_serializer_spec.rb @@ -12,7 +12,7 @@ describe EventSerializer, type: :serializer do length: 30, scheduled_date: '', language: nil, - abstract: '
Lorem ipsum dolor sit amet
', + abstract: 'Lorem ipsum dolor sit amet', speaker_ids: [], type: 'Example Event Type', room: nil, @@ -44,7 +44,7 @@ describe EventSerializer, type: :serializer do length: 30, scheduled_date: ' 2014-03-04T00:00:00+0000 ', language: 'English', - abstract: 'Lorem ipsum dolor sit amet
', + abstract: 'Lorem ipsum dolor sit amet', speaker_ids: [speaker.user.id], type: 'Example Event Type', room: room.guid, diff --git a/spec/serializers/speaker_serializer_spec.rb b/spec/serializers/speaker_serializer_spec.rb index a62c882c..74545709 100644 --- a/spec/serializers/speaker_serializer_spec.rb +++ b/spec/serializers/speaker_serializer_spec.rb @@ -25,7 +25,7 @@ describe SpeakerSerializer, type: :serializer do speaker: { name: 'John Doe', affiliation: 'JohnDoesInc', - biography: 'Doest of all Jon Does
' + biography: 'Doest of all Jon Does' } }.to_json