cafe-grader-web Commit - r21:e66aa2c506e7

cafe-grader-web

Commit `r21:e66aa2c506e7` public

parent | child

Description:

+in_place_editing for problems git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@45 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

r21:e66aa2c506e7 - Fri, 08 Feb 2008 12:14:30 - 6 files changed: 36 inserted, 28 deleted

app/controllers/problems_controller.rb ¶ +4

               class ProblemsController < ApplicationController
                 before_filter :authenticate, :authorization
+            +   in_place_edit_for :problem, :name
+            +   in_place_edit_for :problem, :full_name
+            +   in_place_edit_for :problem, :full_score
+            +
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy, :create, :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end

app/helpers/main_helper.rb ¶ +4 -4

               module MainHelper
                 def format_short_time(time)
                   now = Time.now
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
-            -       st = time.strftime("%x")
+            +       st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_compiler_msg(sub)
                   <<cmpmsg
               <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;">
               Compiler message</a> (click to see)</div>
               <div style="display: none">
               <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
               #{h(sub.compiler_message).gsub(/\n/,'<br/>')}
               </div>
               </div></div>
               cmpmsg
                 end
                 def format_submission(sub, count)
-            -     msg = "#{count} submission(s)<br />"
+            +     msg = "#{count} submission(s)."
                   if count>0
                     msg = msg + "Last on " +
               	format_short_time(sub.submitted_at) + ' ' +
-            - 	link_to('[source]',{:action => 'get_source', :id => sub.id}) +
-            - 	"<br />"
+            + 	link_to('[source]',{:action => 'get_source', :id => sub.id})
                   end
+            +     msg += "<br/>"
                   if sub!=nil and sub.graded_at!=nil
                     msg = msg + 'Graded at ' + format_short_time(sub.graded_at) + ', score: '+
                       sub.points.to_s +
               	' [' + sub.grader_comment + "]<br />" +
               	format_compiler_msg(sub)
                   end
                   msg
                 end
               end

app/views/layouts/problems.rhtml ¶ +1

               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
               <head>
                 <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
                 <title>Problems: <%= controller.action_name %></title>
                 <%= stylesheet_link_tag 'scaffold' %>
+            +   <%= javascript_include_tag :defaults %>
               </head>
               <body>
               <p style="color: green"><%= flash[:notice] %></p>
               <%= yield  %>
               </body>
               </html>

app/views/main/list.rhtml ¶ +3 -16

-            - <h1>Hello <%=h @user.full_name %></h1>
-            - (<%= Time.new %>)
+            + <div class="title">Hello <%=h @user.full_name %></div>
+            + Current time is <%= format_short_time(Time.new) %>.
               <div class="submitbox">
               <% form_tag({:action => 'submit'}, :multipart => true) do %>
               Problem: <%= select 'submission', 'problem_id',
                            	[['Specified in header','-1']] +
               		@problems.collect {|p| [p.full_name, p.id]},
               		:selected => '-1' %>
               File: <%= file_field_tag 'file' %>
               <%= submit_tag 'Submit' %>
               <% end %>
               </div>
               <hr/>
               <p style="color: red"><%= flash[:notice] %></p>
               <div class="problist">
               <% i = 0 %>
               <% @problems.each do |p| %>
                 <div class="problist-each">
                 <div class="probname">
                   <%= "#{i+1}: #{p.full_name} (#{p.name})" %>
-            -     <%= link_to '[task description]', p.url if p.url!=nil %>
+            +     <%= link_to '[task description]', p.url if (p.url!=nil) and (p.url!='') %>
                 </div>
                 <div class="subinfo">
                   <%= format_submission(@prob_submissions[i][1],
               		@prob_submissions[i][0]) %>
                 </div>
                 </div>
                 <% i = i+1 %>
               <% end %>
               </div>
-            - <br />
               <hr />
-            - <br />
-            - <div class="submitbox">
-            - <% form_tag({:action => 'submit'}, :multipart => true) do %>
-            - Problem: <%= select 'submission', 'problem_id',
-            -              	[['Specified in header','-1']] +
-            - 		@problems.collect {|p| [p.full_name, p.id]},
-            - 		:selected => '-1' %>
-            - File: <%= file_field_tag 'file' %>
-            - <%= submit_tag 'Submit' %>
-            - <% end %>
-            - </div>
+            -

app/views/problems/list.rhtml ¶ +12 -6

               <h1>Listing problems</h1>
               <div class="usermenu">
               <%= link_to 'Main', :controller => 'main', :action => 'list' %>
               </div>
               <table>
                 <tr>
-            -   <% for column in Problem.content_columns %>
-            -     <th><%= column.human_name %></th>
-            -   <% end %>
+            +     <th>Name</th>
+            +     <th>Full name</th>
+            +     <th>Full score</th>
+            +     <th>Date added</th>
+            +     <th>Available</th>
                 </tr>
               <% for problem in @problems %>
                 <tr>
-            -   <% for column in Problem.content_columns %>
-            -     <td><%=h problem.send(column.name) %></td>
-            -   <% end %>
+            +     <% @problem=problem %>
+            +     <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %>
+            +     <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %>
+            +     <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %>
+            +     <td><%= problem.date_added %>
+            +     <td><%= problem.available %>
+            +
                   <td><%= link_to '[Toggle]', :action => 'toggle_avail', :id => problem.id %></td>
                   <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td>
                   <td><%= link_to '[Show]', :action => 'show', :id => problem %></td>
                   <td><%= link_to '[Edit]', :action => 'edit', :id => problem %></td>
                   <td><%= link_to '[Destroy]', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />

public/stylesheets/application.css ¶ +12 -2

               p {
                   font-size: 12px;
               }
+            + div.title {
+            +     font-size: 20px;
+            +     font-weight: bold;
+            +     background: lightgreen;
+            +     padding: 2px;
+            + }
+            +
               div.problist-each {
                   margin-top: 2px;
                   margin-bottom: 2px
               }
               div.usermenu {
                   border-top: thin solid grey;
                   border-bottom: thin solid grey;
-            -     text-align: right
+            +     text-align: right;
+            +     font-size: 12px;
               }
               div.probname {
                   background-color: #eeeeee;
                   font-weight: bold;
                   padding: 2px;
                   border: 1px solid black;
               }
               div.subinfo {
                   margin-left: 20px;
                   margin-top: 2px;
                   border-bottom: thin solid grey;
-            -     border-left: thin solid grey
+            +     border-left: thin solid grey;
+            +     font-size: 12px;
               }
               div.compilermsgbody {
                   font-family: monospace;
               }
               div.submitbox {
                   border: thin solid black;
                   padding: 5px;
                   color: white;
                   background-color: #777777;
+            +     font-weight: bold;
               }
               table.uinfo {
                   border-collapse: collapse;
                   border: 1px solid black;
                   font-size: 13px;
               }
               td.uinfo {
                   vertical-align: top;

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Author

r21:e66aa2c506e7 - Fri, 08 Feb 2008 12:14:30 - 6 files changed: 36 inserted, 28 deleted

Sign in to your account

Commit r21:e66aa2c506e7 public

Author

r21:e66aa2c506e7 - Fri, 08 Feb 2008 12:14:30 - 6 files changed: 36 inserted, 28 deleted

Commit `r21:e66aa2c506e7` public