diff --git a/app/views/main/_problem.html.erb b/app/views/main/_problem.html.erb
--- a/app/views/main/_problem.html.erb
+++ b/app/views/main/_problem.html.erb
@@ -1,15 +1,15 @@
">
-
+ |
<%= "#{problem_counter + 1}" %>
|
-
+ |
<%= "#{problem.full_name} (#{problem.name})" %>
<%= link_to '[desc]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
|
-
+ |
<%= @prob_submissions[problem_counter][:count] %>
|
-
+ |
<%= render :partial => 'submission_short',
:locals => { :submission => @prob_submissions[problem_counter][:submission]} %>
|
diff --git a/app/views/main/list.rhtml b/app/views/main/list.rhtml
--- a/app/views/main/list.rhtml
+++ b/app/views/main/list.rhtml
@@ -10,10 +10,10 @@
- |
- Tasks |
- # of sub(s) |
- Results |
+ |
+ Tasks |
+ # of sub(s) |
+ Results |
<%= render :partial => 'problem', :collection => @problems %>
diff --git a/app/views/problems/list.rhtml b/app/views/problems/list.rhtml
--- a/app/views/problems/list.rhtml
+++ b/app/views/problems/list.rhtml
@@ -6,10 +6,6 @@
Listing problems
-
-
<%= link_to 'New problem', :action => 'new' %>
<%= link_to 'Turn off all problems', :action => 'turn_all_off' %>
diff --git a/app/views/problems/stat.rhtml b/app/views/problems/stat.rhtml
--- a/app/views/problems/stat.rhtml
+++ b/app/views/problems/stat.rhtml
@@ -1,21 +1,24 @@
Problem stat: <%= @problem.name %>
-
-
This is just a hack. Really not efficient.
<% if @submissions!=nil %>
-
- user_id | submitted_at | points | comment |
+
+
+ user_id |
+ submitted_at |
+ points |
+ comment |
+
+ <% count = 0 %>
<% @submissions.each do |sub| %>
-
+
">
<%= sub.user_id %> |
<%= sub.submitted_at.to_s %> |
<%= sub.points %> |
<%= sub.grader_comment %> |
+ <% count += 1 %>
<% end %>
<% else %>
diff --git a/app/views/test/_test_request.html.haml b/app/views/test/_test_request.html.haml
--- a/app/views/test/_test_request.html.haml
+++ b/app/views/test/_test_request.html.haml
@@ -1,11 +1,11 @@
%tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
- %td.info= test_request_counter +1
- %td.info= test_request.problem.full_name
- %td.info= test_request.submission.number
- %td.info= test_request.status_str
- %td.info= test_request.running_stat or ''
- %td.info
+ %td= test_request_counter +1
+ %td= test_request.problem.full_name
+ %td= test_request.submission.number
+ %td= test_request.status_str
+ %td= test_request.running_stat or ''
+ %td
- if test_request.output_file_name!=nil
= link_to '[output]', :action => 'read', :id => test_request.id
- %td.info= test_request.grader_comment or ''
- %td.info= test_request.compiler_message or ''
+ %td= test_request.grader_comment or ''
+ %td= test_request.compiler_message or ''
diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb
--- a/app/views/test/index.html.erb
+++ b/app/views/test/index.html.erb
@@ -57,14 +57,14 @@
-
- | problem |
- # |
- status |
- running stat |
- output (first 2kb) |
- grading comment |
- compiler message |
+
+ | problem |
+ # |
+ status |
+ running stat |
+ output (first 2kb) |
+ grading comment |
+ compiler message |
<%= render :partial => 'test_request', :collection => @user.test_requests %>
diff --git a/app/views/user_admin/user_stat.rhtml b/app/views/user_admin/user_stat.rhtml
--- a/app/views/user_admin/user_stat.rhtml
+++ b/app/views/user_admin/user_stat.rhtml
@@ -1,19 +1,16 @@
-User stat
-
-
+User grading results
-
-User |
+
+User |
<% @problems.each do |p| %>
- <%= p.name %> |
+ <%= p.name %> |
<% end %>
-Total |
+Total |
+Passed |
+<% counter = 0 %>
<% @scorearray.each do |sc| %>
-
+
">
<% total = 0 %>
<% num_passed = 0 %>
<% sc.each_index do |i| %>
@@ -28,5 +25,6 @@
<%= total %> |
<%= num_passed %> |
+ <% counter += 1 %>
<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -26,11 +26,11 @@
font-size: 12px;
}
-th.info {
+table.info th {
border: 1px solid black;
}
-td.info {
+table.info td {
border-left: 1px solid black;
border-right: 1px solid black;
}
diff --git a/public/stylesheets/scaffold.css b/public/stylesheets/scaffold.css
--- a/public/stylesheets/scaffold.css
+++ b/public/stylesheets/scaffold.css
@@ -1,11 +1,5 @@
body { background-color: #fff; color: #333; }
-div.usermenu {
- border-top: thin solid grey;
- border-bottom: thin solid grey;
- text-align: right
-}
-
body, p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;