cafe-grader-web

Commit r65:7c52d3ded481 public

parent | child
Description:
[web] fixing ticket #10 git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@142 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r65:7c52d3ded481 - - 5 files changed: 14 inserted, 14 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -31,4 +31,14
31 :action => action)
31 :action => action)
32 end
32 end
33
33
34 + def format_short_time(time)
35 + now = Time.now
36 + st = ''
37 + if (time.yday != now.yday) or
38 + (time.year != now.year)
39 + st = time.strftime("%x ")
34 end
40 end
41 + st + time.strftime("%X")
42 + end
43 +
44 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,13 +1,3
1 module MainHelper
1 module MainHelper
2
2
3 - def format_short_time(time)
4 - now = Time.now
5 - st = ''
6 - if (time.yday != now.yday) or
7 - (time.year != now.year)
8 - st = time.strftime("%x ")
9 end
3 end
10 - st + time.strftime("%X")
11 - end
12 -
13 - end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -9,7 +9,7
9 </div>
9 </div>
10 <div style="display: none">
10 <div style="display: none">
11 <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
11 <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
12 - <%=h(compiler_message).gsub(/\n/,'<br/>') %>
12 + <%=simple_format(compiler_message) %>
13 </div>
13 </div>
14 </div></div>
14 </div></div>
15 <% end %>
15 <% end %>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,5 +1,5
1 %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
1 %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
2 - %td= test_request_counter +1
2 + %td= format_short_time(test_request.submitted_at)
3 %td= test_request.problem.full_name
3 %td= test_request.problem.full_name
4 %td= test_request.submission.number
4 %td= test_request.submission.number
5 %td= test_request.status_str
5 %td= test_request.status_str
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -57,9 +57,9
57
57
58 <table class="info">
58 <table class="info">
59 <tr class="info-head">
59 <tr class="info-head">
60 - <th></td>
60 + <th>at</th>
61 <th>problem</th>
61 <th>problem</th>
62 - <th>#</th>
62 + <th>sub #</th>
63 <th>status</th>
63 <th>status</th>
64 <th>running stat</th>
64 <th>running stat</th>
65 <th>output (first 2kb)</th>
65 <th>output (first 2kb)</th>
You need to be logged in to leave comments. Login now