htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change gem and add preview

Browse Source
This commit is contained in:
yqbk
2016-07-13 15:14:38 +02:00
parent 00cdbf00f8
commit f4abc1fec3
6 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -28,7 +28,7 @@ gem 'rubytree'
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 4.0.3'
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', '~> 0.4.0', group: :doc
gem 'slim' gem 'slim'
gem 'pagedown-rails', '~> 1.1.4' gem "bootstrap_pagedown"
gem 'sorcery' gem 'sorcery'
gem 'thread_safe' gem 'thread_safe'
gem 'turbolinks' gem 'turbolinks'

6
Gemfile.lock
View File

@ -48,6 +48,8 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootstrap-will_paginate (0.0.10) bootstrap-will_paginate (0.0.10)
will_paginate will_paginate
bootstrap_pagedown (1.1.0)
rails (>= 3.2)
builder (3.2.2) builder (3.2.2)
byebug (8.2.2) byebug (8.2.2)
capistrano (3.3.5) capistrano (3.3.5)
@ -175,8 +177,6 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
pagedown-rails (1.1.4)
railties (> 3.1)
parser (2.3.0.6) parser (2.3.0.6)
ast (~> 2.2) ast (~> 2.2)
pg (0.18.4) pg (0.18.4)
@ -357,6 +357,7 @@ DEPENDENCIES
better_errors better_errors
binding_of_caller binding_of_caller
bootstrap-will_paginate bootstrap-will_paginate
bootstrap_pagedown
byebug byebug
capistrano (~> 3.3.0) capistrano (~> 3.3.0)
capistrano-rails capistrano-rails
@ -384,7 +385,6 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
nokogiri nokogiri
nyan-cat-formatter nyan-cat-formatter
pagedown-rails (~> 1.1.4)
pg pg
pry pry
puma (~> 2.15.3) puma (~> 2.15.3)

4
app/assets/javascripts/application.js
View File

@ -21,7 +21,5 @@
//= require turbolinks //= require turbolinks
//= require_tree ../../../lib //= require_tree ../../../lib
//= require_tree . //= require_tree .
//= require markdown.converter //= require bootstrap_pagedown
//= require markdown.sanitizer
//= require markdown.editor

21
app/assets/javascripts/markdown_editor.js
View File

@ -1,19 +1,8 @@
(function() $(document).ready(function () {
{
var converter = Markdown.getSanitizingConverter(); var converter = Markdown.getSanitizingConverter();
var editor = new Markdown.Editor( converter ); var editor = new Markdown.Editor( converter );
Markdown.Extra.init( converter );
editor.run(); editor.run();
/* });
window.MarkdownEditor = function(selector)
{
ace.config.set('modePath', ACE_FILES_PATH);
var editor = ace.edit($(selector).next()[0]);
editor.on('change', function(){ $(selector).val(editor.getValue()); });
editor.setShowPrintMargin(false);
var session = editor.getSession();
session.setMode('markdown');
session.setUseWrapMode(true);
session.setValue($(selector).val());
};
*/
})();

2
app/assets/stylesheets/application.css
View File

@ -14,5 +14,5 @@
*= require_tree ../../../lib *= require_tree ../../../lib
*= require_tree ../../../vendor/assets/stylesheets/ *= require_tree ../../../vendor/assets/stylesheets/
*= require_self *= require_self
*= require markdown *= require bootstrap_pagedown
*/ */

5
app/views/exercises/_form.html.slim
View File

@ -9,9 +9,12 @@
.form-group .form-group
= f.label(:description) = f.label(:description)
= f.hidden_field(:description) = f.hidden_field(:description)
= f.pagedown_editor :description
/.form-control.markdown
.wmd-panel .wmd-panel
#wmd-button-bar .wmd-button-bar
textarea.wmd-input textarea.wmd-input
.wmd-preview
/=f.input :description, :as => :pagedown, :input_html => { :preview => true } /=f.input :description, :as => :pagedown, :input_html => { :preview => true }
.form-group .form-group
= f.label(:execution_environment_id) = f.label(:execution_environment_id)