diff --git a/app/views/answers/_new_edit.html.erb b/app/views/answers/_new_edit.html.erb index 54fa9b4..9678cfe 100644 --- a/app/views/answers/_new_edit.html.erb +++ b/app/views/answers/_new_edit.html.erb @@ -74,7 +74,7 @@

<%= raw(answer.text) %>

<% else %> <%= text_area_tag('answer[text]', answer.text, id: "answer-text-#{question.id}") %> - <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.change_answer") %> + <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.change_answer", content_css: asset_path('application.css')) %> <% end %> <%end%> <% end %> @@ -90,7 +90,7 @@

<%= raw(answer.text) %>

<% else %> <%= text_area_tag('answer[text]', answer.text, id: "answer-text-#{question.id}") %> - <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.change_answer") %> + <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.change_answer", content_css: asset_path('application.css')) %> <% end %> <% end %> diff --git a/app/views/guidances/_add_guidance.html.erb b/app/views/guidances/_add_guidance.html.erb index da1d7ca..bd036d2 100644 --- a/app/views/guidances/_add_guidance.html.erb +++ b/app/views/guidances/_add_guidance.html.erb @@ -63,7 +63,7 @@
- <%= tinymce %> + <%= tinymce :content_css => asset_path('application.css') %> <% end %> diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index 1a04cc8..b8ddce7 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -82,7 +82,7 @@
- <%= tinymce %> + <%= tinymce :content_css => asset_path('application.css') %> <%end%> diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index f77a3f6..59b5397 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -79,7 +79,7 @@
- <%= tinymce %> + <%= tinymce :content_css => asset_path('application.css') %> <%end%> diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index adbc664..3bbc468 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -79,5 +79,5 @@ -<%= tinymce %> +<%= tinymce :content_css => asset_path('application.css') %> diff --git a/app/views/phases/_add_note.html.erb b/app/views/phases/_add_note.html.erb index 5a20c05..2817b90 100644 --- a/app/views/phases/_add_note.html.erb +++ b/app/views/phases/_add_note.html.erb @@ -18,7 +18,7 @@
<%= label_tag "#{questionid}new_note_text", _('Share note with collaborators') %> <%= text_area_tag "#{questionid}new_note_text", nil, class: "tinymce" %> - <%= tinymce %> + <%= tinymce :content_css => asset_path('application.css') %>
<% end %> diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb index 72a9a66..546c727 100644 --- a/app/views/phases/admin_add.html.erb +++ b/app/views/phases/admin_add.html.erb @@ -50,7 +50,7 @@
<%= text_area_tag("phase-desc","" , class: "tinymce") %> - <%= tinymce %> + <%= tinymce :content_css => asset_path('application.css') %>
<%= link_to( image_tag("help_button.png"), "#", class: "phase_desc_popover", rel: "popover", "data-html" => "true", "data-content" => _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer."))%> diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb index 321ac60..60dc90d 100644 --- a/app/views/phases/admin_show.html.erb +++ b/app/views/phases/admin_show.html.erb @@ -2,7 +2,7 @@ <%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %> -<%= tinymce %> +<%= tinymce :content_css => asset_path('application.css') %>

<%= @phase.template.title %> diff --git a/app/views/plans/edit.html.erb b/app/views/plans/edit.html.erb index 44393fa..96cfa9c 100644 --- a/app/views/plans/edit.html.erb +++ b/app/views/plans/edit.html.erb @@ -143,7 +143,7 @@

<% end %> - <%= tinymce %> + <%= tinymce :content_css => asset_path('application.css') %>
<%= _('Export') %> diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb index e180b4a..bfdf195 100644 --- a/app/views/templates/admin_new.html.erb +++ b/app/views/templates/admin_new.html.erb @@ -45,4 +45,4 @@ <% end %>
-<%= tinymce %> \ No newline at end of file +<%= tinymce :content_css => asset_path('application.css') %> \ No newline at end of file diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb index 77b956a..75564de 100644 --- a/app/views/templates/admin_template.html.erb +++ b/app/views/templates/admin_template.html.erb @@ -59,4 +59,4 @@ <% end %> -<%= tinymce %> +<%= tinymce :content_css => asset_path('application.css') %> diff --git a/config/tinymce.yml b/config/tinymce.yml index 2b2bb03..6966167 100644 --- a/config/tinymce.yml +++ b/config/tinymce.yml @@ -1,4 +1,3 @@ -content_css: /assets/application.css selector: 'textarea.tinymce' statusbar: false menubar: false