cafe-grader-web Commit - r162:39cf7851046e

cafe-grader-web

Commit `r162:39cf7851046e` public

parent | child

Description:

MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@359 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

r162:39cf7851046e - Sun, 12 Apr 2009 15:33:19 - 70 files changed: 899 inserted, 391 deleted

.gitignore created 644 ¶ +4

@@ -0,0 +1,4
	1	+ *~
	2	+ log
	3	+ config/environment.rb
	4	+ config/database.yml

app/controllers/application_controller.rb created 644 ¶ +76

@@ -0,0 +1,76
	1	+ # Filters added to this controller apply to all controllers in the application.
	2	+ # Likewise, all the methods added will be available for all controllers.
	3	+
	4	+ class ApplicationController < ActionController::Base
	5	+ # Pick a unique cookie name to distinguish our session data from others'
	6	+ session :session_key => '_grader_session_id'
	7	+
	8	+ SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
	9	+
	10	+ def admin_authorization
	11	+ return false unless authenticate
	12	+ user = User.find(session[:user_id], :include => ['roles'])
	13	+ redirect_to :controller => 'main', :action => 'login' unless user.admin?
	14	+ end
	15	+
	16	+ def authorization_by_roles(allowed_roles)
	17	+ return false unless authenticate
	18	+ user = User.find(session[:user_id])
	19	+ unless user.roles.detect { \|role\| allowed_roles.member?(role.name) }
	20	+ flash[:notice] = 'You are not authorized to view the page you requested'
	21	+ redirect_to :controller => 'main', :action => 'login'
	22	+ return false
	23	+ end
	24	+ end
	25	+
	26	+ protected
	27	+
	28	+ def authenticate
	29	+ unless session[:user_id]
	30	+ redirect_to :controller => 'main', :action => 'login'
	31	+ return false
	32	+ end
	33	+
	34	+ #Configuration.reload
	35	+ # check if run in single user mode
	36	+ if (Configuration[SINGLE_USER_MODE_CONF_KEY])
	37	+ user = User.find(session[:user_id])
	38	+ if user==nil or user.login != 'root'
	39	+ redirect_to :controller => 'main', :action => 'login'
	40	+ return false
	41	+ end
	42	+ end
	43	+
	44	+ return true
	45	+ end
	46	+
	47	+ def authorization
	48	+ return false unless authenticate
	49	+ user = User.find(session[:user_id])
	50	+ unless user.roles.detect { \|role\|
	51	+ role.rights.detect{ \|right\|
	52	+ right.controller == self.class.controller_name and
	53	+ (right.action == 'all' or right.action == action_name)
	54	+ }
	55	+ }
	56	+ flash[:notice] = 'You are not authorized to view the page you requested'
	57	+ #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
	58	+ redirect_to :controller => 'main', :action => 'login'
	59	+ return false
	60	+ end
	61	+ end
	62	+
	63	+ def verify_time_limit
	64	+ return true if session[:user_id]==nil
	65	+ user = User.find(session[:user_id], :include => :site)
	66	+ return true if user==nil or user.site == nil
	67	+ if user.site.finished?
	68	+ flash[:notice] = 'Error: the contest on your site is over.'
	69	+ redirect_to :back
	70	+ return false
	71	+ end
	72	+ return true
	73	+ end
	74	+
	75	+ end
	76	+

app/views/site/login.html.haml created 644 ¶ +39

@@ -0,0 +1,39
	1	+ %script{:type => 'text/javascript'}
	2	+ var siteList = new Array();
	3	+ - @countries.each do \|country\|
	4	+ = "siteList[#{country.id}] = new Array();"
	5	+ - country.sites.each do \|site\|
	6	+ = "siteList[#{country.id}][#{site.id}] = \"#{site.name}\";"
	7	+
	8	+ var allSiteList = new Array();
	9	+ - @site_select.each do \|sel\|
	10	+ = "allSiteList[#{sel[1]}]=\"#{sel[0]}\";"
	11	+
	12	+ %script{:type => 'text/javascript', :src => '/javascripts/site_update.js'}
	13	+
	14	+ %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
	15	+ %h2 For Site Administrator.
	16	+
	17	+ - if @default_site
	18	+ - form_for :login, nil, :url => {:controller => 'login', :action => 'site_login'} do \|f\|
	19	+ %b Log in for default site.
	20	+ = f.hidden_field :site_id, :value => @default_site.id
	21	+ %br/
	22	+ Password:
	23	+ = f.password_field :password
	24	+ = submit_tag "Site Administrator Login"
	25	+
	26	+ - else
	27	+ Please select your country and site and login.
	28	+ - form_for :login, nil, :url => {:controller => 'login', :action => 'site_login'} do \|f\|
	29	+ Country:
	30	+ = select :site_country, :id, @country_select_with_all, {}, {:onchange => "updateSiteList();", :onclick => "updateSiteList();" }
	31	+ Site:
	32	+ = select :login, :site_id, @site_select
	33	+ %br/
	34	+ Password:
	35	+ = f.password_field :password
	36	+ = submit_tag "Site Administrator Login"
	37	+
	38	+ %script{:type => 'text/javascript'}
	39	+ updateSiteList();

config/locales/en.yml created 644 ¶ +118

@@ -0,0 +1,118
	1	+ # Sample localization file for English. Add more files in this directory for other locales.
	2	+ # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
	3	+
	4	+ en:
	5	+ cancel: 'Cancel'
	6	+
	7	+ login_label: 'Login'
	8	+ full_name_label: 'Full name'
	9	+ email_label: 'E-mail'
	10	+ password_label: 'Password'
	11	+
	12	+ go_ahead_to: "Go ahead to"
	13	+ go_back_to: "Go back to"
	14	+ login_page: "login page"
	15	+ home_page: "home page"
	16	+
	17	+ menu:
	18	+ main: 'Main'
	19	+ messages: 'Messages'
	20	+ tasks: 'Tasks'
	21	+ submissions: 'Submissions'
	22	+ test: 'Test Interface'
	23	+ help: 'Help'
	24	+ settings: 'Settings'
	25	+ log_out: 'Log out'
	26	+
	27	+ title_bar:
	28	+ current_time: "Current time is"
	29	+ remaining_time: "Time left: "
	30	+ contest_not_started: "The contest has not started."
	31	+
	32	+ login:
	33	+ message: 'Please login to see the problem list'
	34	+ login_submit: 'Login'
	35	+ participation: 'Want to participate?'
	36	+ please: 'Please'
	37	+ register: 'register'
	38	+
	39	+ main:
	40	+ start_soon: "The contest at your site will start soon. Please wait."
	41	+ specified_in_header: "Specified in header"
	42	+
	43	+ problem_desc: "desc"
	44	+ submitted_at: "Submitted at"
	45	+ graded_at: "Graded at"
	46	+ score: "score: "
	47	+ cmp_msg: "compiler msg"
	48	+ src_link: "src"
	49	+ submissions_link: "submissions"
	50	+
	51	+ test:
	52	+ title: "Test Interface"
	53	+ intro: "You can test your submission with your own test data on the grading environment using this test interface."
	54	+ disabled_at_end_announcement: "<b>Note:</b> Test interface will be disabled in the last 30 minutes of the contest time on your site."
	55	+
	56	+ registration:
	57	+ title: "New user registration"
	58	+ successful_title: "Registration successful"
	59	+
	60	+ login_guide: "Only a-z, A-Z, 0-9 and _. Can be at most 20 characters long"
	61	+ email_guide: "Please make sure that your e-mail is correct.<br/>You'll need to verify your account by email."
	62	+ register: "Register"
	63	+
	64	+ email_body: "Hello {{full_name}},
	65	+
	66	+ You have registered for {{contest_name}}
	67	+
	68	+ Your login is: {{login}}
	69	+
	70	+ Your password is: {{password}}
	71	+
	72	+ Please follow the link:
	73	+
	74	+ {{activation_url}}
	75	+
	76	+ to activate your user account.
	77	+
	78	+ If you did not register, please ignore this e-mail
	79	+ and report this event to {{admin_email}}.
	80	+
	81	+ Thanks!"
	82	+
	83	+ email_sent: "We have sent a confimation message to your e-mail. (Please also check the Junk mail box."
	84	+ email_verify_at: "Please check at {{email}} and confirm."
	85	+
	86	+ activation_sucessful_title: "User activated"
	87	+ account_activated: "Your account has been activated."
	88	+
	89	+ activation_failed_title: "Activation failed"
	90	+
	91	+ errors:
	92	+ header: "Errors occured during registration"
	93	+ email:
	94	+ title: "Errors in sending registration confirmation"
	95	+ expl: "<h2>Your user account has been created, but the system cannot send you the confirmation e-mail.</h2>
	96	+ Maybe there's a problem in the configuration. Please report the admin at {{email}}.<br/>Thank you!"
	97	+ activation:
	98	+ email_exists: "A user with this E-mail exists."
	99	+ invalid: "Your activation code is invalid. Please check again."
	100	+
	101	+ help:
	102	+ how_to_submit: "How to submit"
	103	+ must_specify_language: "You <b>must</b> specify the language you are using in your program header. You can optionally specify the task you are submitting to."
	104	+ list_available_language: "The possible language options are <tt>C</tt>, <tt>C++</tt>, and <tt>Pascal</tt>. The follow are examples."
	105	+ accept_only_language_specified: "The server <b>will not</b> accept your submission, if you do not specify the language."
	106	+ specifying_task: "Optionally, you can also specify the task with <tt>TASK:</tt> <i>taskname</i>. On the first page, the taskname for each task is shown in parentheses."
	107	+ example_cpp: "For example, suppose you are using <tt>C++</tt> to write task <b>mobiles</b>, you put the following on top of your source code."
	108	+ example_pas: "If you are using <tt>Pascal</tt> to write the same task, you'll use"
	109	+ ask_questions_at_messages: "If you have any problems, you can ask at [<a href=\"{{url}}\">{{message_link_name}}</a>]."
	110	+
	111	+ activerecord:
	112	+ attributes:
	113	+ user:
	114	+ login: "login"
	115	+ full_name: "full name"
	116	+ email: "e-mail"
	117	+ province: "province"
	118	+

