Description:
update views
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@113 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r50:b1941b8f04c6 - - 4 files changed: 53 inserted, 22 deleted
@@ -1,11 +1,16 | |||||
|
1 | - <div class="problist-each"> |
|
1 | + <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>"> |
|
2 |
- <d |
|
2 | + <td class="info"> |
|
3 |
- <%= "#{problem_counter + 1} |
|
3 | + <%= "#{problem_counter + 1}" %> |
|
4 | - <%= link_to '[task description]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %> |
|
4 | + </td> |
|
5 | - </div> |
|
5 | + <td class="info"> |
|
6 | - <div class="subinfo"> |
|
6 | + <%= "#{problem.full_name} (#{problem.name})" %> |
|
|
7 | + <%= link_to '[desc]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %> | ||
|
|
8 | + </td> | ||
|
|
9 | + <td class="info" align="center"> | ||
|
|
10 | + <%= @prob_submissions[problem_counter][:count] %> | ||
|
|
11 | + </td> | ||
|
|
12 | + <td class="info"> | ||
|
7 | <%= render :partial => 'submission', |
|
13 | <%= render :partial => 'submission', |
|
8 |
- :locals => { :submission => @prob_submissions[problem_counter][:submission] |
|
14 | + :locals => { :submission => @prob_submissions[problem_counter][:submission]} %> |
|
9 | - :count => @prob_submissions[problem_counter][:count] } %> |
|
15 | + </td> |
|
10 | - </div> |
|
16 | + </tr> |
|
11 | - </div> |
|
@@ -1,16 +1,13 | |||||
|
1 |
|
1 | ||
|
2 | - - if count==0 |
|
2 | + - if submission==nil |
|
3 | - 0 submission |
|
3 | + = "-" |
|
4 | - else |
|
4 | - else |
|
5 | - = count |
|
5 | + - if submission.graded_at==nil |
|
6 | - submission(s). |
|
6 | + Submitted at |
|
7 | - Last on |
|
||
|
8 | = format_short_time(submission.submitted_at) |
|
7 | = format_short_time(submission.submitted_at) |
|
9 | - = link_to('[source]',{:action => 'get_source', :id => submission.id}) |
|
8 | + - else |
|
10 | - %br/ |
|
||
|
11 | - - if submission!=nil and submission.graded_at!=nil |
|
||
|
12 | = "Graded at #{format_short_time(submission.graded_at)}, " |
|
9 | = "Graded at #{format_short_time(submission.graded_at)}, " |
|
13 | = "score: #{submission.points} " |
|
10 | = "score: #{submission.points} " |
|
14 | = " [" + submission.grader_comment + "]" |
|
11 | = " [" + submission.grader_comment + "]" |
|
15 | - %br/ |
|
12 | + = " | " |
|
16 | - = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message } |
|
13 | + = link_to('[source]',{:action => 'get_source', :id => submission.id}) |
@@ -8,9 +8,15 | |||||
|
8 |
|
8 | ||
|
9 | <hr/> |
|
9 | <hr/> |
|
10 |
|
10 | ||
|
11 | - <div class="problist"> |
|
11 | + <table class="info"> |
|
|
12 | + <tr class="info-head"> | ||
|
|
13 | + <th class="info"></th> | ||
|
|
14 | + <th class="info">Tasks</th> | ||
|
|
15 | + <th class="info"># of sub(s)</th> | ||
|
|
16 | + <th class="info">Results</th> | ||
|
|
17 | + </tr> | ||
|
12 | <%= render :partial => 'problem', :collection => @problems %> |
|
18 | <%= render :partial => 'problem', :collection => @problems %> |
|
13 | - </div> |
|
19 | + </table> |
|
14 |
|
20 | ||
|
15 | <hr /> |
|
21 | <hr /> |
|
16 |
|
22 |
@@ -69,3 +69,26 | |||||
|
69 | border: 1px solid black; |
|
69 | border: 1px solid black; |
|
70 | padding: 5px; |
|
70 | padding: 5px; |
|
71 | } |
|
71 | } |
|
|
72 | + | ||
|
|
73 | + table.info { | ||
|
|
74 | + border: 1px solid black; | ||
|
|
75 | + border-collapse: collapse; | ||
|
|
76 | + font-size: 12px; | ||
|
|
77 | + } | ||
|
|
78 | + | ||
|
|
79 | + th.info, td.info { | ||
|
|
80 | + border: 1px solid black; | ||
|
|
81 | + } | ||
|
|
82 | + | ||
|
|
83 | + tr.info-head { | ||
|
|
84 | + background: #777777; | ||
|
|
85 | + color: white; | ||
|
|
86 | + } | ||
|
|
87 | + | ||
|
|
88 | + tr.info-odd { | ||
|
|
89 | + background: #dddddd; | ||
|
|
90 | + } | ||
|
|
91 | + | ||
|
|
92 | + tr.info-even { | ||
|
|
93 | + background: #eeeeee; | ||
|
|
94 | + } |
You need to be logged in to leave comments.
Login now