cafe-grader-web Commit - r25:e58005f0efd2

r25:e58005f0efd2 - Sat, 09 Feb 2008 02:28:42 - 11 files changed: 51 inserted, 67 deleted

app/views/layouts/empty.html.erb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	2	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	3	+
	4	+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
	5	+ <head>
	6	+ <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
	7	+ <title>Grader!</title>
	8	+ <%= stylesheet_link_tag 'application' %>
	9	+ </head>
	10	+ <body>
	11	+
	12	+ <%= yield %>
	13	+
	14	+ </body>
	15	+ </html>

app/controllers/main_controller.rb ¶ +1 -2

                 before_filter :authenticate, :except => [:index, :login]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
-            -     MainController.layout 'login'
+            +     MainController.layout 'empty'
                   reset_session
                 end
                 def list
-            -     MainController.layout 'application'
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
                     @prob_submissions << [c,sub]
                   end
                 end
                 def submit
                   submission = Submission.new(params[:submission])
                   submission.user_id = session[:user_id]

app/helpers/application_helper.rb ¶ +20 -9

@@ -1,24 +1,35
1	# Methods added to this helper will be available to all templates in the application.	1	# Methods added to this helper will be available to all templates in the application.
2	module ApplicationHelper	2	module ApplicationHelper
3		3
4	def user_header	4	def user_header
5	options = ''	5	options = ''
6	user = User.find(session[:user_id])	6	user = User.find(session[:user_id])
7	- if user.admin?	7	+
8	- options = options + ' ' +	8	+ # main page
9	- (link_to_unless_current '[Problem admin]',
10	- :controller => 'problems', :action => 'index')
11	- options = options + ' ' +
12	- (link_to_unless_current '[User admin]',
13	- :controller => 'user_admin', :action => 'index')
14	- end
15	options += link_to_unless_current '[Main]',	9	options += link_to_unless_current '[Main]',
16	:controller => 'main', :action => 'list'	10	:controller => 'main', :action => 'list'
		11	+ options += ' '
		12	+
		13	+ # admin menu
		14	+ if user.admin?
		15	+ options +=
		16	+ (link_to_unless_current '[Problem admin]',
		17	+ :controller => 'problems', :action => 'index') + ' '
		18	+ options +=
		19	+ (link_to_unless_current '[User admin]',
		20	+ :controller => 'user_admin', :action => 'index') + ' '
		21	+ options +=
		22	+ (link_to_unless_current '[User stat]',
		23	+ :controller => 'user_admin', :action => 'user_stat') + ' '
		24	+ end
		25	+
		26	+ # general options
17	options += link_to_unless_current '[Settings]',	27	options += link_to_unless_current '[Settings]',
18	:controller => 'users', :action => 'index'	28	:controller => 'users', :action => 'index'
19	- options = ~~options~~ + ' ' +	29	+ options += ' '
		30	+ options +=
20	link_to('[Log out]', {:controller => 'main', :action => 'login'})	31	link_to('[Log out]', {:controller => 'main', :action => 'login'})
21	options	32	options
22	end	33	end
23		34
24	end	35	end

app/views/layouts/application.rhtml ¶ +1 -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>Grader!</title>
                 <%= stylesheet_link_tag 'application' %>
-            -   <%= javascript_include_tag :defaults %>
+            +   <%= yield :head %>
               </head>
               <body>
               <div class="userbar">
               <%= user_header %>
               </div>
               <p style="color: green"><%= flash[:notice] %></p>
               <%= yield  %>
               </body>

app/views/problems/list.rhtml ¶ +5

+            + <% content_for :head do %>
+            +   <%= stylesheet_link_tag 'scaffold' %>
+            +   <%= javascript_include_tag :defaults %>
+            + <% end %>
+            +
               <h1>Listing problems</h1>
               <div class="usermenu">
               <%= link_to 'Main', :controller => 'main', :action => 'list' %>
               </div>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
                   <th>Full score</th>
                   <th>Date added</th>

app/views/user_admin/list.rhtml ¶ +4 -5

-            - <h1>Listing users</h1>
+            + <% content_for :head do %>
+            +   <%= stylesheet_link_tag 'scaffold' %>
+            + <% end %>
-            - <div class="usermenu">
+            + <h1>Listing users</h1>
-            - <%= link_to 'Stat', :action => 'user_stat' %>
-            - <%= link_to 'Main', :controller => 'main', :action => 'list' %>
-            - </div>
               <div style="border: solid 1px; margin: 2px">
               <b>Quick add</b>
               <% form_tag :action => 'create' do %>
               <table border="0">
               <tr>
               <td><label for="user_name">Login</label></td>
               <td><label for="user_name">Full name</label></td>
               <td><label for="user_alias">Alias</label></td>
               <td><label for="password">Password</label></td>
               <td><label for="password_confirmation">confirm</label></td>
               </tr>

app/views/user_admin/show.rhtml ¶ +2

+            + <h1>User information</h1>
+            +
               <% for column in User.content_columns %>
               <p>
                 <b><%= column.human_name %>:</b> <%=h @user.send(column.name) %>
               </p>
               <% end %>
               <%= link_to 'Edit', :action => 'edit', :id => @user %> |
               <%= link_to 'Back', :action => 'list' %>

app/views/users/index.html.haml ¶ +3

+            +
+            + - content_for :head do
+            +   = javascript_include_tag :defaults
               %h1 Your account settings
               %p
                 You can edit your alias and e-mails.  Just click on the text and edit it.
               %table.uinfo
                 %tr
                   %th.uinfo Login
                   %td.uinfo= @user.login
                 %tr

app/views/layouts/login.html.erb removed ¶ -15

deleted file

app/views/layouts/problems.rhtml removed ¶ -18

deleted file

app/views/layouts/user_admin.rhtml removed ¶ -17

deleted file

	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

r25:e58005f0efd2 - Sat, 09 Feb 2008 02:28:42 - 11 files changed: 51 inserted, 67 deleted

Sign in to your account

Commit r25:e58005f0efd2 public

Author

r25:e58005f0efd2 - Sat, 09 Feb 2008 02:28:42 - 11 files changed: 51 inserted, 67 deleted

Commit `r25:e58005f0efd2` public