Add markdown to users biography

Closes https://github.com/openSUSE/osem/issues/1090
Closes https://github.com/openSUSE/osem/issues/701
This commit is contained in:
Ana 2016-08-09 00:20:18 +02:00
parent 72cd463dc7
commit eee4e4f22c
8 changed files with 11 additions and 14 deletions

View file

@ -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

View file

@ -133,7 +133,7 @@
%td
%b Biography
%td
= simple_format(@event.submitter.biography)
= markdown(@event.submitter.biography)
%tr
%td
%b Submitted on

View file

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

View file

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

View file

@ -36,7 +36,7 @@
from
= @speaker.affiliation
-if @speaker.biography?
= simple_format(@speaker.biography)
= markdown(@speaker.biography)
.col-md-9
.row
.col-md-12

View file

@ -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

View file

@ -8,7 +8,7 @@
%small
= @user.nickname
%p
= @user.biography
= markdown(@user.biography)
.row
.col-md-12
- if @user.events.confirmed.any?

View file

@ -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