From e86a8f538ecc4f8ba4a775ad194496f88d77b3f0 Mon Sep 17 00:00:00 2001 From: yqbk Date: Wed, 27 Jul 2016 17:15:07 +0200 Subject: [PATCH] comments --- app/views/exercises/_code_field.html.slim | 1 + app/views/exercises/_file_form.html.slim | 8 +------- app/views/exercises/_form.html.slim | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/views/exercises/_code_field.html.slim b/app/views/exercises/_code_field.html.slim index 55b751d7..6afcc9e3 100644 --- a/app/views/exercises/_code_field.html.slim +++ b/app/views/exercises/_code_field.html.slim @@ -3,5 +3,6 @@ |   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) diff --git a/app/views/exercises/_file_form.html.slim b/app/views/exercises/_file_form.html.slim index af9cfbf0..618f6d12 100644 --- a/app/views/exercises/_file_form.html.slim +++ b/app/views/exercises/_file_form.html.slim @@ -1,10 +1,5 @@ - id = f.object.id - -.editor-content.hidden data-file-id=:ancestor_id = :content -.editor data-file-id=:ancestor_id data-indent-size=2 data-mode="ace/mode/python" data-read-only=true data-id=:id - - li.panel.panel-default .panel-heading role="tab" id="heading" a.file-heading data-toggle="collapse" data-parent="#files" href="#collapse#{id}" @@ -37,10 +32,9 @@ li.panel.panel-default .test-related-fields style="display: #{f.object.teacher_defined_test? ? 'initial' : 'none'};" .form-group = f.label(:name, t('activerecord.attributes.file.feedback_message')) - = f.label(:ancestor_id, t('activerecord.attributes.file.name')) = f.text_area(:feedback_message, class: 'form-control', maxlength: 255) .help-block = t('.hints.feedback_message') .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, e: @exercise, label: t('activerecord.attributes.file.content')) + = render('code_field', attribute: :content, form: f, label: t('activerecord.attributes.file.content')) diff --git a/app/views/exercises/_form.html.slim b/app/views/exercises/_form.html.slim index 5f26b5fc..f0f69f7a 100644 --- a/app/views/exercises/_form.html.slim +++ b/app/views/exercises/_form.html.slim @@ -35,8 +35,8 @@ h2 = t('activerecord.attributes.exercise.files') ul#files.list-unstyled.panel-group = f.fields_for :files do |files_form| - = render('file_form', f: files_form, object: @exercise) + = 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, e: @exercise) + = render('file_form', f: files_form) .actions = render('shared/submit_button', f: f, object: @exercise)