Merge pull request #1127 from Ana06/markdown

Markdown

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