Merge pull request #1127 from Ana06/markdown

Markdown

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

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

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

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"}

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'}"}

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

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 },
+    = 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
       You have used

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 },
+              = 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
                 You have used

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:

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

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

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?

spec/serializers/event_serializer_spec.rb

@@ -12,7 +12,7 @@ describe EventSerializer, type: :serializer do
           length: 30,
           scheduled_date: '',
           language: nil,
-          abstract: '<p>Lorem ipsum dolor sit amet</p>',
+          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: '<p>Lorem ipsum dolor sit amet</p>',
+          abstract: 'Lorem ipsum dolor sit amet',
           speaker_ids: [speaker.user.id],
           type: 'Example Event Type',
           room: room.guid,

spec/serializers/speaker_serializer_spec.rb

@@ -25,7 +25,7 @@ describe SpeakerSerializer, type: :serializer do
         speaker: {
           name: 'John Doe',
           affiliation: 'JohnDoesInc',
-          biography: '<p>Doest of all Jon Does</p>'
+          biography: 'Doest of all Jon Does'
         }
       }.to_json