From f7eaa24a1d46b41c40b8b710800acc38a8986589 Mon Sep 17 00:00:00 2001 From: yqbk Date: Tue, 2 Aug 2016 12:47:11 +0200 Subject: [PATCH] revert mistakes --- app/views/exercises/_code_field.html.slim | 1 - app/views/exercises/_file_form.html.slim | 2 +- app/views/exercises/implement.html.slim | 92 +++++++++++++++++++++-- 3 files changed, 88 insertions(+), 7 deletions(-) diff --git a/app/views/exercises/_code_field.html.slim b/app/views/exercises/_code_field.html.slim index 4fedfcea..6afcc9e3 100644 --- a/app/views/exercises/_code_field.html.slim +++ b/app/views/exercises/_code_field.html.slim @@ -6,4 +6,3 @@ // 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 618f6d12..cb6792a7 100644 --- a/app/views/exercises/_file_form.html.slim +++ b/app/views/exercises/_file_form.html.slim @@ -37,4 +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, 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/implement.html.slim b/app/views/exercises/implement.html.slim index c3fb9f08..fd7d3fcb 100644 --- a/app/views/exercises/implement.html.slim +++ b/app/views/exercises/implement.html.slim @@ -1,5 +1,87 @@ -#editor.row data-exercise-id=@exercise.id - #files style=("display: none;") 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| - = render('editor_frame', exercise: @exercise, file: file) +.row + #editor-column.col-md-10.col-md-offset-1 + h1 = @exercise + + span.badge.pull-right.score + + p.lead = render_markdown(@exercise.description) + + #alert.alert.alert-danger role='alert' + h4 = t('.alert.title') + p = t('.alert.text', application_name: application_name) + + #development-environment + ul.nav.nav-justified.nav-tabs role='tablist' + li.active + a data-placement='top' data-toggle='tab' data-tooltip=true href='#workspace' role='tab' title=t('shared.tooltips.shortcut', shortcut: 'ALT + 1') + i.fa.fa-code + = t('.workspace') + li + a data-placement='top' data-toggle='tab' data-tooltip=true href='#outputInformation' role='tab' title=t('shared.tooltips.shortcut', shortcut: 'ALT + 2') + i.fa.fa-terminal + = t('.output') + li + a data-placement='top' data-toggle='tab' data-tooltip=true href='#progress' role='tab' title=t('shared.tooltips.shortcut', shortcut: 'ALT + 3') + i.fa.fa-line-chart + = t('.progress') + + hr + + .tab-content + #workspace.tab-pane.active = render('editor', exercise: @exercise, files: @files, submission: @submission) + #outputInformation.tab-pane data-message-no-output=t('.no_output') + #hint + .panel.panel-warning + .panel-heading = t('.hint') + .panel-body + .row + / #output-col1.col-sm-12 + #output-col1 + // todo set to full width if turtle isnt used + #prompt.input-group.hidden + span.input-group-addon data-prompt=t('exercises.editor.input') = t('exercises.editor.input') + input#prompt-input.form-control type='text' + span.input-group-btn + button#prompt-submit.btn.btn-primary type="button" = t('exercises.editor.send') + #output + pre = t('.no_output_yet') + - if CodeOcean::Config.new(:code_ocean).read[:flowr][:enabled] + #flowrHint.panel.panel-info data-url=CodeOcean::Config.new(:code_ocean).read[:flowr][:url] role='tab' + .panel-heading = 'Gain more insights here' + .panel-body + #output-col2.col-lg-5.col-md-5 + #turtlediv + // todo what should the canvas default size be? + canvas#turtlecanvas.hidden width=400 height=400 style='border-style:solid;border-width:thin' + #progress.tab-pane + #results + h2 = t('.results') + p.test-count == t('.test_count', count: 0) + ul.list-unstyled + ul#dummies.hidden.list-unstyled + li.panel.panel-default + .panel-heading + h3.panel-title == t('.file', filename: '', number: 0) + .panel-body + = row(label: '.passed_tests', value: t('shared.out_of', maximum_value: 0, value: 0).html_safe) + = row(label: 'activerecord.attributes.submission.score', value: t('shared.out_of', maximum_value: 0, value: 0).html_safe) + = row(label: '.feedback') + = row(label: '.error_messages') + = row(label: '.output', value: link_to(t('shared.show'), '#')) + #score data-maximum-score=@exercise.maximum_score data-score=@submission.try(:score) + h4 + span == "#{t('activerecord.attributes.submission.score')}: " + span.score + .progress + .progress-bar role='progressbar' + + br + - if session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url') + p.text-center = render('editor_button', classes: 'btn-lg btn-success', data: {:'data-url' => submit_exercise_path(@exercise)}, icon: 'fa fa-send', id: 'submit', label: t('exercises.editor.submit')) + - else + p.text-center = render('editor_button', classes: 'btn-lg btn-warning-outline', data: {:'data-placement' => 'bottom', :'data-tooltip' => true} , icon: 'fa fa-clock-o', id: 'submit_outdated', label: t('exercises.editor.exercise_deadline_passed'), title: t('exercises.editor.tooltips.exercise_deadline_passed')) + + - if qa_url + #questions-column + #questions-holder data-url="#{qa_url}/qa/index/#{@exercise.id}/#{@user_id}" + = qa_js_tag \ No newline at end of file