Merge remote-tracking branch 'origin/master' into flowr

# Conflicts:
#	app/assets/javascripts/editor/evaluation.js
#	app/assets/javascripts/editor/participantsupport.js
#	app/views/exercises/_editor_output.html.slim
#	config/code_ocean.yml.example
#	config/routes.rb

app/views/exercises/_code_field.html.slim

@@ -3,5 +3,5 @@
   |  
   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', rows: 16, style: "display:none;")
-  = form.file_field(attribute, class: 'alternative-input form-control', disabled: true)
+  = form.file_field(attribute, class: 'alternative-input form-control-file', disabled: true)
   = render partial: 'editor_edit', locals: { exercise: @exercise }

app/views/exercises/_editor.html.slim

@@ -6,8 +6,7 @@
 - hide_rfc_button = @hide_rfc_button || false
 #editor.row data-exercise-id=@exercise.id data-message-depleted=t('exercises.editor.depleted') data-message-timeout=t('exercises.editor.timeout',  permitted_execution_time: @exercise.execution_environment.permitted_execution_time) data-errors-url=execution_environment_errors_path(exercise.execution_environment) data-submissions-url=submissions_path data-user-id=@current_user.id data-user-external-id=external_user_external_id data-working-times-url=working_times_exercise_path(@exercise) data-intervention-save-url=intervention_exercise_path(@exercise) data-rfc-interventions=show_rfc_interventions data-break-interventions=show_break_interventions data-course_token=@course_token data-search-save-url=search_exercise_path(@exercise)
   div id="sidebar" class=(@exercise.hide_file_tree ? 'sidebar-col-collapsed' : 'sidebar-col') = render('editor_file_tree', exercise: @exercise, files: @files)
-  div id='output_sidebar' class='output-col-collapsed' = render('exercises/editor_output', external_user_id: external_user_id, consumer_id: consumer_id )
-  div id='frames' class='editor-col'
+  div.editor-col.col.p-0 id='frames'
     #editor-buttons.btn-group.enforce-bottom-margin
       = render('editor_button', disabled: true, icon: 'fa fa-ban', id: 'dummy', label: t('exercises.editor.dummy'))
       = render('editor_button', icon: 'fa fa-desktop', id: 'render', label: t('exercises.editor.render'))
@@ -24,6 +23,7 @@
       = t('exercises.editor.lastsaved')
       span
       button style="display:none" id="autosave"
+  div id='output_sidebar' class='output-col-collapsed' = render('exercises/editor_output', external_user_id: external_user_id, consumer_id: consumer_id )
 
 
 = render('shared/modal', id: 'comment-modal', title: t('exercises.implement.comment.request'), template: 'exercises/_request_comment_dialogcontent')

app/views/exercises/_editor_button.html.slim

@@ -1,4 +1,4 @@
-button.btn class=local_assigns.fetch(:classes, 'btn-primary btn-sm') *local_assigns.fetch(:data, {}) disabled=local_assigns.fetch(:disabled, false) id=id title=local_assigns[:title] type='button'
+button.btn class=local_assigns.fetch(:classes, 'btn-primary') *local_assigns.fetch(:data, {}) disabled=local_assigns.fetch(:disabled, false) id=id title=local_assigns[:title] type='button'
   i.fa.fa-circle-o-notch.fa-spin
-  i class=icon
+  i class=(label.present? ? icon : "#{icon} m-0")
   = label

app/views/exercises/_editor_edit.html.slim

@@ -1,5 +1,5 @@
-#editor-edit.panel-group.row.original-input data-exercise-id=@exercise.id
+#editor-edit.original-input data-exercise-id=@exercise.id
   #frames
     .edit-frame
-      .editor-content.hidden
-      .editor
+      .editor-content.d-none
+      .editor.allow_ace_tooltip

app/views/exercises/_editor_file_tree.html.slim

