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

improvements2

Browse Source
This commit is contained in:
yqbk
2016-08-02 12:42:27 +02:00
parent e851101f53 e86a8f538e
commit f204304a2c
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/exercises/_code_field.html.slim
View File

@ -4,6 +4,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: @exercise, file: @exercise.files.first)
= render('editor_frame', exercise: e, file: @files)
= form.file_field(attribute, class: 'alternative-input form-control', disabled: true)

6
app/views/exercises/_file_form.html.slim
View File

@ -37,8 +37,4 @@ 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, exercise: @exercise, files: @exercise.files, label: t('activerecord.attributes.file.content'))
/=render('editor', exercise: @exercise, files: @files, submission: @submission)
/= render('editor_frame', exercise: @exercise, file: @exercise.files.take)
= render('code_field', attribute: :content, form: f, label: t('activerecord.attributes.file.content'))

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

@ -36,9 +36,7 @@
ul#files.list-unstyled.panel-group
= f.fields_for :files do |files_form|
= render('file_form', f: files_form)
/a#add-file.btn.btn-default.btn-sm.pull-right href='#' = t('.add_file')
= render('editor', exercise: @exercise, files: @files, submission: @submission)
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)
/= render('editor2', exercise: @exercise, files: @exercise.files, submission: @submission)
= render('file_form', f: files_form)
.actions = render('shared/submit_button', f: f, object: @exercise)