Merge pull request #439 from DigitalCurationCentre/tinymce_issue

Fixed problem of loading tinymce styles for production environment.

Author: briri

app/views/answers/_new_edit.html.erb

@@ -74,7 +74,7 @@
               <p><%= raw(answer.text) %></p>
             <% 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 @@
             <p><%= raw(answer.text) %></p>
           <% 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 %>
 

app/views/guidances/_add_guidance.html.erb

@@ -63,7 +63,7 @@
     </div>
 
     <br />
-    <%= tinymce %>
+    <%= tinymce :content_css => asset_path('application.css') %>
   <% end %>
 </div>
 

app/views/guidances/admin_edit.html.erb

@@ -82,7 +82,7 @@
 				</div>
 
 			<br />
-			<%= tinymce %>
+			<%= tinymce :content_css => asset_path('application.css') %>
 		<%end%>
 	</div>
 </div>

app/views/guidances/admin_new.html.erb

@@ -79,7 +79,7 @@
 				</div>
 
 			<br />
-			 <%= tinymce %>
+			 <%= tinymce :content_css => asset_path('application.css') %>
 		<%end%>
 	</div>
 </div>

app/views/orgs/admin_edit.html.erb

@@ -79,5 +79,5 @@
   </div>
 </div>
 
-<%= tinymce %>
+<%= tinymce :content_css => asset_path('application.css') %>
 

app/views/phases/_add_note.html.erb

@@ -18,7 +18,7 @@
 	<fieldset class="standard">
 		<%= 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') %>
 		<input type="submit" class="form-submit new_comment_submit_button" value="<%= _('Save') %>" />
 	</fieldset>
 <% end %>

app/views/phases/admin_add.html.erb

@@ -50,7 +50,7 @@
               <td class="tinymce">
                 <div class="div_left_icon">
                   <%= text_area_tag("phase-desc","" , class: "tinymce") %>
-                  <%= tinymce %>
+                  <%= tinymce :content_css => asset_path('application.css') %>
                 </div>
                 <div class="div_right_icon">
                   <%= 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."))%>

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') %>
 
 <h1>
   <%= @phase.template.title %>

app/views/plans/edit.html.erb

@@ -143,7 +143,7 @@
 				</div>
     	<% end %>
     </div>
-    <%= tinymce %>
+    <%= tinymce :content_css => asset_path('application.css') %>
 </div>
 <div class="div_right">
 	<a href="#<%= @plan.id %>-export-dialog" data-toggle="modal" class="btn btn-primary"><%= _('Export') %></a>

app/views/templates/admin_new.html.erb

@@ -45,4 +45,4 @@
     <% end %>
   </div>
 </div>
-<%= tinymce %>
+<%= tinymce :content_css => asset_path('application.css') %>