cafe-grader-web Commit - r133:d6c2c8c51d7f

cafe-grader-web

Commit `r133:d6c2c8c51d7f` public

parent | child

Description:

[web] download through apache, sites highlight, logout for site admin git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@263 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

r133:d6c2c8c51d7f - Fri, 09 May 2008 19:07:12 - 6 files changed: 27 inserted, 9 deleted

app/controllers/site_controller.rb ¶ +5

                   else
                     render :action => 'prompt', :layout => 'empty'
                   end
                 end
                 def start
                   @site.started = true
                   @site.start_time = Time.new.gmtime
                   @site.save
                   redirect_to :action => 'index'
                 end
+            +   def logout
+            +     reset_session
+            +     redirect_to :controller => 'main', :action => 'login'
+            +   end
+            +
                 protected
                 def site_admin_authorization
                   if session[:site_id]==nil
                     redirect_to :controller => 'main', :action => 'login' and return
                   end
                   begin
                     @site = Site.find(session[:site_id], :include => :country)
                   rescue ActiveRecord::RecordNotFound
                     @site = nil
                   end
                   if @site==nil
                     redirect_to :controller => 'main', :action => 'login' and return

app/controllers/sites_controller.rb ¶ +1 -1

               class SitesController < ApplicationController
                 before_filter :admin_authorization
                 # GET /sites
                 # GET /sites.xml
                 def index
-            -     @sites = Site.find(:all)
+            +     @sites = Site.find(:all, :order => 'country_id')
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @sites }
                   end
                 end
                 # GET /sites/1
                 # GET /sites/1.xml
                 def show
                   @site = Site.find(params[:id])

app/controllers/tasks_controller.rb ¶ +10 -6

                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @problems = Problem.find_available_problems
                   @user = User.find(session[:user_id])
                 end
                 def view
                   base_filename = File.basename("#{params[:file]}.#{params[:ext]}")
                   filename = "#{RAILS_ROOT}/data/tasks/#{base_filename}"
+            +     #filename = "/home/ioi/web_grader/data/tasks/#{base_filename}"
+            +     #filename = "/home/ioi/web_grader/public/images/rails.png"
                   if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end
-            -     # ask Apache to send the file --- doesn't quite work...
-            -     #response.headers['Content-Type'] = "application/force-download"
+            +     response.headers['Content-Type'] = "application/force-download"
-            -     #response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
+            +     response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
-            -     #response.headers['Content-length'] = File.size(filename)
+            +     response.headers["X-Sendfile"] = filename
-            -     #response.headers['X-Sendfile'] = filename
+            +     response.headers['Content-length'] = File.size(filename)
-            -     #render :nothing => true
+            +     render :nothing => true
+            +
+            +     return
                   send_file filename, :stream => false, :filename => base_filename
                 end
                 protected
                 def check_viewability
                   user = User.find(session[:user_id])
                   if user==nil or !Configuration.show_tasks_to?(user)
                     redirect_to :controller => 'main', :action => 'list'
                     return false
                   end

app/views/site/prompt.html.haml ¶ +4

               = link_to 'refresh', :action => 'index'
               to update)
               %br/
               %br/
               - form_tag :action => 'start' do
                 When you're ready, you can click the button below to start the contest.
                 %br/
                 Please make sure that the contestants are ready.
                 After the contest is started, it <b>cannot</b> be paused or stopped.
                 %br/
                 = submit_tag 'Start the Contest.', :onclick => "return confirm('Are you sure?');"
+            +
+            + %br/
+            + %br/
+            + = link_to '[log out]', :action => 'logout'

app/views/site/started.html.haml ¶ +3 -1

               %br/
               %br/
               The contest at your site has been started at
               = "#{format_short_time(@site.start_time)} UTC"
               %br/
               %h3
                 Time left:
                 = "#{Time.at(@site.time_left).gmtime.strftime("%X")}"
+            + %br/
+            + %br/
+            + = link_to '[log out]', :action => 'logout'

app/views/sites/index.html.erb ¶ +4 -1

               <h1>Listing sites</h1>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Started</th>
                   <th>Start time</th>
                 </tr>
               <% for site in @sites %>
-            -   <tr>
+            +   <% background = "white" %>
+            +   <% background = "grey" if (site.started==true) and (site.finished? == true) %>
+            +   <% background = "lightgreen" if (site.started==true) and (site.finished? != true) %>
+            +   <tr style="background: <%= background %>;">
                   <td><%=h site.name %></td>
                   <td><%=h site.started %></td>
                   <td><%=h site.start_time %></td>
                   <td><%= link_to 'Show', site %></td>
                   <td><%= link_to 'Edit', edit_site_path(site) %></td>
                   <td><%= link_to 'Destroy', site, :confirm => 'Are you sure?', :method => :delete %></td>
                 </tr>
               <% end %>
               </table>
               <br />

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

r133:d6c2c8c51d7f - Fri, 09 May 2008 19:07:12 - 6 files changed: 27 inserted, 9 deleted

Sign in to your account

Commit r133:d6c2c8c51d7f public

Author

r133:d6c2c8c51d7f - Fri, 09 May 2008 19:07:12 - 6 files changed: 27 inserted, 9 deleted

Commit `r133:d6c2c8c51d7f` public