config/locales/th.rb created 644 ¶ +106

@@ -0,0 +1,106
	1	+ {
	2	+ :'th' => {
	3	+ :date => {
	4	+ :formats => {
	5	+ :default => lambda { \|date\| "%d-%m-#{date.year+543}" },
	6	+ :short => "%e %b",
	7	+ :long => lambda { \|date\| "%e %B #{date.year+543}" },
	8	+ :long_ordinal => lambda { \|date\| "%e %B #{date.year+543}" },
	9	+ :only_day => "%e"
	10	+ },
	11	+ :day_names => %w(อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์),
	12	+ :abbr_day_names => %w(อา จ อ พ พฤ ศ ส),
	13	+ :month_names => [nil] + %w(มกราคม กุมภาพันธ์ มีนาคม เมษายน พฤษภาคม มิถุนายน กรกฎาคม สิงหาคม กันยายน ตุลาคม พฤศจิกายน ธันวาคม),
	14	+ :abbr_month_names => [nil] + %w(ม.ค. ก.พ. มี.ค. เม.ย. พ.ค. มิ.ย. ก.ค. ส.ค. ก.ย. ต.ค. พ.ย. ธ.ค.),
	15	+ :order => [:day, :month, :year]
	16	+ },
	17	+ :time => {
	18	+ :formats => {
	19	+ :default => lambda { \|time\| "%a %d %b #{time.year+543} %H:%M:%S %Z" },
	20	+ :time => "%H:%M น.",
	21	+ :short => "%d %b %H:%M น.",
	22	+ :long => lambda { \|time\| "%d %B #{time.year+543} %H:%M น." },
	23	+ :long_ordinal => lambda { \|time\| "%d %B #{time.year+543} %H:%M น." },
	24	+ :only_second => "%S"
	25	+ },
	26	+ :time_with_zone => {
	27	+ :formats => {
	28	+ :default => lambda { \|time\| "%Y-%m-%d %H:%M:%S #{time.formatted_offset(false, 'UTC')}" }
	29	+ }
	30	+ },
	31	+ :am => '',
	32	+ :pm => ''
	33	+ },
	34	+ :datetime => {
	35	+ :formats => {
	36	+ :default => "%Y-%m-%dT%H:%M:%S%Z"
	37	+ },
	38	+ :distance_in_words => {
	39	+ :half_a_minute => 'ครึ่งนาทีที่ผ่านมา',
	40	+ :less_than_x_seconds => 'น้อยกว่า {{count}} วินาที',
	41	+ :x_seconds => '{{count}} วินาที',
	42	+ :less_than_x_minutes => 'น้อยกว่า {{count}} วินาที',
	43	+ :x_minutes => '{{count}} นาที',
	44	+ :about_x_hours => 'ประมาณ {{count}} ชั่วโมง',
	45	+ :x_hours => '{{count}} ชั่วโมง',
	46	+ :about_x_days => 'ประมาณ {{count}} วัน',
	47	+ :x_days => '{{count}} วัน',
	48	+ :about_x_months => 'ประมาณ {{count}} เดือน',
	49	+ :x_months => '{{count}} เดือน',
	50	+ :about_x_years => 'ประมาณ {{count}} ปี',
	51	+ :over_x_years => 'เกิน {{count}} ปี'
	52	+ }
	53	+ },
	54	+
	55	+ # numbers
	56	+ :number => {
	57	+ :format => {
	58	+ :precision => 3,
	59	+ :separator => '.',
	60	+ :delimiter => ','
	61	+ },
	62	+ :currency => {
	63	+ :format => {
	64	+ :unit => 'Baht',
	65	+ :precision => 2,
	66	+ :format => '%n %u'
	67	+ }
	68	+ },
	69	+ },
	70	+
	71	+ # Active Record
	72	+ :activerecord => {
	73	+ :errors => {
	74	+ :template => {
	75	+ :header => {
	76	+ :one => "ไม่สามารถบันทึก {{model}} ได้เนื่องจากเกิดข้อผิดพลาด",
	77	+ :other => "ไม่สามารถบันทึก {{model}} ได้เนื่องจากเกิด {{count}} ข้อผิดพลาด"
	78	+ },
	79	+ :body => "โปรดตรวจสอบข้อมูลที่คุณกรอกในช่องต่อไปนี้:"
	80	+ },
	81	+ :messages => {
	82	+ :inclusion => "ไม่ได้อยู่ในลิสต์",
	83	+ :exclusion => "ถูกจองเอาไว้แล้ว",
	84	+ :invalid => "ไม่ถูกต้อง",
	85	+ :confirmation => "ไม่ตรงกับการยืนยัน",
	86	+ :accepted => "ต้องอยู่ในรูปแบบที่ยอมรับ",
	87	+ :empty => "ต้องไม้เว้นว่างเอาไว้",
	88	+ :blank => "ต้องไม่เว้นว่างเอาไว้",
	89	+ :too_long => "ยาวเกินไป (ต้องไม่เกิน {{count}} ตัวอักษร)",
	90	+ :too_short => "สั้นเกินไป (ต้องยาวกว่า {{count}} ตัวอักษร)",
	91	+ :wrong_length => "มีความยาวไม่ถูกต้อง (ต้องมีความยาว {{count}} ตัวอักษร)",
	92	+ :taken => "ถูกใช้ไปแล้ว",
	93	+ :not_a_number => "ไม่ใช่ตัวเลข",
	94	+ :greater_than => "ต้องมากกว่า {{count}}",
	95	+ :greater_than_or_equal_to => "ต้องมากกว่าหรือเท่ากับ {{count}}",
	96	+ :equal_to => "ต้องเท่ากับ {{count}}",
	97	+ :less_than => "ต้องน้อยกว่า {{count}}",
	98	+ :less_than_or_equal_to => "ต้องน้อยกว่าหรือเท่ากับ {{count}}",
	99	+ :odd => "ต้องเป็นเลขคี่",
	100	+ :even => "ต้องเป็นเลขคู่"
	101	+ }
	102	+ }
	103	+ }
	104	+ }
	105	+ }
	106	+

config/locales/th.yml created 644 ¶ +121

