# HG changeset patch # User Nattee Niparnan # Date 2016-08-05 11:09:05 # Node ID 27e6704d5f5306c127aee0835c98230b6f243e3e # Parent 7190ed55d920fad0c602528b8aadcadae0027e13 asset pipelining for controller specific asset diff --git a/app/assets/javascripts/configurations.js.coffee b/app/assets/javascripts/configurations.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/contest_management.js.coffee b/app/assets/javascripts/contest_management.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/contests.js.coffee b/app/assets/javascripts/contests.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/graders.js.coffee b/app/assets/javascripts/graders.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/heartbeat.js.coffee b/app/assets/javascripts/heartbeat.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/login.js.coffee b/app/assets/javascripts/login.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/messages.js.coffee b/app/assets/javascripts/messages.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/problems.js.coffee b/app/assets/javascripts/problems.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/site.js.coffee b/app/assets/javascripts/site.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/sites.js.coffee b/app/assets/javascripts/sites.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/tasks.js.coffee b/app/assets/javascripts/tasks.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/test.js.coffee b/app/assets/javascripts/test.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/user_admin.js.coffee b/app/assets/javascripts/user_admin.js.coffee new file mode 100644 diff --git a/app/assets/javascripts/users.js.coffee b/app/assets/javascripts/users.js.coffee new file mode 100644 diff --git a/app/assets/stylesheets/announcements.css.scss b/app/assets/stylesheets/announcements.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/configurations.css.scss b/app/assets/stylesheets/configurations.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/contest_management.css.scss b/app/assets/stylesheets/contest_management.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/contests.css.scss b/app/assets/stylesheets/contests.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/graders.css.scss b/app/assets/stylesheets/graders.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/heartbeat.css.scss b/app/assets/stylesheets/heartbeat.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/login.css.scss b/app/assets/stylesheets/login.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/messages.css.scss b/app/assets/stylesheets/messages.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/problems.css.scss b/app/assets/stylesheets/problems.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/site.css.scss b/app/assets/stylesheets/site.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/sites.css.scss b/app/assets/stylesheets/sites.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/tablesorter-theme.cafe.css b/app/assets/stylesheets/tablesorter-theme.cafe.css --- a/app/assets/stylesheets/tablesorter-theme.cafe.css +++ b/app/assets/stylesheets/tablesorter-theme.cafe.css @@ -3,7 +3,7 @@ *************/ /* overall */ .tablesorter-cafe { - // font: 12px/18px 'Segoe UI Semilight', 'Open Sans', Verdana, Arial, Helvetica, sans-serif; + /* font: 12px/18px 'Segoe UI Semilight', 'Open Sans', Verdana, Arial, Helvetica, sans-serif; */ color: #000; background-color: #777; margin: 10px 0 15px; @@ -25,8 +25,10 @@ .tablesorter-cafe thead td, .tablesorter-cafe tfoot th, .tablesorter-cafe tfoot td { + /* //font-weight: 300; //font-size: 15px; + */ color: #fff; background-color: #777; padding: 2px; diff --git a/app/assets/stylesheets/tasks.css.scss b/app/assets/stylesheets/tasks.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/test.css.scss b/app/assets/stylesheets/test.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/user_admin.css.scss b/app/assets/stylesheets/user_admin.css.scss new file mode 100644 diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss new file mode 100644 diff --git a/app/views/graders/_grader.html.haml b/app/views/graders/_grader.html.haml --- a/app/views/graders/_grader.html.haml +++ b/app/views/graders/_grader.html.haml @@ -2,10 +2,10 @@ %td= grader.host %td= grader.pid %td= grader.mode -%td= grader.updated_at.strftime("%H:%M:%S") if grader.updated_at!=nil +%td= grader.updated_at.strftime("%H:%M:%S") unless grader.updated_at.nil? %td= grader.task_type %td - - if grader.task_id==nil + - if grader.task_id.nil? idle - else = link_to "#{grader.task_id}", :action => 'view', :id => grader.task_id, :type => grader.task_type diff --git a/config/application.rb.SAMPLE b/config/application.rb.SAMPLE --- a/config/application.rb.SAMPLE +++ b/config/application.rb.SAMPLE @@ -59,7 +59,12 @@ # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css'] + config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js'] config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css'] + %w( announcements configurations contests contest_management graders heartbeat + login main messages problems report site sites sources tasks + test user_admin users ).each do |controller| + config.assets.precompile += ["#{controller}.js", "#{controller}.css"] + end end end diff --git a/config/initializers/abstract_mysql2_adapter.rb.SAMPLE b/config/initializers/abstract_mysql2_adapter.rb.SAMPLE new file mode 100644 --- /dev/null +++ b/config/initializers/abstract_mysql2_adapter.rb.SAMPLE @@ -0,0 +1,3 @@ +class ActiveRecord::ConnectionAdapters::Mysql2Adapter + NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY" +end diff --git a/db/schema.rb b/db/schema.rb --- a/db/schema.rb +++ b/db/schema.rb @@ -15,12 +15,12 @@ create_table "announcements", :force => true do |t| t.string "author" - t.text "body", :limit => 16777215 + t.text "body" t.boolean "published" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.boolean "frontpage", :default => false - t.boolean "contest_only", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.boolean "frontpage", :default => false + t.boolean "contest_only", :default => false t.string "title" t.string "notes" end @@ -50,19 +50,19 @@ end create_table "descriptions", :force => true do |t| - t.text "body", :limit => 16777215 + t.text "body" t.boolean "markdowned" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "grader_configurations", :force => true do |t| t.string "key" t.string "value_type" t.string "value" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "description", :limit => 16777215 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "description" end create_table "grader_processes", :force => true do |t| @@ -107,10 +107,10 @@ t.integer "sender_id" t.integer "receiver_id" t.integer "replying_message_id" - t.text "body", :limit => 16777215 + t.text "body" t.boolean "replied" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "problems", :force => true do |t| @@ -152,7 +152,7 @@ create_table "sessions", :force => true do |t| t.string "session_id" - t.text "data", :limit => 16777215 + t.text "data" t.datetime "updated_at" end @@ -180,14 +180,14 @@ t.integer "user_id" t.integer "problem_id" t.integer "language_id" - t.text "source", :limit => 16777215 + t.text "source" t.binary "binary" t.datetime "submitted_at" t.datetime "compiled_at" - t.text "compiler_message", :limit => 16777215 + t.text "compiler_message" t.datetime "graded_at" t.integer "points" - t.text "grader_comment", :limit => 16777215 + t.text "grader_comment" t.integer "number" t.string "source_filename" t.float "max_runtime" @@ -208,10 +208,10 @@ create_table "test_pairs", :force => true do |t| t.integer "problem_id" - t.text "input", :limit => 2147483647 - t.text "solution", :limit => 2147483647 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.text "input", :limit => 16777215 + t.text "solution", :limit => 16777215 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "test_requests", :force => true do |t| @@ -222,13 +222,13 @@ t.string "output_file_name" t.string "running_stat" t.integer "status" - t.datetime "updated_at", :null => false + t.datetime "updated_at", :null => false t.datetime "submitted_at" t.datetime "compiled_at" - t.text "compiler_message", :limit => 16777215 + t.text "compiler_message" t.datetime "graded_at" t.string "grader_comment" - t.datetime "created_at", :null => false + t.datetime "created_at", :null => false t.float "running_time" t.string "exit_status" t.integer "memory_usage" @@ -256,7 +256,6 @@ t.boolean "activated", :default => false t.datetime "created_at" t.datetime "updated_at" - t.string "section" t.boolean "enabled", :default => true t.string "remark" t.string "last_ip"