cafe-grader-web Commit - r27:e418fd4486af

cafe-grader-web

Commit `r27:e418fd4486af` public

parent | child

Description:

fixed layout problem, for real, using render :layout => ... git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@51 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

r27:e418fd4486af - Sat, 09 Feb 2008 17:36:09 - 5 files changed: 26 inserted, 26 deleted

app/views/layouts/application.html.erb created 644 ¶ +22

@@ -0,0 +1,22
	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	+ <%= yield :head %>
	10	+ </head>
	11	+ <body>
	12	+
	13	+ <div class="userbar">
	14	+ <%= user_header %>
	15	+ </div>
	16	+
	17	+ <p style="color: green"><%= flash[:notice] %></p>
	18	+
	19	+ <%= yield %>
	20	+
	21	+ </body>
	22	+ </html>

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

               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
-            -   layout 'application'
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
-            -     MainController.layout 'empty'
                   reset_session
+            +     render :action => 'login', :layout => 'empty'
                 end
                 def list
                   @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]
                   submission.language_id = 0
                   source = params['file'].read
                   if source.length > 100_000
                     flash[:notice] = 'Error: file too long'
                   elsif (lang = Submission.find_language_in_source(source))==nil
                     flash[:notice] = 'Error: cannot determine language used'
                   elsif ((submission.problem_id==-1) and
               	   !(problem=Submission.find_problem_in_source(source)))
                     flash[:notice] = 'Error: cannot determine problem submitted'

app/helpers/application_helper.rb ¶ +1 -1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   options = ''
                   user = User.find(session[:user_id])
                   # main page
                   options += link_to_unless_current '[Main]',
                                :controller => 'main', :action => 'list'
                   options += ' '
                   # admin menu
-            -     if user.admin?
+            +     if (user!=nil) and (user.admin?)
                     options +=
               	(link_to_unless_current '[Problem admin]',
                          :controller => 'problems', :action => 'index') + ' '
                     options +=
               	(link_to_unless_current '[User admin]',
                          :controller => 'user_admin', :action => 'index') + ' '
                     options +=
               	(link_to_unless_current '[User stat]',
                          :controller => 'user_admin', :action => 'user_stat') + ' '
                   end
                   # general options
                   options += link_to_unless_current '[Settings]',
                                :controller => 'users', :action => 'index'
                   options += ' '
                   options +=
                     link_to('[Log out]', {:controller => 'main', :action => 'login'})
                   options
                 end
               end

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

               <% 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>
+            + <%= link_to 'New problem', :action => 'new' %><br/>
+            +
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
                   <th>Full score</th>
                   <th>Date added</th>
                   <th>Available</th>
                 </tr>
               <% for problem in @problems %>
                 <tr>
                   <% @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>

app/views/layouts/application.rhtml removed ¶ -22

deleted file

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

r27:e418fd4486af - Sat, 09 Feb 2008 17:36:09 - 5 files changed: 26 inserted, 26 deleted

Sign in to your account

Commit r27:e418fd4486af public

Author

r27:e418fd4486af - Sat, 09 Feb 2008 17:36:09 - 5 files changed: 26 inserted, 26 deleted

Commit `r27:e418fd4486af` public