From 9c1b221fba67066c2687e00ce386749c8afd94f6 Mon Sep 17 00:00:00 2001
From: yqbk <jksyrek@gmail.com>
Date: Mon, 25 Jul 2016 15:59:48 +0200
Subject: [PATCH] working icons

---
 Gemfile                                |  1 +
 Gemfile.lock                           |  3 +++
 app/assets/javascripts/application.js  |  3 +++
 app/assets/javascripts/exercises.js    |  2 +-
 app/assets/stylesheets/application.css |  1 +
 app/views/exercises/_form.html.slim    | 12 +-----------
 app/views/exercises/edit.html.slim     |  2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 83a19f9a..1194e30a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,7 @@ 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'
 gem 'turbolinks'
diff --git a/Gemfile.lock b/Gemfile.lock
index ea22935c..46fe1057 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,6 +177,8 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    pagedown-rails (1.1.4)
+      railties (> 3.1)
     parser (2.3.0.6)
       ast (~> 2.2)
     pg (0.18.4)
@@ -385,6 +387,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri
   nyan-cat-formatter
+  pagedown-rails (~> 1.1.4)
   pg
   pry
   puma (~> 2.15.3)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 98e16d51..e812a7db 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -22,5 +22,8 @@
 //= require turbolinks
 //= require_tree ../../../lib
 //= require_tree .
+//= require markdown.converter
+//= require markdown.sanitizer
+//= require markdown.editor
 
 
diff --git a/app/assets/javascripts/exercises.js b/app/assets/javascripts/exercises.js
index a0e2e193..444192f5 100644
--- a/app/assets/javascripts/exercises.js
+++ b/app/assets/javascripts/exercises.js
@@ -158,7 +158,7 @@ $(function() {
       execution_environments = $('form').data('execution-environments');
       file_types = $('form').data('file-types');
      // new MarkdownEditor('#exercise_instructions');
-      new MarkdownEditor('#exercise_description');
+      //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 e21a40df..47163008 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -15,4 +15,5 @@
  *= require_tree ../../../vendor/assets/stylesheets/
  *= require_self
  *= require bootstrap_pagedown
+ *= require markdown
 */
diff --git a/app/views/exercises/_form.html.slim b/app/views/exercises/_form.html.slim
index a91f301c..984e52c6 100644
--- a/app/views/exercises/_form.html.slim
+++ b/app/views/exercises/_form.html.slim
@@ -8,18 +8,8 @@
     = f.text_field(:title, class: 'form-control', required: true)
   .form-group
     = f.label(:description)
-    = f.hidden_field(:description)
-    .form-control.markdown
-  /.form-group
-    = f.label(:description)
-    = f.hidden_field(:description)
+    = f.pagedown_editor :description
 
-    .form-control.markdown
-    /.wmd-panel
-      .wmd-button-bar
-      textarea.wmd-input
-      .wmd-preview
-    /=f.input :description, :as => :pagedown, :input_html => { :preview => true }
   .form-group
     = f.label(:execution_environment_id)
     = f.collection_select(:execution_environment_id, @execution_environments, :id, :name, {}, class: 'form-control')
diff --git a/app/views/exercises/edit.html.slim b/app/views/exercises/edit.html.slim
index d12ee9a6..43550759 100644
--- a/app/views/exercises/edit.html.slim
+++ b/app/views/exercises/edit.html.slim
@@ -1,3 +1,3 @@
 h1 = @exercise
 
-= render('test')
+= render('form')