@@ -0,0 +1,121
	1	+ # Sample localization file for English. Add more files in this directory for other locales.
	2	+ # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
	3	+
	4	+ th:
	5	+ cancel: 'ยกเลิก'
	6	+
	7	+ login_label: 'ชื่อเข้าใช้ระบบ (login)'
	8	+ full_name_label: 'ชื่อเต็ม'
	9	+ email_label: 'E-mail'
	10	+ password_label: 'รหัสผ่าน'
	11	+
	12	+ go_ahead_to: "ไปยัง"
	13	+ go_back_to: "กลับไปยัง"
	14	+ login_page: "หน้าเข้าใช้ระบบ"
	15	+ home_page: "หน้าแรก"
	16	+
	17	+ menu:
	18	+ main: 'หน้าหลัก'
	19	+ messages: 'ข้อความ'
	20	+ tasks: 'โจทย์'
	21	+ submissions: 'โปรแกรมที่ส่ง'
	22	+ test: 'ทดสอบโปรแกรม'
	23	+ help: 'ความช่วยเหลือ'
	24	+ settings: 'เปลี่ยนรหัสผ่าน'
	25	+ log_out: 'ออกจากระบบ'
	26	+
	27	+ title_bar:
	28	+ current_time: "เวลาปัจจุบันคือ"
	29	+ remaining_time: "เหลือเวลาอีก"
	30	+ contest_not_started: "ยังไม่เริ่มแข่งขัน"
	31	+
	32	+ login:
	33	+ message: 'กรุณา login เพื่อเข้าสู่ระบบ'
	34	+ login_submit: 'เข้าใช้ระบบ'
	35	+ participation: 'ต้องการเข้าร่วม?'
	36	+ please: 'กรุณา'
	37	+ register: 'ลงทะเบียน'
	38	+
	39	+ main:
	40	+ start_soon: "การแข่งขันกำลังจะเริ่ม กรุณารอก่อน"
	41	+ specified_in_header: "ระบุที่หัวโปรแกรมแล้ว"
	42	+
	43	+ problem_desc: "อ่าน"
	44	+ submitted_at: "ส่งเมื่อเวลา"
	45	+ graded_at: "ตรวจเมื่อเวลา"
	46	+ score: "คะแนน: "
	47	+ cmp_msg: "ผลคอมไพล์"
	48	+ src_link: "ต้นฉบับ"
	49	+ submissions_link: "การส่งครั้งอื่น ๆ"
	50	+
	51	+ test:
	52	+ title: "ทดสอบโปรแกรมบนสภาพแวดล้อมของเครื่องตรวจ"
	53	+ intro: "คุณสามารถทดลองการทำงานของโปรแกรมที่เขียนกับข้อมูลชุดทดสอบของคุณเองในสภาพแวดล้อมจริงของการตรวจโปรแกรมได้ โดยเลือกโปรแกรมส่งแล้วที่ด้านล่างพร้อมทั้งส่งแฟ้มข้อมูลชุดทดสอบที่ต้องการให้ทำงานด้วย"
	54	+ disabled_at_end_announcement: "<b>หมายเหตุ:</b> ระบบทดสอบโปรแกรมจะหยุดทำงานในช่วงเวลา 30 นาทีสุดท้ายของการแข่งขัน"
	55	+
	56	+
	57	+ registration:
	58	+ title: "ลงทะเบียนผู้ใช้ใหม่"
	59	+ description: "ในการลงทะเบียน ให้ผู้สนใจเข้าร่วมการแข่งขันกรอกข้อมูลด้านล่าง จากนั้นระบบจะส่ง e-mail ไปยัง e-mail ที่ระบุเพื่อให้ยืนยันตัวตนและเปิดใช้บัญชีผู้ใช้<br/>ในกรณีที่ผู้เข้าแข่งขันเป็นนักเรียน รบกวนช่วยให้ข้อมูลเกี่ยวกับโรงเรียนและจังหวัดด้วย"
	60	+
	61	+ successful_title: "การลงทะเบียนเสร็จเรียบร้อย"
	62	+
	63	+ login_guide: "ใช้ได้เฉพาะ a-z, A-Z, 0-9 และ _ ความยาวไม่เกิน 20 ตัวอักษร"
	64	+ email_guide: "กรุณาตรวจสอบ e-mail ที่ใส่ให้ถูกต้อง<br/>คุณจะต้องยืนยันการลงทะเบียนผ่านทางข้อมูลที่จะส่งให้ทาง e-mail"
	65	+ register: "ลงทะเบียน"
	66	+
	67	+ email_body: "สวัสดีครับ {{full_name}},
	68	+
	69	+ คุณได้ลงทะเบียนเข้าร่วมการแข่งขัน {{contest_name}}
	70	+
	71	+ บัญชีเข้าใช้ของคุณคือ: {{login}}
	72	+
	73	+ รหัสผ่านคือ: {{password}}
	74	+
	75	+ กรุณาเข้าลิงก์ต่อไปนี้:
	76	+
	77	+ {{activation_url}}
	78	+
	79	+ เพื่อเปิดใช้งานบัญชีของคุณ
	80	+
	81	+ ถ้าคุณไม่ใช้คนที่ลงทะเบียน กรุณาละทิ้ง e-mail ฉบับนี้
	82	+ และแจ้งความผิดพลาดนี้กับ {{admin_email}}
	83	+
	84	+ ขอบคุณมาก!"
	85	+
	86	+ email_sent: "เราได้ส่งข้อมูลสำหรับยืนยันไปให้คุณแล้ว (โปรดอย่าลืมตรวจดูในส่วน Junk mail ด้วย)"
	87	+ email_verify_at: "กรุณาตรวจสอบที่ {{email}} พร้อมทั้งยืนยัน"
	88	+
	89	+ activation_sucessful_title: "บัณชีผู้ใช้ได้รับการยืนยันแล้ว"
	90	+ account_activated: "บัญชีผู้ใช้ของคุณพร้อมใช้งานแล้ว"
	91	+
	92	+ activation_failed_title: "การยืนยันล้มเหลว"
	93	+
	94	+ errors:
	95	+ header: 'การลงทะเบียนมีข้อผิดพลาด'
	96	+ email:
	97	+ title: "เกิดปัญหาระหว่างการส่ง e-mail เพื่อยืนยันการสมัคร"
	98	+ expl: "<h2>บัญชีผู้ใช้ของคุณถูกสร้างขึ้นแล้ว แต่ระบบไม่สามารถส่ง e-mail เพื่อยืนยันการสมัครได้</h2>
	99	+ อาจเกิดปัญหาในการตั้งค่าเริ่มต้นของระบบ กรุณาช่วยติดต่อผู้ดูแลระบบด้วยที่ {{email}}<br/>ขอขอบคุณจากทีมงาน"
	100	+ activation:
	101	+ email_exists: "มีผู้ใช้ที่ใช้ e-mail นี้แล้ว"
	102	+ invalid: "รหัสสำหรับยืนยันผิดพลาด กรุณาตรวจสอบอีกครั้ง"
	103	+
	104	+ help:
	105	+ how_to_submit: "วิธีการส่งโปรแกรม"
	106	+ must_specify_language: "คุณ<b>ต้อง</b>ระบุภาษาโปรแกรมที่ใช้ที่ตอนต้นของรหัสโปรแกรม (source code) นอกจากนี้คุณอาจจะระบุโจทย์ที่ต้องการส่งได้ด้วย"
	107	+ list_available_language: "ภาษาโปรแกรมที่สามารถระบุได้คือ <tt>C</tt>, <tt>C++</tt>, และ <tt>Pascal</tt> ด้านล่างแสดงตัวอย่างของการระบุสำหรับภาษาต่าง ๆ"
	108	+ accept_only_language_specified: "ระบบจะ<b>ไม่รับ</b>โปรแกรมที่ส่งถ้าคุณไม่ได้ระบุภาษาที่ใช้"
	109	+ specifying_task: "นอกจากนี้ คุณยังสามารถระบุชื่อของโจทย์ที่ต้องการส่งเพิ่มเติมได้ ในการระบุให้ใส่ <tt>TASK:</tt> <i>taskname</i> คุณสามารถตรวจสอบชื่อของโจทย์ได้ โดยจะแสดงในวงเล็บหลังชื่อภาษาไทยของโจทย์"
	110	+ example_cpp: "ยกตัวอย่างเช่น ถ้าคุณใช้ภาษา <tt>C++</tt> สำหรับเขียนโจทย์ <tt>mobiles</tt> ตอนต้นโปรแกรมคุณจะใส่ดังนี้"
	111	+ example_pas: "ถ้าคุณใช้ภาษา <tt>Pascal</tt> เพื่อเขียนโจทย์ข้อเดียวกัน คุณจะระบุ"
	112	+ ask_questions_at_messages: "ถ้ามีปัญหาในการใช้งานสามารถสอบถามได้ที่หน้า<a href=\"{{url}}\">{{message_link_name}}</a>"
	113	+
	114	+ activerecord:
	115	+ attributes:
	116	+ user:
	117	+ login: "ชื่อเข้าใช้ระบบ"
	118	+ full_name: "ชื่อเต็ม"
	119	+ email: "e-mail"
	120	+ province: "จังหวัด"
	121	+

config/tasks.yml.SAMPLE created 644 ¶ +31

@@ -0,0 +1,31
	1	+ ---
	2	+ beads:
	3	+ testcases: 20
	4	+ testruns: 20
	5	+ dna:
	6	+ testcases: 15
	7	+ testruns: 15
	8	+ roads:
	9	+ testcases: 11
	10	+ testruns:
	11	+ 1:
	12	+ - 1
	13	+ - 11
	14	+ 2:
	15	+ - 2
	16	+ 3:
	17	+ - 3
	18	+ 4:
	19	+ - 4
	20	+ 5:
	21	+ - 5
	22	+ 6:
	23	+ - 6
	24	+ 7:
	25	+ - 7
	26	+ 8:
	27	+ - 8
	28	+ 9:
	29	+ - 9
	30	+ 10:
	31	+ - 10

db/migrate/20081214185157_add_admin_email_to_config.rb created 644 ¶ +11

@@ -0,0 +1,11
	1	+ class AddAdminEmailToConfig < ActiveRecord::Migration
	2	+ def self.up
	3	+ Configuration.create(:key => 'system.admin_email',
	4	+ :value_type => 'string',
	5	+ :value => 'admin@admin.email')
	6	+ end
	7	+
	8	+ def self.down
	9	+ Configuration.find_by_key('system.admin_email').destroy
	10	+ end
	11	+ end

db/migrate/20081215012843_change_user_login_string_limit.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class ChangeUserLoginStringLimit < ActiveRecord::Migration
	2	+ def self.up
	3	+ execute "ALTER TABLE `users` CHANGE `login` `login` VARCHAR( 50 )"
	4	+ end
	5	+
	6	+ def self.down
	7	+ execute "ALTER TABLE `users` CHANGE `login` `login` VARCHAR( 10 )"
	8	+ end
	9	+ end

db/migrate/20090202101806_add_test_request_early_timeout_to_config.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ class AddTestRequestEarlyTimeoutToConfig < ActiveRecord::Migration
	2	+ def self.up
	3	+ # If Configuration['contest.test_request.early_timeout'] is true
	4	+ # the user will not be able to use test request at 30 minutes
	5	+ # before the contest ends.
	6	+
	7	+ Configuration.create(:key => 'contest.test_request.early_timeout',
	8	+ :value_type => 'boolean',
	9	+ :value => 'false')
	10	+ end
	11	+
	12	+ def self.down
	13	+ Configuration.find_by_key('contest.test_request.early_timeout').destroy
	14	+ end
	15	+ end

db/migrate/20090206145016_add_contest_flag_to_announcements.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddContestFlagToAnnouncements < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :announcements, :contest_only, :boolean, :default => false
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :announcements, :contest_only
	8	+ end
	9	+ end

Rakefile ¶ +9

               # Add your own tasks in files placed in lib/tasks ending in .rake,
               # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
               require(File.join(File.dirname(__FILE__), 'config', 'boot'))
               require 'rake'
               require 'rake/testtask'
               require 'rake/rdoctask'
               require 'tasks/rails'
+            +
+            + require 'spec/rake/spectask'
+            +
+            + desc "Run all examples with RCov"
+            + Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+            +   t.spec_files = FileList['spec/*/*.rb']
+            +   t.rcov = true
+            +   #t.rcov_opts = ['--exclude', 'examples']
+            + end

app/controllers/login_controller.rb ¶ +2 -2

                 end
                 def site_login
                   begin
                     site = Site.find(params[:login][:site_id])
                   rescue ActiveRecord::RecordNotFound
                     site = nil
                   end
                   if site==nil
                     flash[:notice] = 'Wrong site'
                     redirect_to :controller => 'main', :action => 'login'  and return
                   end
-            -     if site.password == params[:login][:password]
+            +     if (site.password) and (site.password == params[:login][:password])
                     session[:site_id] = site.id
                     redirect_to :controller => 'site', :action => 'index'
                   else
                     flash[:notice] = 'Wrong site password'
