diff --git a/app/views/graders/list.html.haml b/app/views/graders/list.html.haml
--- a/app/views/graders/list.html.haml
+++ b/app/views/graders/list.html.haml
@@ -54,8 +54,8 @@
- @submission.each do |sub|
%tr.inactive
%td= link_to sub.id, submission_path(sub.id)
- %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
- %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
+ %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
+ %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
%td= "#{time_ago_in_words(sub.submitted_at)} ago"
%td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
%td= sub.grader_comment
@@ -72,8 +72,8 @@
- @backlog_submission.each do |sub|
%tr.inactive
%td= link_to sub.id, submission_path(sub.id)
- %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
- %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
+ %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
+ %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
%td= "#{time_ago_in_words(sub.submitted_at)} ago"
%td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
%td= sub.grader_comment
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -2,10 +2,15 @@
%nav
.container-fluid
.navbar-header
+ %button.navbar-toggle.collapsed{ data: {toggle: 'collapse', target: '#navbar-collapse'} }
+ %span.sr-only Togggle Navigation
+ %span.icon-bar
+ %span.icon-bar
+ %span.icon-bar
%a.navbar-brand{href: main_list_path}
%span.glyphicon.glyphicon-home
MAIN
- .collapse.navbar-collapse
+ .collapse.navbar-collapse#navbar-collapse
%ul.nav.navbar-nav
- if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
//= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
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
@@ -6,6 +6,8 @@
//%div.highlight{:style => "border: 1px solid black;"}
//=@formatted_code.html_safe
+
+
.containter
.row
.col-md-7
@@ -81,7 +83,19 @@
%td.text-right
%strong Compiler result
%td
- %pre= @submission.compiler_message
+ %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
+ view
+ .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= @submission.compiler_message
+ .modal-footer
+ %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
- if session[:admin]
%tr
%td.text-right
diff --git a/app/views/user_admin/index.html.haml b/app/views/user_admin/index.html.haml
--- a/app/views/user_admin/index.html.haml
+++ b/app/views/user_admin/index.html.haml
@@ -84,7 +84,7 @@
%th
- for user in @users
%tr
- %td= link_to user.login, controller: :users, :action => 'profile', :id => user
+ %td= link_to user.login, stat_user_path(user)
%td= user.full_name
%td= user.email
%td= user.remark