cafe-grader-web Commit - r65:7c52d3ded481

cafe-grader-web

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r65:7c52d3ded481 - Fri, 21 Mar 2008 17:05:08 - 5 files changed: 14 inserted, 14 deleted

app/helpers/application_helper.rb ¶ +10

                   append_to menu_items, '[Log out]', 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
+            +   def format_short_time(time)
+            +     now = Time.now
+            +     st = ''
+            +     if (time.yday != now.yday) or
+            + 	(time.year != now.year)
+            +       st = time.strftime("%x ")
                   end
+            +     st + time.strftime("%X")
+            +   end
+            +
+            + end

app/helpers/main_helper.rb ¶ -10

app/views/main/_compiler_message.html.erb ¶ +1 -1

               <% if compiler_message==nil or compiler_message=='' %>
                 No message
               <% else %>
                 <div><div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;
               if(n.style.display == 'none') { n.style.display = 'block'; }
               else {n.style.display ='none'; } return false;">
                   (click to see)</a>
                   </div>
                   <div style="display: none">
                     <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
-            -         <%=h(compiler_message).gsub(/\n/,'<br/>') %>
+            +         <%=simple_format(compiler_message) %>
                     </div>
                 </div></div>
               <% end %>

app/views/test/_test_request.html.haml ¶ +1 -1

               %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
-            -   %td= test_request_counter +1
+            +   %td= format_short_time(test_request.submitted_at)
                 %td= test_request.problem.full_name
                 %td= test_request.submission.number
                 %td= test_request.status_str
                 %td= simple_format((test_request.running_stat or ''))
                 %td
                   - if test_request.output_file_name!=nil
                     = link_to '[output]', :action => 'read', :id => test_request.id
                 %td= test_request.grader_comment or ''
                 %td= simple_format((test_request.compiler_message or ''))

app/views/test/index.html.erb ¶ +2 -2

                   <tr>
                     <td colspan="2">
                       <%= submit_tag 'submit' %>
                     </td>
                   </tr>
                 </table>
               <% end %>
               <h3>Previous requests</h3>
               <table class="info">
                 <tr class="info-head">
-            -     <th></td>
+            +     <th>at</th>
                   <th>problem</th>
-            -     <th>#</th>
+            +     <th>sub #</th>
                   <th>status</th>
                   <th>running stat</th>
                   <th>output (first 2kb)</th>
                   <th>grading comment</th>
                   <th>compiler message</th>
                 </tr>
                 <%= render :partial => 'test_request', :collection => @test_requests %>
               </table>
               <% end %>

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings