diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-03 23:01:04 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-06 14:30:07 -0500 |
| commit | 89b3ddd609063d93f39a02279f0f3e23b8b6b364 (patch) | |
| tree | 4f36de052a6bbcfed2b884c860363037663601e7 /app/views/admin/broadcast_messages/_form.html.haml | |
| parent | 26f3cc41fc41f2901cc560aaecf1fe49cadda7ca (diff) | |
| download | gitlab-ce-89b3ddd609063d93f39a02279f0f3e23b8b6b364.tar.gz | |
Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown
Closes #11853
Diffstat (limited to 'app/views/admin/broadcast_messages/_form.html.haml')
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 953b8b69368..5c9403fa0c2 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -1,6 +1,7 @@ .broadcast-message-preview{ style: broadcast_message_style(@broadcast_message) } = icon('bullhorn') - %span= @broadcast_message.message || "Your message here" + .js-broadcast-message-preview + = render_broadcast_message(@broadcast_message.message.presence || "Your message here") = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-requires-input'} do |f| -if @broadcast_message.errors.any? @@ -10,7 +11,9 @@ .form-group = f.label :message, class: 'control-label' .col-sm-10 - = f.text_area :message, class: "form-control js-quick-submit", rows: 2, required: true + = f.text_area :message, class: "form-control js-quick-submit js-autosize", + required: true, + data: { preview_path: preview_admin_broadcast_messages_path } .form-group.js-toggle-colors-container .col-sm-10.col-sm-offset-2 = link_to 'Customize colors', '#', class: 'js-toggle-colors-link' |