From 31b0c3ba258dd32a18dac550f480fb94765db13d Mon Sep 17 00:00:00 2001
From: yqbk <jksyrek@gmail.com>
Date: Fri, 12 Aug 2016 15:29:06 +0200
Subject: [PATCH] Ace editor for each file form

---
 app/assets/stylesheets/editor.css.scss   |  6 +++++-
 app/views/exercises/_ace.html.slim       | 13 ++++++-------
 app/views/exercises/_file_form.html.slim |  4 ++--
 app/views/exercises/_form.html.slim      |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/editor.css.scss b/app/assets/stylesheets/editor.css.scss
index e41153e2..81504ba0 100644
--- a/app/assets/stylesheets/editor.css.scss
+++ b/app/assets/stylesheets/editor.css.scss
@@ -9,7 +9,8 @@ button i.fa-spin {
 
 .frame {
   display: none;
-  height: 400px;
+  height: 200px;
+  width: 400px;
 
   audio, img, video {
     max-width: 100%;
@@ -55,8 +56,11 @@ button i.fa-spin {
 
 #files {
   overflow: auto;
+
 }
 
+
+
 #hint {
   display: none;
 }
diff --git a/app/views/exercises/_ace.html.slim b/app/views/exercises/_ace.html.slim
index 5d784c2d..2fc2875d 100644
--- a/app/views/exercises/_ace.html.slim
+++ b/app/views/exercises/_ace.html.slim
@@ -1,7 +1,6 @@
-- unless file.nil?
-  #editor.panel-group.row data-exercise-id=@exercise.id
-    #files style=("") data-entries=FileTree.new(@files).to_js_tree
-    div id='frames' class=(@exercise.hide_file_tree ? 'col-sm-12' : 'col-sm-9')
-        .frame data-executable=file.file_type.executable? data-filename=file.name_with_extension data-renderable=file.file_type.renderable? data-role=file.role data-binary=file.file_type.binary? data-context-type=file.context_type
-          .editor-content.hidden data-file-id=file.ancestor_id = file.content
-          .editor data-file-id=file.ancestor_id data-indent-size=file.file_type.indent_size data-mode=file.file_type.editor_mode data-read-only=file.read_only data-id=file.id
+#editor.panel-group.row data-exercise-id=@exercise.id
+  #files data-entries=FileTree.new(@files).to_js_tree
+  #frames
+    .frame data-executable=file.file_type.executable? data-filename=file.name_with_extension data-renderable=file.file_type.renderable? data-role=file.role data-binary=file.file_type.binary? data-context-type=file.context_type
+      .editor-content.hidden data-file-id=file.ancestor_id = file.content
+      .editor data-file-id=file.ancestor_id data-indent-size=file.file_type.indent_size data-mode=file.file_type.editor_mode data-id=file.id
diff --git a/app/views/exercises/_file_form.html.slim b/app/views/exercises/_file_form.html.slim
index 4363f90d..4b2055c0 100644
--- a/app/views/exercises/_file_form.html.slim
+++ b/app/views/exercises/_file_form.html.slim
@@ -36,5 +36,5 @@ li.panel.panel-default
         .form-group
           = f.label(:role, t('activerecord.attributes.file.weight'))
           = f.number_field(:weight, class: 'form-control', min: 1, step: 'any')
-      //= render('code_field', attribute: :content, form: f, label: t('activerecord.attributes.file.content'))
-      = render('ace', exercise: @exercise, file: file)
\ No newline at end of file
+      /= render('code_field', attribute: :content, form: f, label: t('activerecord.attributes.file.content'))
+      = render('ace', exercise: @exercise, file: @files.first)
\ No newline at end of file
diff --git a/app/views/exercises/_form.html.slim b/app/views/exercises/_form.html.slim
index f258a2cc..7a601852 100644
--- a/app/views/exercises/_form.html.slim
+++ b/app/views/exercises/_form.html.slim
@@ -30,8 +30,8 @@
       = f.check_box(:allow_file_creation)
       = t('activerecord.attributes.exercise.allow_file_creation')
   h2 = t('activerecord.attributes.exercise.files')
-  //render ace editor for not hidden files
-  //= render('ace', exercise: @exercise, file: @files)
+  /render ace editor for not hidden files
+  = render('ace', exercise: @exercise, file: @files.first)
 
 
   ul#files.list-unstyled.panel-group