@@ -1,18 +1,18 @@
-div id='sidebar-collapsed' class=(@exercise.hide_file_tree ? '' : 'hidden')
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus-square', id: 'sidebar-collapse-collapsed', label:'', title:t('exercises.editor.expand_action_sidebar'))
+div id='sidebar-collapsed' class=(@exercise.hide_file_tree ? '' : 'd-none')
+  = render('editor_button', classes: 'btn-block btn-primary btn', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus-square', id: 'sidebar-collapse-collapsed', label:'', title:t('exercises.editor.expand_action_sidebar'))
 
   - if @exercise.allow_file_creation and not @exercise.hide_file_tree?
-    = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-cause' => 'file', :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus', id: 'create-file-collapsed', label:'', title: t('exercises.editor.create_file'))
+    = render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-cause' => 'file', :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus', id: 'create-file-collapsed', label:'', title: t('exercises.editor.create_file'))
 
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-download', id: 'download-collapsed', label:'', title: t('exercises.editor.download'))
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise), :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-history', id: 'start-over-collapsed', label:'', title: t('exercises.editor.start_over'))
-  - if !@course_token.blank?
-    = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-search', id: 'sidebar-search-collapsed', label: '', title: t('search.search_in_forum'))
+  = render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-download', id: 'download-collapsed', label:'', title: t('exercises.editor.download'))
+  = render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise), :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-history', id: 'start-over-collapsed', label:'', title: t('exercises.editor.start_over'))
+  //- if !@course_token.blank?
+    = render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-search', id: 'sidebar-search-collapsed', label: '', title: t('search.search_in_forum'))
 
-div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'hidden' : '')
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: t('exercises.editor.collapse_action_sidebar'))
+div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'd-none' : '')
+  = render('editor_button', classes: 'btn-block btn-primary btn', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: t('exercises.editor.collapse_action_sidebar'))
 
-  div class=(@exercise.hide_file_tree ? 'hidden' : '')
+  div class=(@exercise.hide_file_tree ? 'd-none' : '')
     hr
 
     #files data-entries=FileTree.new(files).to_js_tree
@@ -20,11 +20,11 @@ div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'hidden' : '')
     hr
 
   - if @exercise.allow_file_creation and not @exercise.hide_file_tree?
-    = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-cause' => 'file'}, icon: 'fa fa-plus', id: 'create-file', label: t('exercises.editor.create_file'))
-    = render('editor_button', classes: 'btn-block btn-warning btn-sm', data: {:'data-cause' => 'file', :'data-message-confirm' => t('shared.confirm_destroy')}, icon: 'fa fa-times', id: 'destroy-file', label: t('exercises.editor.destroy_file'))
+    = render('editor_button', classes: 'btn-block btn-primary btn', data: {:'data-cause' => 'file'}, icon: 'fa fa-plus', id: 'create-file', label: t('exercises.editor.create_file'))
+    = render('editor_button', classes: 'btn-block btn-warning btn', data: {:'data-cause' => 'file', :'data-message-confirm' => t('shared.confirm_destroy')}, icon: 'fa fa-times', id: 'destroy-file', label: t('exercises.editor.destroy_file'))
 
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', icon: 'fa fa-download', id: 'download', label: t('exercises.editor.download'))
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise)}, icon: 'fa fa-history', id: 'start-over', label: t('exercises.editor.start_over'))
+  = render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', icon: 'fa fa-download', id: 'download', label: t('exercises.editor.download'))
+  = render('editor_button', classes: 'btn-block btn-primary btn', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise)}, icon: 'fa fa-history', id: 'start-over', label: t('exercises.editor.start_over'))
 
   //- if !@course_token.blank?
       .input-group.enforce-top-margin

app/views/exercises/_editor_frame.html.slim

@@ -11,5 +11,5 @@
       - else
         = link_to(file.native_file.file.name_with_extension, file.native_file.url)
   - else
-    .editor-content.hidden data-file-id=file.ancestor_id = file.content
+    .editor-content.d-none 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-allow-auto-completion=exercise.allow_auto_completion.to_s data-id=file.id

app/views/exercises/_editor_output.html.slim

@@ -1,58 +1,60 @@
 div id='output_sidebar_collapsed'
