diff --git a/Gemfile b/Gemfile index 8b7105ac..1194e30a 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem 'rubytree' gem 'sass-rails', '~> 4.0.3' gem 'sdoc', '~> 0.4.0', group: :doc gem 'slim' +gem 'bootstrap_pagedown' gem 'pagedown-rails', '~> 1.1.4' gem 'sorcery' gem 'thread_safe' diff --git a/Gemfile.lock b/Gemfile.lock index 97c6b626..46fe1057 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,8 @@ GEM debug_inspector (>= 0.0.1) bootstrap-will_paginate (0.0.10) will_paginate + bootstrap_pagedown (1.1.0) + rails (>= 3.2) builder (3.2.2) byebug (8.2.2) capistrano (3.3.5) @@ -357,6 +359,7 @@ DEPENDENCIES better_errors binding_of_caller bootstrap-will_paginate + bootstrap_pagedown byebug capistrano (~> 3.3.0) capistrano-rails diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ed72ef61..e812a7db 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,7 @@ //= require jquery // //= require ace/ace +//= require bootstrap_pagedown //= require chosen.jquery.min //= require d3 //= require jquery.turbolinks diff --git a/app/assets/javascripts/exercises.js b/app/assets/javascripts/exercises.js index 444192f5..cd8df5a9 100644 --- a/app/assets/javascripts/exercises.js +++ b/app/assets/javascripts/exercises.js @@ -157,8 +157,8 @@ $(function() { } else if ($('.edit_exercise, .new_exercise').isPresent()) { execution_environments = $('form').data('execution-environments'); file_types = $('form').data('file-types'); - // new MarkdownEditor('#exercise_instructions'); - //new MarkdownEditor('#exercise_description'); + // new MarkdownEditor('#exercise_instructions'); + // new MarkdownEditor('#exercise_description') // todo: add an ace editor for each file new PagedownEditor('#exercise_description'); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0258a5fd..47163008 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,5 +14,6 @@ *= require_tree ../../../lib *= require_tree ../../../vendor/assets/stylesheets/ *= require_self + *= require bootstrap_pagedown *= require markdown */