Merge remote-tracking branch 'origin/master' into ace-editor-exercise-edit

app/views/exercises/_editor_frame.html.slim

@@ -14,6 +14,6 @@
     .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
 
-  button.btn.btn-primary.requestCommentsButton type='button'
-    i.fa.fa-comment-o
+  button.btn.btn-primary.requestCommentsButton type='button' id="requestComments"
+    i.fa.fa-comment
     = t('exercises.editor.requestComments')

app/views/exercises/_form.html.slim

@@ -8,8 +8,8 @@
     = f.text_field(:title, class: 'form-control', required: true)
   .form-group
     = f.label(:description)
-    = f.hidden_field(:description)
-    .form-control.markdown
+    = f.pagedown_editor :description
+
   .form-group
     = f.label(:execution_environment_id)
     = f.collection_select(:execution_environment_id, @execution_environments, :id, :name, {}, class: 'form-control')
@@ -17,9 +17,6 @@
     = f.label(:instructions)
     = f.hidden_field(:instructions)
     .form-control.markdown
-  /.form-group
-    = f.label(:team_id)
-    = f.collection_select(:team_id, @teams, :id, :name, {include_blank: true}, class: 'form-control')
   .checkbox
     label
       = f.check_box(:public)

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

@@ -50,9 +50,9 @@ h1 = "#{@exercise} (external user #{@external_user})"
               td
                 -submission.testruns.each do |run|
                   - if run.passed
-                    .unit-test-result.positive-result
+                    .unit-test-result.positive-result  title=run.output
                   - else
-                    .unit-test-result.negative-result
+                    .unit-test-result.negative-result title=run.output
               td = Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0
               -working_times_until.push((Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0))
     p = t('.addendum')

app/views/exercises/index.html.slim

@@ -13,7 +13,6 @@ h1 = Exercise.model_name.human(count: 2)
     thead
       tr
         th = sort_link(@search, :title, t('activerecord.attributes.exercise.title'))
-        th = sort_link(@search, :user_id, t('activerecord.attributes.exercise.user'))
         th = sort_link(@search, :execution_environment_id, t('activerecord.attributes.exercise.execution_environment'))
         th = t('.test_files')
         th = t('activerecord.attributes.exercise.maximum_score')
@@ -27,17 +26,23 @@ h1 = Exercise.model_name.human(count: 2)
       - @exercises.each do |exercise|
         tr data-id=exercise.id
           td = exercise.title
-          td = link_to_if(exercise.author && policy(exercise.author).show?, exercise.author, exercise.author)
           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.public data-value=exercise.public? = symbol_for(exercise.public?)
-          td = link_to(t('shared.show'), exercise) if policy(exercise).show?
           td = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit?
-          td = link_to(t('shared.destroy'), exercise, data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(exercise).destroy?
-          td = link_to(t('.clone'), clone_exercise_path(exercise), data: {confirm: t('shared.confirm_destroy')}, method: :post) if policy(exercise).clone?
           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
+            .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('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?
+
 = render('shared/pagination', collection: @exercises)
 p = render('shared/new_button', model: Exercise)

app/views/exercises/show.html.slim

@@ -12,7 +12,6 @@ h1
 = row(label: 'exercise.description', value: render_markdown(@exercise.description))
 = 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.team', value: @exercise.team ? link_to(@exercise.team, @exercise.team) : nil)
 = row(label: 'exercise.maximum_score', value: @exercise.maximum_score)
 = row(label: 'exercise.public', value: @exercise.public?)
 = row(label: 'exercise.hide_file_tree', value: @exercise.hide_file_tree?)