diff --git a/app/views/problems/stat.html.haml b/app/views/problems/stat.html.haml --- a/app/views/problems/stat.html.haml +++ b/app/views/problems/stat.html.haml @@ -25,9 +25,9 @@ %h2 Submissions - if @submissions and @submissions.count > 0 - %table.info#main_table + %table#main_table.table.table-condensed.table-striped %thead - %tr.info-head + %tr %th ID %th Login %th Name @@ -40,14 +40,18 @@ - @submissions.each do |sub| - next unless sub.user - row_odd,curr = !row_odd, sub.user if curr != sub.user - %tr{class: row_odd ? "info-odd" : "info-even"} + %tr %td= link_to sub.id, submission_path(sub) %td= link_to sub.user.login, stat_user_path(sub.user) %td= sub.user.full_name - %td= time_ago_in_words(sub.submitted_at) + " ago" + %td{data: {order: sub.submitted_at}}= time_ago_in_words(sub.submitted_at) + " ago" %td= sub.points %td.fix-width= sub.grader_comment %td= sub.ip_address - else No submission +:javascript + $("#main_table").DataTable({ + paging: false + }); 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 @@ -1,4 +1,4 @@ -%h1 Listing users +%h1 Users .panel.panel-primary .panel-title.panel-heading @@ -41,8 +41,8 @@ %p = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '} = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '} + = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default btn-info'} = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '} - = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default '} = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '} = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '} = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '} diff --git a/app/views/users/stat.html.haml b/app/views/users/stat.html.haml --- a/app/views/users/stat.html.haml +++ b/app/views/users/stat.html.haml @@ -36,7 +36,7 @@ =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}} -%table.tablesorter-cafe#submission_table +%table#submission_table.table.table-striped %thead %tr %th ID @@ -64,3 +64,7 @@ +:javascript + $("#submission_table").DataTable({ + paging: false + });