diff --git a/app/views/application/_submission_short.html.haml b/app/views/application/_submission_short.html.haml --- a/app/views/application/_submission_short.html.haml +++ b/app/views/application/_submission_short.html.haml @@ -23,8 +23,10 @@ - if GraderConfiguration.show_grading_result = link_to '[detailed result]', :action => 'result', :id => submission.id - if submission.graded_at - %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}} - =t 'main.cmp_msg' + = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission), {popup: true,remote: true,class: 'btn btn-xs btn-info'} + -# + %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}} + =t 'main.cmp_msg' = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info' = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' diff --git a/app/views/submissions/edit.html.haml b/app/views/submissions/edit.html.haml --- a/app/views/submissions/edit.html.haml +++ b/app/views/submissions/edit.html.haml @@ -48,18 +48,19 @@ = render :partial => 'submission_short', :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id } -- if @submission - .modal.fade#compiler{tabindex: -1,role: 'dialog'} - .modal-dialog.modal-lg{role:'document'} - .modal-content - .modal-header - %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} - %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} × - %h4 Compiler message - .modal-body - %pre#compiler_msg= @submission.compiler_message - .modal-footer - %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close +.modal.fade#compiler{tabindex: -1,role: 'dialog'} + .modal-dialog.modal-lg{role:'document'} + .modal-content + .modal-header + %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} + %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} × + %h4 Compiler message + .modal-body + %pre#compiler_msg + - if @submission + = @submission.compiler_message + .modal-footer + %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close :javascript $(document).ready(function() { diff --git a/app/views/submissions/show.html.haml b/app/views/submissions/show.html.haml --- a/app/views/submissions/show.html.haml +++ b/app/views/submissions/show.html.haml @@ -30,11 +30,14 @@ %td.text-right %strong User %td - - if @submission.user - = link_to "#{@submission.user.login}", stat_user_path(@submission.user) - = @submission.user.full_name + - if @current_user.admin? ||@current_user == @submission.user + - if @submission.user + = link_to "#{@submission.user.login}", stat_user_path(@submission.user) + = @submission.user.full_name + - else + = "(n/a)" - else - = "(n/a)" + = '-- REDACTED --' %tr %td.text-right %strong Task