cleanup

app/assets/stylesheets/editor.css.scss

@@ -7,12 +7,6 @@ button i.fa-spin {
   width: 100%;
 }
 
-.editor2 {
-
-  height: 100%;
-  width: 100%;
-}
-
 .frame {
   display: none;
   height: 400px;
@@ -22,15 +16,6 @@ button i.fa-spin {
   }
 }
 
-.frame2 {
-  display: none;
-  height: 100px;
-
-  audio, img, video {
-    max-width: 100%;
-  }
-}
-
 .score {
   display: none;
 }

app/controllers/exercises_controller.rb

@@ -64,16 +64,8 @@ class ExercisesController < ApplicationController
   end
 
   def edit
-    redirect_to(@exercise, alert: t('exercises.implement.no_files')) unless @exercise.files.visible.exists?
-    @submission = current_user.submissions.where(exercise_id: @exercise.id).order('created_at DESC').first
     @files = (@submission ? @submission.collect_files : @exercise.files).select(&:visible).sort_by(&:name_with_extension)
     @paths = collect_paths(@files)
-
-    if current_user.respond_to? :external_id
-      @user_id = current_user.external_id
-    else
-      @user_id = current_user.id
-    end
   end
 
   def import_proforma_xml

app/views/exercises/_ace.html.slim

@@ -0,0 +1,7 @@
+#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')
+    - @files.each do |file|
+      .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

app/views/exercises/_code_field.html.slim

@@ -1,10 +1,6 @@
-
 .form-group class="form-group-#{attribute.to_s.gsub('_', '-')}"
   = form.label(attribute, label)
   |  
   a.toggle-input data={text_initial: t('shared.upload_file'), text_toggled: t('shared.back')} href='#' = t('shared.upload_file')
   = form.text_area(attribute, class: 'code-field form-control original-input', rows: 16)
-  // Need to render content in ace editor instead of plain text
-  /= render('editor_frame', exercise: e, file: @files)
   = form.file_field(attribute, class: 'alternative-input form-control', disabled: true)
-

app/views/exercises/_file_form.html.slim

@@ -1,7 +1,4 @@
 - id = f.object.id
-
-
-
 li.panel.panel-default
   .panel-heading role="tab" id="heading"
     a.file-heading data-toggle="collapse" data-parent="#files" href="#collapse#{id}"
@@ -40,4 +37,3 @@ li.panel.panel-default
           = 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('form2', exercise: @exercise, file: @files)

app/views/exercises/_form.html.slim

@@ -33,19 +33,12 @@
       = f.check_box(:allow_file_creation)
       = t('activerecord.attributes.exercise.allow_file_creation')
   h2 = t('activerecord.attributes.exercise.files')
-
-
-
-
-  = render('form2', exercise: @exercise, file: @files)
-
-
-
-
+  //render ace editor for not hidden files
+  = render('ace', exercise: @exercise, file: @files)
   ul#files.list-unstyled.panel-group
     = f.fields_for :files do |files_form|
-      = render('file_form', f: files_form, exercise: @exercise, file: @files)
+      = render('file_form', f: files_form)
   a#add-file.btn.btn-default.btn-sm.pull-right href='#' = t('.add_file')
   ul#dummies.hidden = f.fields_for(:files, CodeOcean::File.new, child_index: 'index') do |files_form|
-    = render('file_form', f: files_form, exercise: @exercise, file: @files)
+    = render('file_form', f: files_form)
   .actions = render('shared/submit_button', f: f, object: @exercise)

app/views/exercises/edit.html.slim

@@ -1,6 +1,3 @@
 h1 = @exercise
 
-/= render('form')
-
-
 = render('form', exercise: @exercise, files: @files)

app/views/exercises/implement2.html.slim

@@ -4,4 +4,4 @@
     - @files.each do |file|
       .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 data-file-id=file.ancestor_id data-indent-size=file.file_type.indent_size data-id=file.id