Description:
change login page, always redirect index to login
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@9 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
Author
jittat
-
r6:1828434e55cd - - 4 files changed: 9 inserted, 7 deleted
| @@ -1,32 +1,33 | |||
|
|
1 | 1 | class MainController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | 3 | before_filter :authenticate, :except => [:index, :login] |
|
|
4 | 4 | |
|
|
5 | 5 | verify :method => :post, :only => [:submit], |
|
|
6 | 6 | :redirect_to => { :action => :index } |
|
|
7 | 7 | |
|
|
8 | 8 | def index |
|
|
9 | + redirect_to :action => 'login' | |
|
|
9 | 10 | end |
|
|
10 | 11 | |
|
|
11 | 12 | def login |
|
|
12 | 13 | reset_session |
|
|
13 | 14 | end |
|
|
14 | 15 | |
|
|
15 | 16 | def list |
|
|
16 | 17 | @problems = Problem.find_available_problems |
|
|
17 | 18 | @prob_submissions = Array.new |
|
|
18 | 19 | @user = User.find(session[:user_id]) |
|
|
19 | 20 | @problems.each do |p| |
|
|
20 | 21 | c, sub = Submission.find_by_user_and_problem(@user.id,p.id) |
|
|
21 | 22 | @prob_submissions << [c,sub] |
|
|
22 | 23 | end |
|
|
23 | 24 | end |
|
|
24 | 25 | |
|
|
25 | 26 | def submit |
|
|
26 | 27 | submission = Submission.new(params[:submission]) |
|
|
27 | 28 | submission.user_id = session[:user_id] |
|
|
28 | 29 | submission.language_id = 0 |
|
|
29 | 30 | source = params['file'].read |
|
|
30 | 31 | if source.length > 100_000 |
|
|
31 | 32 | flash[:notice] = 'Error: file too long' |
|
|
32 | 33 | elsif (lang = Submission.find_language_in_source(source))==nil |
| @@ -1,19 +1,25 | |||
|
|
1 |
- <h1> |
|
|
|
1 | + <h1>Grader</h1> | |
|
|
2 | + | |
|
|
3 | + <b>Welcome back!</b><br/> | |
|
|
4 | + Please login to see the problem list.<br/><br/> | |
|
|
2 | 5 | |
|
|
3 | 6 | <% if flash[:notice] %> |
|
|
4 | 7 | <hr> |
|
|
5 | 8 | <b><%= flash[:notice] %></b> |
|
|
6 | 9 | <hr> |
|
|
7 | 10 | <% end %> |
|
|
8 | 11 | |
|
|
12 | + <div style="border: solid 1px gray; padding: 2px; background: #f0f0f0;"> | |
|
|
9 | 13 | <% form_tag :controller => 'login', :action => 'login' do %> |
|
|
10 | 14 | <table> |
|
|
11 | 15 | <tr> |
|
|
12 | 16 | <td align="right">User name:</td><td><%= text_field_tag 'login' %></td> |
|
|
13 | 17 | </tr> |
|
|
14 | 18 | <tr> |
|
|
15 | 19 | <td align="right">Password:</td><td><%= password_field_tag %></td> |
|
|
16 | 20 | </tr> |
|
|
17 | 21 | </table> |
|
|
18 | 22 | <%= submit_tag 'Login' %> |
|
|
19 | 23 | <% end %> |
|
|
24 | + </div> | |
|
|
25 | + | |
| @@ -1,23 +1,23 | |||
|
|
1 | 1 | ActionController::Routing::Routes.draw do |map| |
|
|
2 | 2 | # The priority is based upon order of creation: first created -> highest priority. |
|
|
3 | 3 | |
|
|
4 | 4 | # Sample of regular route: |
|
|
5 | 5 | # map.connect 'products/:id', :controller => 'catalog', :action => 'view' |
|
|
6 | 6 | # Keep in mind you can assign values other than :controller and :action |
|
|
7 | 7 | |
|
|
8 | 8 | # Sample of named route: |
|
|
9 | 9 | # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' |
|
|
10 | 10 | # This route can be invoked with purchase_url(:id => product.id) |
|
|
11 | 11 | |
|
|
12 | 12 | # You can have the root of your site routed by hooking up '' |
|
|
13 | 13 | # -- just remember to delete public/index.html. |
|
|
14 | - map.connect '', :controller => 'main' | |
|
|
14 | + map.connect '', :controller => 'main', :action => 'login' | |
|
|
15 | 15 | |
|
|
16 | 16 | # Allow downloading Web Service WSDL as a file with an extension |
|
|
17 | 17 | # instead of a file named 'wsdl' |
|
|
18 | 18 | map.connect ':controller/service.wsdl', :action => 'wsdl' |
|
|
19 | 19 | |
|
|
20 | 20 | # Install the default route as the lowest priority. |
|
|
21 | 21 | map.connect ':controller/:action/:id.:format' |
|
|
22 | 22 | map.connect ':controller/:action/:id' |
|
|
23 | 23 | end |
| deleted file |
You need to be logged in to leave comments.
Login now