diff --git a/Gemfile b/Gemfile index ebb1231..a051c2f 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,6 @@ gem 'jquery-rails' gem 'twitter-bootstrap-rails', '2.2.8' gem 'tinymce-rails' # WYSIWYG EDITOR -gem 'substance-rails', path: '../substance-rails' # SUBSTANCE EDITOR - WYSIWYG HTML EDITOR gem 'contact_us', '>= 1.2.0' # COULD BE EASILY REPLACED WITH OUR OWN CODE gem 'recaptcha' gem 'dragonfly' # LOGO UPLOAD diff --git a/app/views/plans/_answer_form.html.erb b/app/views/plans/_answer_form.html.erb index 9602b5b..1a257c6 100644 --- a/app/views/plans/_answer_form.html.erb +++ b/app/views/plans/_answer_form.html.erb @@ -112,8 +112,7 @@ <%= text_field_tag("answer-text-#{question.id}".to_sym, strip_tags(answer.text), class: "question_text_field") %> <% elsif q_format.title == t("helpers.text_area") then%> - - <%= substance_text_area_tag(answer, 'text').html_safe %> + <%= text_area_tag("answer-text-#{question.id}".to_sym, answer.text, class: "tinymce") %> <% end %> <% end %> diff --git a/app/views/plans/edit.html.erb b/app/views/plans/edit.html.erb index 46da5b7..0bd9403 100644 --- a/app/views/plans/edit.html.erb +++ b/app/views/plans/edit.html.erb @@ -1,9 +1,7 @@ <%- model_class = Plan -%> <% javascript "plans.js" %> - + <%= render :partial => "/projects/project_title", locals: {project: @plan.project} %> diff --git a/lib/assets/javascripts/application.js b/lib/assets/javascripts/application.js index 6dc6135..eeea9a8 100644 --- a/lib/assets/javascripts/application.js +++ b/lib/assets/javascripts/application.js @@ -19,8 +19,7 @@ //= require tinymce-jquery //= require i18n //= require i18n/translations -//= require substance/substance.js -//= require substance-forms.js + $( document ).ready(function() { diff --git a/lib/assets/stylesheets/application.css b/lib/assets/stylesheets/application.css index 4a460e7..8635967 100644 --- a/lib/assets/stylesheets/application.css +++ b/lib/assets/stylesheets/application.css @@ -10,9 +10,6 @@ * * require jquery.ui.all *= require_self - *= require substance-forms.css - *= require substance/substance-reset.css - *= require font-awesome.min.css *= require bootstrap_and_overrides *= require bootstrap.css *= require select2.css