-            -       redirect_to :controller => 'main', :action => 'login'
+            +       redirect_to :controller => 'site', :action => 'login'
                   end
                 end
               end

app/controllers/main_controller.rb ¶ +4 -16

                   flash[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if Configuration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
-            -     # Site administrator login
-            -     @countries = Country.find(:all, :include => :sites)
-            -     @country_select = @countries.collect { |c| [c.name, c.id] }
-            -     @country_select_with_all = [['Any',0]]
-            -     @countries.each do |country|
-            -       @country_select_with_all << [country.name, country.id]
-            -     end
-            -     @site_select = []
-            -     @countries.each do |country|
-            -       country.sites.each do |site|
-            -         @site_select << ["#{site.name}, #{country.name}", site.id]
-            -       end
-            -     end
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def prepare_list_information
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions << { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions << { :count => 0, :submission => nil }
                     end
                   end
+            +     if Configuration.show_tasks_to?(@user)
+            +       @announcements = Announcement.find_published(true)
+            +     else
                     @announcements = Announcement.find_published
                   end
+            +   end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if (!Configuration.show_tasks_to?(@user)) and
                       ((action_name=='submission') or (action_name=='submit'))
                     redirect_to :action => 'list' and return
                   end
                 end
                 def prepare_grading_result(submission)
                   grading_info = Configuration.task_grading_info[submission.problem.name]
                   @test_runs = []

app/controllers/site_controller.rb ¶ +25 -3

               class SiteController < ApplicationController
-            -   before_filter :site_admin_authorization
+            +   before_filter :site_admin_authorization, :except => 'login'
+            +
+            +   def login
+            +     # Site administrator login
+            +     @countries = Country.find(:all, :include => :sites)
+            +     @country_select = @countries.collect { |c| [c.name, c.id] }
+            +
+            +     @country_select_with_all = [['Any',0]]
+            +     @countries.each do |country|
+            +       @country_select_with_all << [country.name, country.id]
+            +     end
+            +
+            +     @site_select = []
+            +     @countries.each do |country|
+            +       country.sites.each do |site|
+            +         @site_select << ["#{site.name}, #{country.name}", site.id]
+            +       end
+            +     end
+            +
+            +     @default_site = Site.first if !Configuration['contest.multisites']
+            +
+            +     render :action => 'login', :layout => 'empty'
+            +   end
                 def index
                   if @site.started
                     render :action => 'started', :layout => 'empty'
                   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
+            +       redirect_to :controller => 'site', :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
+            +       redirect_to :controller => 'site', :action => 'login' and return
                   end
                 end
               end

app/controllers/test_controller.rb ¶ +6 -1

                 protected
                 def prepare_index_information
                   @user = User.find(session[:user_id])
                   @submissions = Submission.find_last_for_all_available_problems(@user.id)
                   all_problems = @submissions.collect { |submission| submission.problem }
                   @problems = []
                   all_problems.each do |problem|
                     if problem.test_allowed
                       @problems << problem
                     end
                   end
-            -     @test_requests = @user.test_requests
+            +     @test_requests = []
+            +     @user.test_requests.each do |ts|
+            +       if ts.problem.available
+            +         @test_requests << ts
+            +       end
+            +     end
                 end
                 def check_viewability
                   user = User.find(session[:user_id])
                   if !Configuration.show_tasks_to?(user)
                     redirect_to :controller => 'main', :action => 'list'
                   end
                   if (!Configuration.show_submitbox_to?(user)) and (action_name=='submit')
                     redirect_to :controller => 'test', :action => 'index'
                   end
                 end

app/controllers/user_admin_controller.rb ¶ +8 -3

                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy, :create, :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @users = User.find(:all)
+            +     @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def user_stat
                   @problems = Problem.find_available_problems
                   @users = User.find(:all)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
-            -       ustat[0] = u.login
+            +       ustat[0] = u
-            -       ustat[1] = u.full_name
                     @problems.each do |p|
               	sub = Submission.find_last_by_user_and_problem(u.id,p.id)
               	if (sub!=nil) and (sub.points!=nil)
               	  ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
               	else
               	  ustat << [0,false]
               	end
                     end
                     @scorearray << ustat
                   end
                 end
                   user_data.each_pair do |id,user|
                     u = User.find_by_login(user[:login])
                     if u!=nil
                       @import_log << "Found #{user[:login]}\n"
                     else
                       u = User.new(:login => user[:login])
                       @import_log << "Created #{user[:login]}\n"
                     end
                     u.full_name = user[:name]
                     u.password = user[:password]
                     u.country = countries[user[:country_id]]
                     u.site = sites[user[:site_id]]
-            -       u.save
+            +       u.activated = true
+            +       u.email = "empty-#{u.login}@none.com"
+            +       if not u.save
+            +         @import_log << "Errors\n"
+            +         u.errors.each { |attr,msg|  @import_log << "#{attr} - #{msg}\n" }
+            +       end
                   end
                 end
               end

app/controllers/users_controller.rb ¶ +25 -17

               require 'tmail'
               require 'net/smtp'
               class UsersController < ApplicationController
                 before_filter :authenticate, :except => [:new, :register, :confirm]
+            +   before_filter :verify_online_registration, :only => [:new, :register]
+            +
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
-            -   in_place_edit_for :user, :alias_for_editing
+            +   #in_place_edit_for :user, :alias_for_editing
-            -   in_place_edit_for :user, :email_for_editing
+            +   #in_place_edit_for :user, :email_for_editing
                 def index
                   if !Configuration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
+            +     if(params[:cancel])
+            +       redirect_to :controller => 'main', :action => 'login'
+            +       return
+            +     end
                   @user = User.new(params[:user])
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
+            +         @admin_email = Configuration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add_to_base("Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 protected
+            +   def verify_online_registration
+            +     if !Configuration['system.online_registration']
+            +       redirect_to :controller => 'main', :action => 'login'
+            +     end
+            +   end
+            +
                 def send_confirmation_email(user)
                   contest_name = Configuration['contest.name']
+            +     admin_email = Configuration['system.admin_email']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   mail = TMail::Mail.new
                   mail.to = user.email
                   mail.from = Configuration['system.online_registration.from']
                   mail.subject = "[#{contest_name}] Confirmation"
-            -     mail.body = <<-EOF
+            +     mail.body = t('registration.email_body', {
-            - Hello #{user.full_name},
+            +                     :full_name => user.full_name,
+            +                     :contest_name => contest_name,
-            - You have registered for #{contest_name} (#{home_url}).
+            +                     :login => user.login,
+            +                     :password => user.password,
-            - Your login is: #{user.login}
+            +                     :activation_url => activation_url,
-            - Your password is: #{user.password}
+            +                     :admin_email => admin_email
+            +                   })
-            - Please follow the link:
+            +     logger.info mail.body
-            - #{activation_url}
-            - to activate your user account.
-            - If you did not register, please ignore this e-mail.
-            - Thanks!
-            - EOF
                   smtp_server = Configuration['system.online_registration.smtp']
                   begin
                     Net::SMTP.start(smtp_server) do |smtp|
                       smtp.send_message(mail.to_s, mail.from, mail.to)
                     end
                     result = true
                   rescue
                     result = false
                   end

app/helpers/application_helper.rb ¶ +18 -12

                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
-            -       append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
+            +       append_to menu_items, '[Results]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Graders]', 'graders', 'list'
-            -       append_to menu_items, '[Site config]', 'configurations', 'index'
+            +       append_to menu_items, '[Sites]', 'sites', 'index'
+            +       append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
-            -     append_to menu_items, '[Main]', 'main', 'list'
+            +     append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
-            -     append_to menu_items, '[Messages]', 'messages', 'list'
+            +     append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (Configuration.show_tasks_to?(user))
-            -       append_to menu_items, '[Tasks]', 'tasks', 'list'
+            +       append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
-            -       append_to menu_items, '[Submissions]', 'main', 'submission'
+            +       append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
-            -       append_to menu_items, '[Test]', 'test', 'index'
+            +       append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
-            -     append_to menu_items, '[Help]', 'main', 'help'
+            +     append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if Configuration['system.user_setting_enabled']
-            -       append_to menu_items, '[Settings]', 'users', 'index'
+            +       append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
-            -     append_to menu_items, '[Log out]', 'main', 'login'
+            +     append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   time_left = ''
                   #
                   # if the contest is over
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
                     if user.site!=nil and user.site.finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
+            +       if !user.site.started
+            +         time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
+            +       else
                       if user.site!=nil
-            -         time_left = ". Time left: #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
+            +           time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
+            +             " #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
+            +         end
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='analysis'
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
                   contest_name = Configuration['contest.name']
                   #
                   # build real title bar
                   <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
-            - Current time is #{format_short_time(Time.new.gmtime)} UTC
+            + #{t 'title_bar.current_time'} #{format_short_time(Time.new)}
               #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                 end
               end

app/models/announcement.rb ¶ +7 -1

               class Announcement < ActiveRecord::Base
-            -   def self.find_published
+            +   def self.find_published(contest_started=false)
+            +     if contest_started
                     Announcement.find(:all,
                                       :conditions => "(published = 1) AND (frontpage = 0)",
                                       :order => "created_at DESC")
+            +     else
+            +       Announcement.find(:all,
+            +                         :conditions => "(published = 1) AND (frontpage = 0) AND (contest_only = 0)",
+            +                         :order => "created_at DESC")
+            +     end
                 end
                 def self.find_for_frontpage
                   Announcement.find(:all,
                                     :conditions => "(published = 1) AND (frontpage = 1)",
                                     :order => "created_at DESC")
                 end
               end

app/models/configuration.rb ¶ +9 -1

               require 'yaml'
               #
               # This class also contains various login of the system.
               #
               class Configuration < ActiveRecord::Base
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
+            +   TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
                 # set @@cache = true to only reload once.
                 @@cache = false
                 @@configurations = nil
                 @@task_grading_info = nil
                 def self.get(key)
                   if @@cache
                     if @@configurations == nil
                       self.read_config
                     end
                 def self.[](key)
                   self.get(key)
                 end
                 def self.reload
                   self.read_config
                 end
                 def self.clear
                   @@configurations = nil
                 end
+            +   def self.cache?
+            +     @@cache
+            +   end
+            +
                 def self.enable_caching
                   @@cache = true
                 end
                 #
                 # View decision
                 #
                 def self.show_submitbox_to?(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   return false if mode=='analysis'
                   if (mode=='contest')
                     return false if (user.site!=nil) and
                   if (mode=='contest')
                     return false if (user.site!=nil) and (user.site.started!=true)
                   end
                   return true
                 end
                 def self.show_grading_result
                   return (get(SYSTEM_MODE_CONF_KEY)=='analysis')
                 end
                 def self.allow_test_request(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
+            +     early_timeout = get(TEST_REQUEST_EARLY_TIMEOUT_KEY)
                   if (mode=='contest')
-            -       return false if (user.site!=nil) and ((user.site.started!=true) or (user.site.time_left < 30.minutes))
+            +       return false if ((user.site!=nil) and
+            +         ((user.site.started!=true) or
+            +          (early_timeout and (user.site.time_left < 30.minutes))))
                   end
                   return false if mode=='analysis'
                   return true
                 end
                 def self.task_grading_info
                   if @@task_grading_info==nil
                     read_grading_info
                   end
                   return @@task_grading_info
                 end

app/models/site.rb ¶ +6 -2

                 def clear_start_time_if_not_started
                   if !self.started
                     self.start_time = nil
                   end
                 end
                 def time_left
                   contest_time = Configuration['contest.time_limit']
                   if tmatch = /(\d+):(\d+)/.match(contest_time)
                     h = tmatch[1].to_i
                     m = tmatch[2].to_i
+            +       contest_time = h.hour + m.minute
+            +
+            +       return contest_time if !self.started
+            +
                     current_time = Time.now.gmtime
                     if self.start_time!=nil
-            -         finish_time = self.start_time + h.hour + m.minute
+            +         finish_time = self.start_time + contest_time
                     else
-            -         finish_time = current_time + h.hour + m.minute
+            +         finish_time = current_time + contest_time
                     end
                     if current_time > finish_time
                       return current_time - current_time
                     else
                       finish_time - current_time
                     end
                   else
                     nil
                   end
                 end

app/models/user.rb ¶ +32 -5

                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 belongs_to :site
                 belongs_to :country
                 named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
-            -   validates_format_of :login, :with => /^[\_a-z0-9]+$/
+            +   validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
-            -   validates_length_of :login, :within => 3..10
+            +   validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
-            -   validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :allow_blank => true
+            +   validates_format_of :email,
+            +                       :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
+            +                       :if => :email_validation?
+            +   validate :uniqueness_of_email_from_activated_users,
+            +            :if => :email_validation?
+            +   validate :enough_time_interval_between_same_email_registrations,
+            +            :if => :email_validation?
-            -   validate :uniqueness_of_email_from_activated_users
+            +   # these are for ytopc
-            -   validate :enough_time_interval_between_same_email_registrations
+            +   # disable for now
+            +   #validates_presence_of :province
                 attr_accessor :password
                 before_save :encrypt_new_password
+            +   before_save :assign_default_site
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                   password = ''
                   length.times { password << chars[rand(chars.length - 1)] }
                   password
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
+            +     def assign_default_site
+            +       # have to catch error when migrating (because self.site is not available).
+            +       begin
+            +         if self.site==nil
+            +           self.site = Site.find_by_name('default')
+            +         end
+            +       rescue
+            +       end
+            +     end
+            +
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
                   def uniqueness_of_email_from_activated_users
                     user = User.activated_users.find_by_email(self.email)
                     if user and (user.login != self.login)
                       self.errors.add_to_base("Email has already been taken")
                     end
                   end
                   def enough_time_interval_between_same_email_registrations
                     return if !self.new_record?
+            +       return if self.activated
                     open_user = User.find_by_email(self.email,
                                                    :order => 'created_at DESC')
                     if open_user and open_user.created_at and
                         (open_user.created_at > Time.now.gmtime - 5.minutes)
                       self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
                     end
                   end
+            +
+            +     def email_validation?
+            +       begin
+            +         return VALIDATE_USER_EMAILS
+            +       rescue
+            +         return false
                     end
+            +     end
+            + end

app/views/announcements/edit.html.erb ¶ +5

                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
                   <b>Show on front page?</b><br />
                   <%= f.check_box :frontpage %>
                 </p>
                 <p>
+            +     <b>Show only in contest?</b><br />
+            +     <%= f.check_box :contest_only %>
+            +   </p>
+            +
+            +   <p>
                   <%= f.submit "Update" %>
                 </p>
               <% end %>
               <%= link_to 'Show', @announcement %> |
               <%= link_to 'Back', announcements_path %>

app/views/announcements/index.html.erb ¶ -1

               <% content_for :head do %>
-            -   <%= stylesheet_link_tag 'scaffold' %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing announcements</h1>
               <%= link_to 'New announcement', new_announcement_path %>
               <table>
                 <tr>
                   <th>Body</th>
                   <th>Author</th>
                   <th>Published</th>

app/views/announcements/new.html.erb ¶ +5

                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
                   <b>Show on front page?</b><br />
                   <%= f.check_box :frontpage %>
                 </p>
                 <p>
+            +     <b>Show only in contest?</b><br />
+            +     <%= f.check_box :contest_only %>
+            +   </p>
+            +
+            +   <p>
                   <%= f.submit "Create" %>
                 </p>
               <% end %>
               <%= link_to 'Back', announcements_path %>

app/views/announcements/show.html.erb ¶ +4

               </p>
               <p>
                 <b>Published:</b>
                 <%=h @announcement.published %>
               </p>
               <p>
                 <b>Show on front page:</b>
                 <%=h @announcement.frontpage %>
               </p>
+            + <p>
+            +   <b>Show only in contest:</b>
+            +   <%=h @announcement.contest_only %>
+            + </p>
               <%= link_to 'Edit', edit_announcement_path(@announcement) %> |
               <%= link_to 'Back', announcements_path %>

app/views/configurations/index.html.haml ¶ +2 -1

               - content_for :head do
                 = javascript_include_tag :defaults
-            - %h1 Grader configuration
+            + %h1 System configuration
               %table.info
                 %tr.info-head
                   %th Key
                   %th Type
                   %th Value
                 - @configurations.each do |conf|
                   - @configuration = conf
                   %tr
                     %td
                       = in_place_editor_field :configuration, :key, {}, :rows=>1
                     %td
                       = in_place_editor_field :configuration, :value_type, {}, :rows=>1
                     %td
                       = in_place_editor_field :configuration, :value, {}, :rows=>1
+            + - if Configuration.cache?
                 %br/
                 Your config is saved, but it does not automatically take effect.
                 %br/
                 If you have one mongrel process running, you can
                 = link_to '[click]', :action => 'reload'
                 here to reload.
                 %br/
                 If you have more than one process running, you should restart
                 them manually.

app/views/graders/list.html.haml ¶ +3 -1

               - content_for :head do
                 = stylesheet_link_tag 'graders'
                 <meta http-equiv ="refresh" content="10"/>
-            - %h2 (Under Experiments)
+            + %h1 Grader information
               - form_for :clear, nil, :url => {:action => 'clear_all'} do |f|
                 = submit_tag 'Clear all data'
+            + - if @last_task
                 Last task:
                 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                 %br/
+            + - if @last_test_request
                 Last test_request:
                 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
               %h3 Current graders
               = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
               %h3 Stalled graders
               = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}

app/views/main/_announcement.html.haml ¶ +2 -2

               .announcement
                 = markdown(announcement.body)
-            -   .pub-info
+            +   -#.pub-info
-            -     %p= "#{announcement.author}, #{announcement.created_at}"
+            +   -#  %p= "#{announcement.author}, #{announcement.created_at}"

app/views/main/_problem.html.erb ¶ +1 -1

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
                 <td>
                   <%= "#{problem_counter+1}" %>
                 </td>
                 <td>
                   <%= "#{problem.full_name} (#{problem.name})" %>
-            -     <%= link_to '[desc]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
+            +     <%= link_to "[#{t 'main.problem_desc'}]", problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
                 </td>
                 <td align="center">
                   <%= @prob_submissions[problem_counter][:count] %>
                 </td>
                 <td>
                   <%= render :partial => 'submission_short',
                              :locals => {
                                :submission => @prob_submissions[problem_counter][:submission],
                                :problem_name => problem.name }%>
                 </td>
               </tr>

app/views/main/_submission_box.html.erb ¶ +1 -1

               <% form_tag({:action => 'submit'}, :multipart => true) do %>
               Problem: <%= select 'submission', 'problem_id',
-            -              	[['Specified in header','-1']] +
+            +              	[[(t 'main.specified_in_header'),'-1']] +
               		@problems.collect {|p| [p.full_name, p.id]},
               		:selected => '-1' %>
               File: <%= file_field_tag 'file' %>
               <%= submit_tag 'Submit' %>
               <% end %>

app/views/main/_submission_short.html.haml ¶ +10 -7

               - if submission==nil
                 = "-"
               - else
                 - if submission.graded_at==nil
-            -     Submitted at
+            +     =t 'main.submitted_at'
-            -     = format_short_time(submission.submitted_at)
+            +     = format_short_time(submission.submitted_at.localtime)
                 - else
-            -     = "Graded at #{format_short_time(submission.graded_at)}, "
+            +     = t 'main.graded_at'
-            -     = "score: #{(submission.points*100/submission.problem.full_score).to_i} " if Configuration['ui.show_score']
+            +     = "#{format_short_time(submission.graded_at.localtime)}, "
+            +     - if Configuration['ui.show_score']
+            +       = t 'main.score'
+            +       = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   - if Configuration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
-            -     = link_to('[msg]', {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
+            +     = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
-            -   = link_to('[src]',{:action => 'source', :id => submission.id})
+            +   = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
                 = " | "
-            -   = link_to '[submissions]', :action => 'submission', :id => problem_name
+            +   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => problem_name

app/views/main/help.html.haml ¶ +14 -23

               = user_title_bar(@user)
               .announcementbox
                 %span{:class => 'title'}
-            -     How to submit
+            +     =t 'help.how_to_submit'
                 .announcement
                   %p
-            -       You <b>must</b> specify the language you are using
+            +       =t 'help.must_specify_language'
-            -       in your program header.  You can optionally
-            -       specify the task you are submitting to.
                   %p
-            -       The possible language options are
+            +       =t 'help.list_available_language'
-            -       <tt>C</tt>, <tt>C++</tt>, and <tt>Pascal</tt>.
-            -       The follow are examples.
                   %table{:border => '1'}
                     %tr
-            -         %th{:width => '100px'} C
+            +         %th{:width => '150px'} C
-            -         %th{:width => '100px'} C++
+            +         %th{:width => '150px'} C++
-            -         %th{:width => '100px'} Pascal
+            +         %th{:width => '150px'} Pascal
                     %tr
                       %td= "<tt>/*<br/>LANG: C<br/>*/</tt>"
                       %td= "<tt>/*<br/>LANG: C++<br/>*/</tt>"
                       %td= "<tt>{<br/>LANG: Pascal<br/>}</tt>"
                   %p
-            -       The server <b>will not</b> accept your submission,
+            +       =t 'help.accept_only_language_specified'
-            -       if you do not specify the language.
                   %p
-            -       Optionally, you can also specify
+            +       =t 'help.specifying_task'
-            -       the task with <tt>TASK:</tt> <i>taskname</i>.
-            -       On the first page, the taskname for each task is
-            -       shown in parentheses.
                   %p
-            -       For example, suppose you are using <tt>C++</tt>
+            +       =t 'help.example_cpp'
-            -       to write task <b>mobiles</b>, you put
                   %table{:border => '1'}
                     %tr
-            -         %td{:width => '100px'}
+            +         %td{:width => '300px'}
                         %tt <tt>/*<br/>LANG: C++<br/>TASK: mobiles<br/>*/</tt>
                   %p
-            -       on top of your source code.
+            +       =t 'help.example_pas'
-            -       If you are using <tt>Pascal</tt> to write the same task,
-            -       you'll use
                   %table{:border => '1'}
                     %tr
-            -         %td{:width => '100px'}
+            +         %td{:width => '300px'}
                         %tt <tt>{<br/>LANG: Pascal<br/>TASK: mobiles<br/>}</tt>
+            +     %p
+            +       = (t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),:url => url_for(:controller => 'messages', :action => 'list')))

app/views/main/list.html.haml ¶ +1 -1

                     Announcements
                   = render :partial => 'announcement', :collection => @announcements
               - if Configuration.show_submitbox_to?(@user)
                 .submitbox
                   = error_messages_for 'submission'
                   = render :partial => 'submission_box'
               %hr/
               - if (@user.site!=nil) and (@user.site.started!=true)
-            -   %p The contest at your site will start soon.  Please wait.
+            +   %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
                 %table.info
                   %tr.info-head
                     %th
                     %th Tasks
                     %th # of sub(s)
                     %th Results
                   = render :partial => 'problem', :collection => @problems
               %hr/

app/views/main/login.html.haml ¶ +9 -37

               %h1= Configuration['ui.front.title']
               - if @announcements.length!=0
                 .announcementbox
                   %span{:class => 'title'}
                     Announcements
                   = render :partial => 'announcement', :collection => @announcements
               %b= Configuration['ui.front.welcome_message']
               %br/
               - if !@hidelogin
-            -   Please login to see the problem list.
+            +   =t 'login.message'
                 %br/
                 %br/
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
                   - form_tag :controller => 'login', :action => 'login' do
                     %table
                       %tr
-            -           %td{:align => "right"} Login:
+            +           %td{:align => "right"}
+            +             ="#{t 'login_label'}:"
                         %td= text_field_tag 'login'
                       %tr
-            -           %td{:align => "right"} Password:
+            +           %td{:align => "right"}
+            +             ="#{t 'password_label'}:"
                         %td= password_field_tag
-            -       = submit_tag 'Login'
+            +       = submit_tag t('login.login_submit')
               %br/
               - if Configuration['system.online_registration']
-            -   Want to participate?
+            +   =t 'login.participation'
                 %b
-            -     Please
+            +     = "#{t 'login.please'} "
-            -     = link_to 'register.', :controller => :users, :action => :new
+            +     = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                 %br/
-            - - if (Configuration['system.mode']=='contest') and (Configuration['contest.multisites'])
-            -   %script{:type => 'text/javascript'}
-            -     var siteList = new Array();
-            -     - @countries.each do |country|
-            -       = "siteList[#{country.id}] = new Array();"
-            -       - country.sites.each do |site|
-            -         = "siteList[#{country.id}][#{site.id}] = \"#{site.name}\";"
-            -     var allSiteList = new Array();
-            -     - @site_select.each do |sel|
-            -       = "allSiteList[#{sel[1]}]=\"#{sel[0]}\";"
-            -   %script{:type => 'text/javascript', :src => '/javascripts/site_update.js'}
-            -   %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
-            -     %b For Site Administrator.
-            -     %br/
-            -     Please select your country and site and login.
-            -     - form_for :login, nil, :url => {:controller => 'login', :action => 'site_login'} do |f|
-            -       Country:
-            -       = select :site_country, :id, @country_select_with_all, {}, {:onchange => "updateSiteList();", :onclick => "updateSiteList();" }
-            -       Site:
-            -       = select :login, :site_id, @site_select
-            -       %br/
-            -       Password:
-            -       = f.password_field :password
-            -       = submit_tag "Site Administrator Login"
-            -   %script{:type => 'text/javascript'}
-            -     updateSiteList();

app/views/problems/list.rhtml ¶ -1

               <% content_for :head do %>
-            -   <%= stylesheet_link_tag 'scaffold' %>
                 <%= stylesheet_link_tag 'problems' %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing problems</h1>
               <p>
               <%= link_to 'New problem', :action => 'new' %>
               <%= link_to 'Turn off all problems', :action => 'turn_all_off' %>
               <%= link_to 'Turn on all problems', :action => 'turn_all_on' %>
               </p>

app/views/problems/stat.rhtml ¶ +1 -1

               <% if @submissions!=nil %>
                 <table class="info">
                 <tr class="info-head">
                   <th>user_id</th>
                   <th>submitted_at</th>
                   <th>points</th>
                   <th>comment</th>
                 </tr>
                 <% count = 0 %>
                 <% @submissions.each do |sub| %>
                   <tr class="<%= (count % 2 ==0) ? "info-even" : "info-odd" %>">
-            -     <td><%= sub.user.full_name %></td>
+            +     <td><%= sub.user.full_name if sub.user %></td>
                   <td><%= sub.submitted_at.to_s %></td>
                   <td><%= sub.points %></td>
                   <td><div style="font-family: monospace"><%= sub.grader_comment %></div></td>
                   </tr>
                   <% count += 1 %>
                 <% end %>
                 </table>
               <% else %>
               No submission
               <% end %>

app/views/site/prompt.html.haml ¶ +1 -1

               %h2
                 Contest Administration for site:
-            -   = "#{@site.name}, #{@site.country.name}"
+            +   = "#{@site.name}, #{@site.country.name if @site.country}"
               Current time at the server is
               = "#{format_short_time(Time.new.gmtime)} UTC"
               (please
               = 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.

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

               %h2
                 Contest Administration for site:
-            -   = "#{@site.name}, #{@site.country.name}"
+            +   = "#{@site.name}, #{@site.country.name if @site.country}"
               - curr_time = Time.new.gmtime
               - if @site.finished?
                 %h3 Contest ended.
               - else
                 %h3 Contest started.
               Current time at the server is
               = "#{format_short_time(curr_time)} UTC"
               (please
               = link_to 'refresh', :action => 'index'

app/views/sites/edit.html.erb ¶ +5

               <h1>Editing site</h1>
               <%= error_messages_for :site %>
               <% form_for(@site) do |f| %>
                 <p>
                   <b>Name</b><br />
                   <%= f.text_field :name %>
                 </p>
                 <p>
+            +     <b>Password</b><br />
+            +     <%= f.text_field :password %>
+            +   </p>
+            +
+            +   <p>
                   <b>Started</b><br />
                   <%= f.check_box :started %>
                 </p>
                 <p>
                   <b>Start time</b><br />
                   <%= f.datetime_select :start_time %>
                 </p>
                 <p>
                   <%= f.submit "Update" %>
                 </p>

app/views/sites/index.html.erb ¶ +2

               <h1>Listing sites</h1>
               <table>
                 <tr>
                   <th>Name</th>
+            +     <th>Password</th>
                   <th>Started</th>
                   <th>Start time</th>
                 </tr>
               <% for site in @sites %>
                 <% 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.password %></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 />
               <%= link_to 'New site', new_site_path %>

app/views/sites/new.html.erb ¶ +5

               <h1>New site</h1>
               <%= error_messages_for :site %>
               <% form_for(@site) do |f| %>
                 <p>
                   <b>Name</b><br />
                   <%= f.text_field :name %>
                 </p>
                 <p>
+            +     <b>Password</b><br />
+            +     <%= f.text_field :password %>
+            +   </p>
+            +
+            +   <p>
                   <b>Started</b><br />
                   <%= f.check_box :started %>
                 </p>
                 <p>
                   <b>Start time</b><br />
                   <%= f.datetime_select :start_time %>
                 </p>
                 <p>
                   <%= f.submit "Create" %>
                 </p>

app/views/sites/show.html.erb ¶ +5

               <p>
                 <b>Name:</b>
                 <%=h @site.name %>
               </p>
               <p>
+            +   <b>Password:</b>
+            +   <%=h @site.password %>
+            + </p>
+            +
+            + <p>
                 <b>Started:</b>
                 <%=h @site.started %>
               </p>
               <p>
                 <b>Start time:</b>
                 <%=h @site.start_time %>
               </p>
               <%= link_to 'Edit', edit_site_path(@site) %> |
               <%= link_to 'Back', sites_path %>

app/views/test/index.html.erb ¶ +7 -20

               <%= user_title_bar(@user) %>
-            - <h2>Test Interface</h2>
+            + <h2><%=t 'test.title' %></h2>
-            - <p>
+            + <div class="test-desc">
-            -   <b>Note:</b> Test interface will be disabled in the last 30 minutes
+            +   <%=t 'test.intro' %><br/>
-            -    of the contest time on your site.
+            +   <% if Configuration['contest.test_request.early_timeout'] %>
-            - </p>
+            +     <%=t 'test.disabled_at_end_announcement' %>
+            +   <% end %>
+            + </div>
               <% if @problems.length==0 %>
                 There is no submission
               <% else %>
               <script type="text/javascript">
               var submissionCount = new Array();
               <% @submissions.each do |submission| %>
               submissionCount[<%= submission.problem_id %>]=<%= submission.number %>;
               <% end %>
               function updateSubmissionList() {
                       </td>
                     </tr>
                     <tr>
                       <td>Input data:</td>
                       <td>
                         <%= f.file_field :input_file %>
                       </td>
                       <td>
                         (combined size should not exceed 2MB)
                       </td>
                     </tr>
                     <tr>
-            -         <td>
-            -           Additional file<sup><span style="color:red">*</span></sup>:
-            -         </td>
-            -         <td>
-            -           <%= f.file_field :additional_file %>
-            -         </td>
-            -         <td>
-            -           <small>
-            -             * This option works <u>only</u> for task beads.
-            -             You can use this to submit <tt>questions.txt</tt>.<br/>
-            -             The file shall be copied to the execution directory before your program runs.
-            -           </small>
-            -         </td>
-            -       </tr>
-            -       <tr>
                       <td colspan="2">
                         <%= submit_tag 'submit' %>
                       </td>
                     </tr>
                   </table>
                 <% end %>
                 </div>
               <% end %>
               <h3>Previous requests</h3>
               <table class="info">

app/views/test/result.html.haml ¶ +2

                 %b= @test_request.exit_status
                 %br/
               - if @test_request.compiler_message!=nil and @test_request.compiler_message!=''
                 %b Compiler Message
                 %div{:style => "border: 1px solid black; background: lightgrey"}
                   = simple_format((@test_request.compiler_message or ''))
               %b Input (first 2kb)
               %div{:style => "border: 1px solid black; background: lightgrey"}
                 - if @test_request.input_file_name!=nil
                   %pre
+            +       = ""
                     = h(read_textfile(@test_request.input_file_name,2048))
               %b Output (first 2kb)
               %div{:style => "border: 1px solid black; background: lightgrey"}
                 - if @test_request.output_file_name!=nil
                   %pre
+            +       = ""
                     = h(read_textfile(@test_request.output_file_name,2048))
                 - else
                   (no output)

app/views/user_admin/_form.rhtml ¶ +3

               <p><label for="user_name">Login</label><br/>
               <%= text_field 'user', 'login'  %></p>
               <p><label for="user_name">Full name</label><br/>
               <%= text_field 'user', 'full_name'  %></p>
               <p><label for="password">Password</label><br/>
               <%= password_field 'user', 'password'  %></p>
               <p><label for="password_confirmation">Password (confirm)</label><br/>
               <%= password_field 'user', 'password_confirmation'  %></p>
+            + <p><label for="user_email">E-mail</label><br/>
+            + <%= text_field 'user', 'email'  %></p>
+            +
               <p><label for="user_alias">Alias</label><br/>
               <%= text_field 'user', 'alias'  %></p>
               <!--[eoform:user]-->

app/views/user_admin/list.rhtml ¶ +7 -7

-            - <% content_for :head do %>
-            -   <%= stylesheet_link_tag 'scaffold' %>
-            - <% end %>
               <h1>Listing users</h1>
               <div class="submitbox">
               <b>Quick add</b>
               <% form_tag :action => 'create' do %>
                 <table border="0">
                 <tr>
                 <td><label for="user_login">Login</label></td>
                 <td><label for="user_full_name">Full name</label></td>
-            -   <td><label for="user_alias">Alias</label></td>
                 <td><label for="user_password">Password</label></td>
-            -   <td><label for="user_password_confirmation">confirm</label></td>
+            +   <td><label for="user_password_confirmation">Confirm</label></td>
+            +   <td><label for="user_email">Email</label></td>
                 </tr>
                 <tr>
                 <td><%= text_field 'user', 'login', :size => 10  %></td>
                 <td><%= text_field 'user', 'full_name', :size => 30  %></td>
-            -   <td><%= text_field 'user', 'alias', :size => 10  %></td>
                 <td><%= password_field 'user', 'password', :size => 10  %></td>
                 <td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
+            +   <td><%= text_field 'user', 'email', :size => 15 %></td>
                 <td><%= submit_tag "Create" %></td>
                 </tr></table>
               <% end %>
               <br/>
               <b>Import from site management</b>
               <% form_tag({:action => 'import'}, :multipart => true) do %>
                 File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
               <% end %>
               </div>
               <table>
                 <tr>
                 <% for column in User.content_columns %>
+            +     <% if !@hidden_columns.index(column.name) %>
                     <th><%= column.human_name %></th>
                   <% end %>
+            +   <% end %>
                 </tr>
               <% for user in @users %>
                 <tr>
                 <% for column in User.content_columns %>
+            +     <% if !@hidden_columns.index(column.name) %>
                     <td><%=h user.send(column.name) %></td>
                   <% end %>
+            +   <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New user', :action => 'new' %>
               <%= link_to 'New list of users', :action => 'new_list' %>

app/views/user_admin/user_stat.rhtml ¶ +8 -3

               <h1>User grading results</h1>
               <table class="info">
-            - <tr class="info-head"><th>User</th><th>Name</th>
+            + <tr class="info-head">
+            +   <th>User</th>
+            +   <th>Name</th>
+            +   <th>Activated?</th>
               <% @problems.each do |p| %>
                 <th><%= p.name %></th>
               <% end %>
               <th>Total</th>
               <th>Passed</th>
               </tr>
               <% counter = 0 %>
               <% @scorearray.each do |sc| %>
                 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
                   <% total = 0 %>
                   <% num_passed = 0 %>
                   <% sc.each_index do |i| %>
-            -       <% if i<=1 %>
+            +       <% if i==0 %>
-            -         <td><%= sc[i] %></td>
+            +         <td><%= sc[i].login %></td>
+            +         <td><%= sc[i].full_name %></td>
+            +         <td><%= sc[i].activated %></td>
                     <% else %>
                       <td><%= sc[i][0] %></td>
                       <% total += sc[i][0] %>
                       <% num_passed += 1 if sc[i][1] %>
                     <% end %>
                   <% end %>
                   <td><%= total %></td>
                   <td><%= num_passed %></td>
                 </tr>
                 <% counter += 1 %>
               <% end %>
               </table>

app/views/users/confirm.html.haml ¶ +11 -9

@@ -1,15 +1,17
1	- if @result == :successful	1	- if @result == :successful
2	- %h1 User activated	2	+ %h1
3	- Your account has been activated.	3	+ =t 'registration.activation_sucessful_title'
		4	+ =t 'registration.account_activated'
4	%br/	5	%br/
5	- ~~Please go ahead to~~	6	+ =t 'go_ahead_to'
6	- = link_to 'login.', :controller => 'main', :action => 'login'	7	+ = link_to((t 'login_page'), {:controller => 'main', :action => 'login'})
7	- else	8	- else
8	- %h1 Activation failed	9	+ %h1
		10	+ =t 'registration.activation_failed_title'
9	- if @result == :email_used	11	- if @result == :email_used
10	- A user with this E-mail exists.	12	+ =t 'registration.errors.activation.email_exists'
11	- else	13	- else
12	- Your activation code is invalid. Please check again.	14	+ =t 'registration.errors.activation.invalid'
13	%br/	15	%br/
14	- ~~Get back to~~	16	+ =t 'go_back_to'
15	- = link_to 'home.', :controller => 'main', :action => 'login'	17	+ = link_to((t 'home_page'), {:controller => 'main', :action => 'login'})

app/views/users/email_error.html.haml ¶ +5 -6

@@ -1,9 +1,8
1	- %h1 Errors in sending registration confirmation	1	+ %h1
		2	+ =t 'registration.errors.email.title'
2		3
3	.errorExplanation	4	.errorExplanation
4	- %h2	5	+ =t 'registration.errors.email.expl', :email => @admin_email
5	- Your user account has been created, but the system cannot send you the
6	- confirmation e-mail.
7		6
8	- Maybe there's a problem in the configuration. Please report the	7	+ =t 'go_back_to'
9	- admin. Thank you!	8	+ =link_to((t 'login_page'), {:controller => 'main', :action => 'login'})

app/views/users/index.html.haml ¶ +8 -9

               - content_for :head do
                 = javascript_include_tag :defaults
               = user_title_bar(@user)
               %h1 Your account settings
-            - %p
+            + -#%p
-            -   You can edit your alias and e-mails.  Just click on the text and edit it.
+            +   -#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
                   %th.uinfo Full name
                   %td.uinfo= @user.full_name
-            -   %tr
+            +   -#%tr
-            -     %th.uinfo Alias
+            +     -#%th.uinfo Alias
-            -     %td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
+            +     -#%td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
-            -   %tr
+            +   -#%tr
-            -     %th.uinfo E-mail
+            +     -#%th.uinfo E-mail
-            -     %td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
+            +     -#%td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
                 %tr
                   %th.uinfo Password
                   %td.uinfo
                     - form_tag :action => 'chg_passwd', :method => 'post' do
                       %table
                         %tr
                           %td= password_field_tag 'passwd'
                           %td (new)
                         %tr
                           %td= password_field_tag 'passwd_verify'
                           %td (verify)
                         %tr

app/views/users/new.html.haml ¶ +20 -10

-            - %h1 New user registration
+            + .contest-title
+            +   %h1
+            +     = "#{Configuration['contest.name']}: #{t 'registration.title'}"
-            - = error_messages_for :user, :header_message => 'Errors occured during registration'
+            + .registration-desc
+            +   =t 'registration.description'
+            +
+            + = error_messages_for :user, :header_message => (t 'registration.errors.header')
               %table
                 - form_for :user, @user, :url => { :action => 'register' } do |f|
                   %tr
-            -       %td Login:
+            +       %td{:align => "right"}
+            +         = "#{t 'login_label'}:"
                     %td= f.text_field :login
                   %tr
                     %td
                     %td
-            -         %small Only a-z, A-Z, 0-9 and _
+            +         %small
+            +           =t 'registration.login_guide'
                   %tr
-            -       %td Full name:
+            +       %td{:align => "right"}
+            +         = "#{t 'full_name_label'}:"
                     %td= f.text_field :full_name
                   %tr
-            -       %td E-mail:
+            +       %td{:align => "right"}
+            +         = "#{t 'email_label'}:"
                     %td= f.text_field :email
                   %tr
                     %td
                     %td
                       %small
-            -           Please make sure that your e-mail is correct.
+            +           =t 'registration.email_guide'
-            -           %br/
-            -           You'll need to verify your account by email.
                   %tr
-            -       %td{:colspan => 2}= submit_tag "Register"
+            +       %td/
+            +       %td
+            +         = submit_tag((t 'registration.register'), :name => 'commit')
+            +         = submit_tag((t 'cancel'), :name => 'cancel')

app/views/users/new_splash.html.haml ¶ +6 -6

@@ -1,11 +1,11
1	- %h1 Registration successful	1	+ %h1
		2	+ =t 'registration.successful_title'
2		3
3	- We have sent a confimation message to your e-mail.	4	+ =t 'registration.email_sent'
4	%br/	5	%br/
5	- Please check at	6	+ =t 'registration.email_verify_at', :email => @user.email
6	- = "#{@user.email}."
7	%br/	7	%br/
8	%br/	8	%br/
9		9
10	- Go back to	10	+ =t 'go_back_to'
11	- = ~~link_to~~ 'login ~~page.'~~, :controller => 'main', :action => 'login'	11	+ =link_to((t 'login_page'), {:controller => 'main', :action => 'login'})

config/environment.rb.SAMPLE ¶ +18 -6

               # Be sure to restart your web server when you modify this file.
               # Uncomment below to force Rails into production mode when
               # you don't control web/app server and can't set it the proper way
               # ENV['RAILS_ENV'] ||= 'production'
               # Specifies gem version of Rails to use when vendor/rails is not present
-            - RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION
+            + RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
               # Bootstrap the Rails environment, frameworks, and default configuration
               require File.join(File.dirname(__FILE__), 'boot')
               Rails::Initializer.run do |config|
                 # Settings in config/environments/* take precedence over those specified here
                 # Skip frameworks you're not going to use (only works if using vendor/rails)
                 # config.frameworks -= [ :action_web_service, :action_mailer ]
                 # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
                 # config.plugins = %W( exception_notification ssl_requirement )
                 # (create the session table with 'rake db:sessions:create')
                 config.action_controller.session_store = :active_record_store
                 # Use SQL instead of Active Record's schema dumper when creating the test database.
                 # This is necessary if your schema can't be completely dumped by the schema dumper,
                 # like if you have constraints or database-specific column types
                 # config.active_record.schema_format = :sql
                 # Activate observers that should always be running
                 # config.active_record.observers = :cacher, :garbage_collector
                 # Make Active Record use UTC-base instead of local time
-            -   config.active_record.default_timezone = :utc
+            +   config.time_zone = 'UTC'
+            +
+            +   # Setting locales
+            +   config.i18n.default_locale = 'th'
                 # See Rails::Configuration for more options
                 # -------------
                 # Required gems
                 # -------------
-            -   # This is for rspec
-            -   config.gem "rspec-rails", :lib => "spec"
                 config.gem "haml"
                 config.gem "tmail"
-            -   #config.gem "BlueCloth", :lig => "bluecloth"
+            +   config.gem "BlueCloth", :lib => "bluecloth"
+            +
+            +   # NOTES on rspec: if you wan to test with rspec, you have to install
+            +   # rspec yourself, just call: [sudo] gem install rspec-rails
+            +
               end
               # Add new inflection rules using the following format
               # (all these examples are active by default):
               # Inflector.inflections do |inflect|
               #   inflect.plural /^(ox)$/i, '\1en'
               #   inflect.singular /^(ox)en/i, '\1'
               #   inflect.irregular 'person', 'people'
               #   inflect.uncountable %w( fish sheep )
               # end
               # Add new mime types for use in respond_to blocks:
               # Mime::Type.register "text/richtext", :rtf
               # Mime::Type.register "application/x-mobile", :mobile
               # Include your application configuration below
               # These are where inputs and outputs of test requests are stored
               TEST_REQUEST_INPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/input'
               TEST_REQUEST_OUTPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/output'
+            + # To use ANALYSIS MODE, provide the testcases/testruns breakdown,
+            + # and the directory of the grading result (usually in judge's dir).
+            + TASK_GRADING_INFO_FILENAME = RAILS_ROOT + '/config/tasks.yml'
+            + GRADING_RESULT_DIR = '/home/thailandoi/ytopc/judge/result'
+            +
               # Uncomment so that configuration is read only once when the server is loaded
               # Configuration.enable_caching
+            +
+            + # Uncomment so that the system validates user e-mails
+            + # VALIDATE_USER_EMAILS = true

config/environments/development.rb ¶ -1

               # since you don't have to restart the webserver when you make code changes.
               config.cache_classes = false
               # Log error messages when you accidentally call methods on nil.
               config.whiny_nils = true
               # Enable the breakpoint server that script/breakpointer connects to
               #config.breakpoint_server = true
               # Show full error reports and disable caching
               config.action_controller.consider_all_requests_local = true
               config.action_controller.perform_caching             = false
-            - config.action_view.cache_template_extensions         = false
               config.action_view.debug_rjs                         = true
               # Don't care if the mailer can't send
               config.action_mailer.raise_delivery_errors = false

config/environments/test.rb ¶ +1 -1

               config.cache_classes = true
               # Log error messages when you accidentally call methods on nil.
               config.whiny_nils = true
               # Show full error reports and disable caching
               config.action_controller.consider_all_requests_local = true
               config.action_controller.perform_caching             = false
               # Tell ActionMailer not to deliver emails to the real world.
               # The :test delivery method accumulates sent emails in the
               # ActionMailer::Base.deliveries array.
-            - config.action_mailer.delivery_method = :test
  No newline at end of file
+            + config.action_mailer.delivery_method = :test

db/schema.rb ¶ +3 -2

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20081210021333) do
+            + ActiveRecord::Schema.define(:version => 20090206145016) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
+            +     t.boolean  "contest_only", :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at"
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                 create_table "users", :force => true do |t|
-            -     t.string   "login",           :limit => 10
+            +     t.string   "login",           :limit => 50
                   t.string   "full_name"
                   t.string   "hashed_password"
                   t.string   "salt",            :limit => 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end

public/stylesheets/application.css ¶ +33 -2

               /* Normal text */
-            - p {
+            + body {
-            -     font-size: 12px;
+            +     font-size: 13px;
+            +     font-family: "Sans Serif";
               }
               /* This is the main menu bad*/
               div.userbar {
                   border-top: thin solid grey;
                   border-bottom: thin solid grey;
                   text-align: right;
                   font-size: 12px;
               }
               /* This is the top bar, displaying user's full name */
               div.title {
               div.message div.reply-body {
                   border: 1px solid black;
                   background: #ffeeee;
                   padding-left: 5px;
               }
               div.message div.stat {
                   font-size: 10px;
                   color: white;
                   background: green;
                   font-weight: bold;
               }
+            +
+            + /********************
+            +    Registration
+            + ********************/
+            + div.contest-title {
+            +     color: white;
+            +     background: #007700;
+            +     text-align: center;
+            +     padding: 5px;
+            + }
+            +
+            + div.registration-desc {
+            +     margin-top: 5px;
+            +     margin-bottom: 5px;
+            +     border: solid 1px gray;
+            +     padding: 10px;
+            +     background: #f0f0f0;
+            + }
+            +
+            + /********************
+            +   [Test Interface]
+            + ********************/
+            +
+            + div.test-desc {
+            +     border: solid 1px gray;
+            +     background: #f0f0f0;
+            +     padding: 5px;
+            +     font-size: 12px;
+            +     margin-bottom: 5px;
+            + }

script/about 644 ➡ 755 ¶