cafe-grader-web

Commit r6:1828434e55cd public

parent | child
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:
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

r6:1828434e55cd - - 4 files changed: 9 inserted, 7 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -6,6 +6,7
6 :redirect_to => { :action => :index }
6 :redirect_to => { :action => :index }
7
7
8 def index
8 def index
9 + redirect_to :action => 'login'
9 end
10 end
10
11
11 def login
12 def login
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,4 +1,7
1 - <h1>Login</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 <% if flash[:notice] %>
6 <% if flash[:notice] %>
4 <hr>
7 <hr>
@@ -6,6 +9,7
6 <hr>
9 <hr>
7 <% end %>
10 <% end %>
8
11
12 + <div style="border: solid 1px gray; padding: 2px; background: #f0f0f0;">
9 <% form_tag :controller => 'login', :action => 'login' do %>
13 <% form_tag :controller => 'login', :action => 'login' do %>
10 <table>
14 <table>
11 <tr>
15 <tr>
@@ -17,3 +21,5
17 </table>
21 </table>
18 <%= submit_tag 'Login' %>
22 <%= submit_tag 'Login' %>
19 <% end %>
23 <% end %>
24 + </div>
25 +
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -11,7 +11,7
11
11
12 # You can have the root of your site routed by hooking up ''
12 # You can have the root of your site routed by hooking up ''
13 # -- just remember to delete public/index.html.
13 # -- just remember to delete public/index.html.
14 - map.connect '', :controller => 'main'
14 + map.connect '', :controller => 'main', :action => 'login'
15
15
16 # Allow downloading Web Service WSDL as a file with an extension
16 # Allow downloading Web Service WSDL as a file with an extension
17 # instead of a file named 'wsdl'
17 # instead of a file named 'wsdl'
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now