-  = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: t('exercises.editor.expand_output_sidebar'), icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '')
-div id='output_sidebar_uncollapsed' class='hidden col-sm-12 enforce-bottom-margin' data-message-no-output=t('exercises.implement.no_output')
+  = render('editor_button', classes: 'btn-block btn-primary btn', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: t('exercises.editor.expand_output_sidebar'), icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '')
+div.h-100 id='output_sidebar_uncollapsed' class='d-none col-sm-12 enforce-bottom-margin' data-message-no-output=t('exercises.implement.no_output')
   .row
-    = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_output_sidebar'))
+    = render('editor_button', classes: 'btn-block btn-primary btn', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_output_sidebar'))
 
-  div.enforce-big-top-margin.hidden id='score_div'
-    #results
-      h2 = t('exercises.implement.results')
-      p.test-count == t('exercises.implement.test_count', count: 0)
-      ul.list-unstyled
-      ul#dummies.hidden.list-unstyled
-        li.panel.panel-default
-          .panel-heading
-            h3.panel-title == t('exercises.implement.file', filename: '', number: 0)
-          .panel-body
-            = row(label: 'exercises.implement.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: 'exercises.implement.feedback')
-            = row(label: 'exercises.implement.error_messages')
-            /= row(label: 'exercises.implement.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'
+  div.position-absolute.d-flex.mb-1.w-100 style="overflow: auto; left: 0; bottom: 0; height: calc(100% - 3rem);"
+    div.w-100
+      div.enforce-big-top-margin.d-none id='score_div'
+        #results
+          h2 = t('exercises.implement.results')
+          p.test-count == t('exercises.implement.test_count', count: 0)
+          ul.list-unstyled
+          ul#dummies.d-none.list-unstyled
+            li.card.mt-2
+              .card-header.py-2
+                h5.card-title.m-0 == t('exercises.implement.file', filename: '', number: 0)
+              .card-body.bg-white.text-dark
+                = row(label: 'exercises.implement.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: 'exercises.implement.feedback')
+                = row(label: 'exercises.implement.error_messages')
+                /= row(label: 'exercises.implement.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 lti_outcome_service?(@exercise.id, external_user_id, consumer_id)
-      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'))
-    hr
-
-  div.enforce-big-top-margin
-    #turtlediv
-      canvas#turtlecanvas.hidden width=400 height=400
-  div.enforce-big-top-margin
-    #hint
-      .panel.panel-warning
-        .panel-heading = t('exercises.implement.hint')
-        .panel-body
-  div.enforce-big-top-margin
-    #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')
-    #error-hints
-      .heading = t('exercises.implement.error_hints.heading')
-      ul.body
-    #output
-      pre = t('exercises.implement.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 = t('exercises.implement.flowr.heading')
-        .panel-body
+        br
+        - if lti_outcome_service?(@exercise.id, external_user_id, consumer_id)
+          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-secondary disabled', 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'))
+        hr
+      div.enforce-big-top-margin
+        #turtlediv
+          canvas#turtlecanvas.d-none width=400 height=400
+      div.enforce-big-top-margin
+        #hint
+          .card.bg-warning.text-white
+            .card-header = t('exercises.implement.hint')
+            .card-body
+      div.enforce-big-top-margin
+        #prompt.input-group.d-none
+          div.input-group-prepend
+            span.input-group-text 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')
+        #error-hints
+          .heading = t('exercises.implement.error_hints.heading')
+          ul.body
+        #output.mt-2
+          pre = t('exercises.implement.no_output_yet')
+        - if CodeOcean::Config.new(:code_ocean).read[:flowr][:enabled]
+          #flowrHint.card.text-white.bg-info data-url=CodeOcean::Config.new(:code_ocean).read[:flowr][:url] role='tab'
+            .card-header = t('exercises.implement.flowr.heading')
+            .card-body

app/views/exercises/_file_form.html.slim

@@ -1,41 +1,42 @@
 - id = f.object.id
 
-li.panel.panel-default
-  .panel-heading role="tab" id="heading"
-    a.file-heading data-toggle="collapse" href="#collapse#{id}"
+li.card.mt-2
+  .card-header role="tab" id="heading"
+    a.file-heading.collapsed data-toggle="collapse" href="#collapse#{id}"
       div.clearfix role="button"
+        i class="fa" aria-hidden="true"
         span = f.object.name
-  .panel-collapse.collapse class=('in' if f.object.name.nil?) id="collapse#{id}" role="tabpanel"
-    .panel-body
+  .card-collapse.collapse class=('in' if f.object.name.nil?) id="collapse#{id}" role="tabpanel"
+    .card-body
       - if policy(f.object).destroy?
         .clearfix
-          .btn.btn-warning.btn-sm.pull-right.delete-file data-file-url=code_ocean_file_path(id) = t('shared.destroy')
+          .btn.btn-warning.btn-sm.float-right.delete-file data-file-url=code_ocean_file_path(id) = t('shared.destroy')
       .form-group
         = f.label(:name, t('activerecord.attributes.file.name'))
         = f.text_field(:name, class: 'form-control')
       .form-group
         = f.label(:path, t('activerecord.attributes.file.path'))
         = f.text_field(:path, class: 'form-control')
-        .help-block = t('.hints.path')
+        .help-block.form-text = t('.hints.path')
       .form-group
         = f.label(:file_type_id, t('activerecord.attributes.file.file_type_id'))
         = f.collection_select(:file_type_id, @file_types, :id, :name, {}, class: 'form-control')
       .form-group
         = f.label(:role, t('activerecord.attributes.file.role'))
         = f.select(:role, CodeOcean::File::TEACHER_DEFINED_ROLES.map { |role| [t("files.roles.#{role}"), role] }, {include_blank: true}, class: 'form-control')
-      .checkbox
-        label
-          = f.check_box(:hidden)
+      .form-check
+        label.form-check-label
+          = f.check_box(:hidden, class: 'form-check-input')
           = t('activerecord.attributes.file.hidden')
-      .checkbox
-        label
-          = f.check_box(:read_only)
+      .form-check.mb-3
+        label.form-check-label
+          = f.check_box(:read_only, class: 'form-check-input')
           = t('activerecord.attributes.file.read_only')
       .test-related-fields style="display: #{f.object.teacher_defined_test? ? 'initial' : 'none'};"
         .form-group
           = f.label(:name, t('activerecord.attributes.file.feedback_message'))
           = f.text_area(:feedback_message, class: 'form-control', maxlength: 255)
-          .help-block = t('.hints.feedback_message')
+          .help-block.form-text = 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')

app/views/exercises/_form.html.slim

@@ -1,14 +1,14 @@
 - execution_environments = ExecutionEnvironment.where('file_type_id IS NOT NULL').select(:file_type_id, :id)
 - file_types = FileType.where('file_extension IS NOT NULL').select(:file_extension, :id)
 
-= form_for(@exercise, data: {execution_environments: execution_environments, file_types: file_types}, multipart: true) do |f|
+= form_for(@exercise, data: {execution_environments: execution_environments, file_types: file_types}, multipart: true, builder: PagedownFormBuilder) do |f|
   = render('shared/form_errors', object: @exercise)
   .form-group
     = f.label(:title)
     = f.text_field(:title, class: 'form-control', required: true)
   .form-group
     = f.label(:description)
-    = f.pagedown_editor :description
+    = f.pagedown :description, input_html: { preview: true, rows: 10 }
   .form-group
     = f.label(:execution_environment_id)
     = f.collection_select(:execution_environment_id, @execution_environments, :id, :name, {}, class: 'form-control')
@@ -16,34 +16,34 @@
     = f.label(:instructions)
     = f.hidden_field(:instructions)
     .form-control.markdown
-  .checkbox
-    label
-      = f.check_box(:public)
+  .form-check
+    label.form-check-label
+      = f.check_box(:public, class: 'form-check-input')
       = t('activerecord.attributes.exercise.public')
-  .checkbox
-    label
-      = f.check_box(:hide_file_tree)
+  .form-check
+    label.form-check-label
+      = f.check_box(:hide_file_tree, class: 'form-check-input')
       = t('activerecord.attributes.exercise.hide_file_tree')
-  .checkbox
-    label
-      = f.check_box(:allow_file_creation)
+  .form-check
+    label.form-check-label
+      = f.check_box(:allow_file_creation, class: 'form-check-input')
       = t('activerecord.attributes.exercise.allow_file_creation')
-  .checkbox
-    label
-      = f.check_box(:allow_auto_completion)
+  .form-check.mb-3
+    label.form-check-label
+      = f.check_box(:allow_auto_completion, class: 'form-check-input')
       = t('activerecord.attributes.exercise.allow_auto_completion')
   .form-group
     = f.label(t('activerecord.attributes.exercise.difficulty'))
-    = f.number_field :expected_difficulty, in: 1..10, step: 1
+    = f.number_field :expected_difficulty, in: 1..10, step: 1, class: 'form-control'
 
   h2 = t('exercises.form.tags')
-  ul.list-unstyled.panel-group
-    li.panel.panel-default
-      .panel-heading role="tab" id="heading"
+  ul.list-unstyled.card-group
+    li.card
+      .card-header role="tab" id="heading"
         a.file-heading data-toggle="collapse" href="#tag-collapse"
           div.clearfix role="button"
             span = t('exercises.form.click_to_collapse')
-      .panel-collapse.collapse id="tag-collapse" role="tabpanel"
+      .card-collapse.collapse id="tag-collapse" role="tabpanel"
         .table-responsive
           table.table#tags-table
             thead
@@ -55,15 +55,15 @@
                 tr
                   td = b.check_box
                   td = b.object.tag.name
-                  td = number_field "tag_factors[#{b.object.tag.id}]", :factor, :value => b.object.factor, in: 1..10, step: 1
+                  td = number_field "tag_factors[#{b.object.tag.id}]", :factor, :value => b.object.factor, in: 1..10, step: 1, class: 'form-control-sm'
 
   h2 = t('activerecord.attributes.exercise.files')
-  ul#files.list-unstyled.panel-group
+  ul#files.list-unstyled
     = 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')
-  ul#dummies.hidden = f.fields_for(:files, CodeOcean::File.new, child_index: 'index') do |files_form|
+  a#add-file.btn.btn-secondary.btn-sm.float-right href='#' = t('.add_file')
+  ul#dummies.d-none = f.fields_for(:files, CodeOcean::File.new, child_index: 'index') do |files_form|
     = render('file_form', f: files_form)
 
   .actions = render('shared/submit_button', f: f, object: @exercise)

app/views/exercises/_request_comment_dialogcontent.html.slim

@@ -2,7 +2,7 @@ h5#rfc_intervention_text style='display: none;' = t('exercises.implement.rfc_int
 h5 = t('exercises.implement.comment.question')
 
 
-textarea.form-control#question(style='resize:none;')
+textarea.form-control.flex-grow-1#question(style='resize:none;')
 p = ''
 / data-cause='requestComments' is not used here right now, we pass the button #requestComments (not askForCommentsButton) as initiator of the action. 
 / But if we use this button, it will work since the correct cause is supplied

app/views/exercises/external_users/statistics.html.slim

@@ -10,21 +10,21 @@ h1 = "#{@exercise} (external user #{@external_user})"
       - file_types.add(ActiveSupport::JSON.encode(file.file_type))
     - all_files.push(submission.files)
 
-  .hidden#data data-submissions=ActiveSupport::JSON.encode(@submissions) data-files=ActiveSupport::JSON.encode(all_files) data-file-types=ActiveSupport::JSON.encode(file_types)
+  .d-none#data data-submissions=ActiveSupport::JSON.encode(@submissions) data-files=ActiveSupport::JSON.encode(all_files) data-file-types=ActiveSupport::JSON.encode(file_types)
 
   #stats-editor.row
     - index = 0
     - all_files.each do |files|
-      .files class=(@exercise.hide_file_tree ? 'hidden col-sm-3' : 'col-sm-3') data-index=index data-entries=FileTree.new(files).to_js_tree
+      .files class=(@exercise.hide_file_tree ? 'd-none col-sm-3' : 'col-sm-3') data-index=index data-entries=FileTree.new(files).to_js_tree
       - index += 1
     div class=(@exercise.hide_file_tree ? 'col-sm-12' : 'col-sm-9')
       #current-file.editor
 
   .flex-container
-    button.btn.btn-default id='play-button'
+    button.btn.btn-secondary id='play-button'
       span.fa.fa-play
     #submissions-slider.flex-item
-      input type='range' orient='horizontal' list='datapoints' min=0 max=@submissions.length-1 value=0
+      input type='range' orient='horizontal' list='datapoints' min=0 max=@submissions.length-1 value=0 style="width: 100%"
       datalist#datapoints
         - index=0
         - @submissions.each do |submission|
@@ -59,7 +59,7 @@ h1 = "#{@exercise} (external user #{@external_user})"
                 td =
                 td = @working_times_until[index] if index > 0
     p = t('.addendum')
-    .hidden#wtimes data-working_times=ActiveSupport::JSON.encode(@working_times_until);
+    .d-none#wtimes data-working_times=ActiveSupport::JSON.encode(@working_times_until);
     div#progress_chart.col-lg-12
       .graph-functions-2
 

app/views/exercises/feedback.html.slim

@@ -8,17 +8,17 @@ h1 = link_to(@exercise, exercise_path(@exercise))
   - if @feedbacks.nil? or @feedbacks.size == 0
     .no-feedback = t('user_exercise_feedback.no_feedback')
 
-  ul.list-unstyled.panel-group
+  ul.list-unstyled
     - @feedbacks.each do |feedback|
-      li.panel.panel-default
-        .panel-heading role="tab" id="heading"
+      li.card.mt-2
+        .card-header role="tab" id="heading"
           div.clearfix.feedback-header
             span.username = link_to(feedback.user.name, statistics_external_user_exercise_path(id: @exercise.id, external_user_id: feedback.user.id))
             - if feedback.anomaly_notification
               i class="fa fa-envelope-o" data-placement="top" data-toggle="tooltip" data-container="body" title=feedback.anomaly_notification.reason
             span.date = feedback.created_at
-        .panel-collapse role="tabpanel"
-          .panel-body.feedback
+        .card-collapse role="tabpanel"
+          .card-body.feedback
             .text = feedback.feedback_text
             .difficulty = "#{t('user_exercise_feedback.difficulty')} #{feedback.difficulty}" if feedback.difficulty
             .worktime = "#{t('user_exercise_feedback.working_time')} #{feedback.user_estimated_worktime}" if feedback.user_estimated_worktime

app/views/exercises/implement.html.slim

@@ -2,13 +2,13 @@
   #editor-column.col-md-12
     .exercise.clearfix
       div
-        span.badge.pull-right.score
+        span.badge.badge-pill.badge-primary.float-right.score
 
         h1 id="exercise-headline"
           i class="fa fa-chevron-down" id="description-symbol"
           = @exercise.title
 
-      #description-panel.lead.description-panel
+      #description-card.lead.description-card
         = render_markdown(@exercise.description)
 
       a#toggle href="#" data-show=t('shared.show') data-hide=t('shared.hide') = t('shared.hide')

app/views/exercises/index.html.slim

@@ -9,45 +9,43 @@ h1 = Exercise.model_name.human(count: 2)
     = f.search_field(:title_cont, class: 'form-control', placeholder: t('activerecord.attributes.exercise.title'))
 
 .table-responsive
-  table.table
+  table.table.mt-4
     thead
       tr
-        th = sort_link(@search, :title, t('activerecord.attributes.exercise.title'))
-        th = sort_link(@search, :execution_environment_id, t('activerecord.attributes.exercise.execution_environment'))
-        th = t('.test_files')
-        th = t('activerecord.attributes.exercise.maximum_score')
-        th = t('activerecord.attributes.exercise.tags')
-        th = t('activerecord.attributes.exercise.difficulty')
-        th
+        th.p-1 = sort_link(@search, :title, t('activerecord.attributes.exercise.title'))
+        th.p-1 = sort_link(@search, :execution_environment_id, t('activerecord.attributes.exercise.execution_environment'))
+        th.p-1 = t('.test_files')
+        th.p-1 = t('activerecord.attributes.exercise.maximum_score')
+        th.p-1 = t('activerecord.attributes.exercise.tags')
+        th.p-1 = t('activerecord.attributes.exercise.difficulty')
+        th.p-1
           = t('activerecord.attributes.exercise.public')
           - if policy(Exercise).batch_update?
             br
             span.batch = link_to(t('shared.batch_update'), '#', 'data-text' => t('shared.update', model: t('activerecord.models.exercise.other')))
-        th colspan=6 = t('shared.actions')
+        th.p-1 colspan=6 = t('shared.actions')
     tbody
       - @exercises.each do |exercise|
         tr data-id=exercise.id
-          td = exercise.title
-          td = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
-          td = exercise.files.teacher_defined_tests.count
-          td = exercise.maximum_score
-          td = exercise.exercise_tags.count
-          td = exercise.expected_difficulty
-          td.public data-value=exercise.public? = symbol_for(exercise.public?)
-          td = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit?
-          td = link_to(t('.implement'), implement_exercise_path(exercise)) if policy(exercise).implement?
-          td = link_to(t('shared.statistics'), statistics_exercise_path(exercise)) if policy(exercise).statistics?
+          td.p-1.pt-2 = link_to(exercise.title, exercise, 'data-turbolinks' => "false") if policy(exercise).show?
+          td.p-1.pt-2 = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
+          td.p-1.pt-2 = exercise.files.teacher_defined_tests.count
+          td.p-1.pt-2 = exercise.maximum_score
+          td.p-1.pt-2 = exercise.exercise_tags.count
+          td.p-1.pt-2 = exercise.expected_difficulty
+          td.p-1.pt-2.public data-value=exercise.public? = symbol_for(exercise.public?)
+          td.p-1.pt-2 = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit?
+          td.p-1.pt-2 = link_to(t('.implement'), implement_exercise_path(exercise)) if policy(exercise).implement?
+          td.p-1.pt-2 = link_to(t('shared.statistics'), statistics_exercise_path(exercise), 'data-turbolinks' => "false") if policy(exercise).statistics?
 
-          td
+          td.p-1
             .btn-group
-              button.btn.btn-primary-outline.btn-xs.dropdown-toggle data-toggle="dropdown" type="button" = t('shared.actions_button')
-              span.caret
-              span.sr-only Toggle Dropdown
-              ul.dropdown-menu.pull-right role="menu"
-                li = link_to(t('shared.show'), exercise) if policy(exercise).show?
-                li = link_to(t('activerecord.models.user_exercise_feedback.other'), feedback_exercise_path(exercise)) if policy(exercise).feedback?
-                li = link_to(t('shared.destroy'), exercise, data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(exercise).destroy?
-                li = link_to(t('.clone'), clone_exercise_path(exercise), data: {confirm: t('shared.confirm_destroy')}, method: :post) if policy(exercise).clone?
+              button.btn.btn-outline-primary.btn-sm.dropdown-toggle data-toggle="dropdown" type="button" = t('shared.actions_button')
+              ul.dropdown-menu.float-right role="menu"
+                li = link_to(t('shared.show'), exercise, 'data-turbolinks' => "false", class: 'dropdown-item') if policy(exercise).show?
+                li = link_to(t('activerecord.models.user_exercise_feedback.other'), feedback_exercise_path(exercise), class: 'dropdown-item') if policy(exercise).feedback?
+                li = link_to(t('shared.destroy'), exercise, data: {confirm: t('shared.confirm_destroy')}, method: :delete, class: 'dropdown-item') if policy(exercise).destroy?
+                li = link_to(t('.clone'), clone_exercise_path(exercise), data: {confirm: t('shared.confirm_destroy')}, method: :post, class: 'dropdown-item') if policy(exercise).clone?
 
 = render('shared/pagination', collection: @exercises)
 p = render('shared/new_button', model: Exercise)

app/views/exercises/show.html.slim

@@ -1,6 +1,9 @@
 - content_for :head do
-  = javascript_include_tag('http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js')
-  = stylesheet_link_tag('http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css')
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, code might not be highlighted correctly (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_pack_tag('highlight', 'data-turbolinks-track': true)
+  = stylesheet_pack_tag('highlight', media: 'all', 'data-turbolinks-track': true)
 
 h1
   = @exercise
@@ -9,7 +12,7 @@ h1
 
 = row(label: 'exercise.title', value: @exercise.title)
 = row(label: 'exercise.user', value: link_to_if(policy(@exercise.author).show?, @exercise.author, @exercise.author))
-= row(label: 'exercise.description', value: render_markdown(@exercise.description))
+= row(label: 'exercise.description', value: render_markdown(@exercise.description), class: 'm-0')
 = row(label: 'exercise.execution_environment', value: link_to_if(policy(@exercise.execution_environment).show?, @exercise.execution_environment, @exercise.execution_environment))
 /= row(label: 'exercise.instructions', value: render_markdown(@exercise.instructions))
 = row(label: 'exercise.maximum_score', value: @exercise.maximum_score)
@@ -17,24 +20,23 @@ h1
 = row(label: 'exercise.hide_file_tree', value: @exercise.hide_file_tree?)
 = row(label: 'exercise.allow_file_creation', value: @exercise.allow_file_creation?)
 = row(label: 'exercise.allow_auto_completion', value: @exercise.allow_auto_completion?)
-= row(label: 'exercise.embedding_parameters') do
-  = content_tag(:input, nil, class: 'form-control', readonly: true, value: embedding_parameters(@exercise))
 = row(label: 'exercise.difficulty', value: @exercise.expected_difficulty)
 = row(label: 'exercise.tags', value: @exercise.exercise_tags.map{|et| "#{et.tag.name} (#{et.factor})"}.sort.join(", "))
+= row(label: 'exercise.embedding_parameters', class: 'mb-4') do
+  = content_tag(:input, nil, class: 'form-control mb-4', readonly: true, value: embedding_parameters(@exercise))
 
-h2 = t('activerecord.attributes.exercise.files')
+h2.mt-4 = t('activerecord.attributes.exercise.files')
 
-ul.list-unstyled.panel-group#files
-  - @exercise.files.order('name').each do |file|
-    li.panel.panel-default
-      .panel-heading role="tab" id="heading"
-        a.file-heading data-toggle="collapse" data-parent="#files" href=".collapse#{file.id}"
+ul.list-unstyled#files
+  - @exercise.files.each do |file|
+    li.card.mt-2
+      .card-header role="tab" id="heading"
+        a.file-heading.collapsed data-toggle="collapse" data-parent="#files" href=".collapse#{file.id}"
           div.clearfix role="button"
+            i class="fa" aria-hidden="true"
             span = file.name_with_extension
-            // probably set an icon here that shows that the rows can be collapsed
-            //span.pull-right.collapse.in class="collapse#{file.id}" &#9788
-      .panel-collapse.collapse class="collapse#{file.id}" role="tabpanel"
-        .panel-body
+      .card-collapse.collapse class="collapse#{file.id}" role="tabpanel"
+        .card-body
           - if policy(file).destroy?
-            .clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm pull-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete)
+            .clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm float-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete)
           = render('shared/file', file: file)

app/views/exercises/statistics.html.slim

@@ -1,4 +1,8 @@
-script src="http://labratrevenge.com/d3-tip/javascripts/d3.tip.v0.6.3.js"
+- content_for :head do
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, code might not be highlighted correctly (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_pack_tag('d3-tip', 'data-turbolinks-track': true)
 h1 = @exercise
 
 = row(label: '.participants', value: @exercise.users.distinct.count)
@@ -28,12 +32,12 @@ h1 = @exercise
       -working_time = @exercise.average_working_time_for(user.id) or 0
       -working_time_array.push working_time
     hr
-    .hidden#data data-working-time=ActiveSupport::JSON.encode(working_time_array)
+    .d-none#data data-working-time=ActiveSupport::JSON.encode(working_time_array)
     .graph-functions
     div#chart_1
     hr
-    /div#chart_2
-    /hr
+    div#chart_2
+    hr
   .table-responsive
     table.table.table-striped.sortable
       thead