cafe-grader-web Commit - r474:24d67ab56dc2

cafe-grader-web

Commit `r474:24d67ab56dc2` public

parent | child

Description:

add best_in_place tidy up route

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r474:24d67ab56dc2 - Fri, 09 Jan 2015 10:36:10 - 7 files changed: 32 inserted, 4 deleted

Gemfile ¶ +3

               source 'https://rubygems.org'
               gem 'rails', '3.2.19'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.3'
                 gem 'coffee-rails', '~> 3.2.1'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier', '>= 1.0.3'
               end
               gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
               #
+            + #in-place editor
+            + gem 'best_in_place', '~> 3.0.1'
+            +
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               #syntax highlighter
               gem 'rouge'
               gem "haml"
               gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'git://github.com/sikachu/verification.git'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"
               end

Gemfile.lock ¶ +4

               GIT
                 remote: git://github.com/sikachu/verification.git
                 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
                 specs:
                   verification (1.0.3)
                     actionpack (>= 3.0.0, < 5.0)
                     activesupport (>= 3.0.0, < 5.0)
               GEM
                 remote: https://rubygems.org/
                 specs:
                   actionmailer (3.2.19)
                     actionpack (= 3.2.19)
                     mail (~> 2.5.4)
                   actionpack (3.2.19)
                     activemodel (= 3.2.19)
                     activesupport (= 3.2.19)
                     builder (~> 3.0.0)
                     erubis (~> 2.7.0)
                     journey (~> 1.0.4)
                     rack (~> 1.4.5)
                     rack-cache (~> 1.2)
                     rack-test (~> 0.6.1)
                     sprockets (~> 2.2.1)
                   activemodel (3.2.19)
                     activesupport (= 3.2.19)
                     builder (~> 3.0.0)
                   activerecord (3.2.19)
                     activemodel (= 3.2.19)
                     activesupport (= 3.2.19)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
                   activeresource (3.2.19)
                     activemodel (= 3.2.19)
                     activesupport (= 3.2.19)
                   activesupport (3.2.19)
                     i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
                   arel (3.0.3)
+            +     best_in_place (3.0.2)
+            +       actionpack (>= 3.2)
+            +       railties (>= 3.2)
                   builder (3.0.4)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                     railties (~> 3.2.0)
                   coffee-script (2.3.0)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.7.1)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.2.1)
                   haml (4.0.5)
                     tilt
                   hike (1.2.3)
                   i18n (0.6.11)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   jquery-rails (3.1.1)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.12.7)
                     railties (>= 3.1, < 5)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (4.0.3)
                     jquery-rails
                     railties (>= 3.1.0)
                   jquery-ui-sass-rails (4.0.3.0)
                     jquery-rails
                     jquery-ui-rails (= 4.0.3)
                     railties (>= 3.1.0)
                   json (1.8.1)
                   mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.25.1)
                   multi_json (1.10.1)
                   mysql2 (0.3.16)
                   polyglot (0.3.5)
                   power_assert (0.1.3)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
                     thor (>= 0.14.6, < 2.0)
                   rake (10.3.2)
                   rdiscount (2.1.7.1)
                   rdoc (3.12.2)
                     json (~> 1.4)
                   rouge (1.6.2)
                   rspec-collection_matchers (1.0.0)
                     rspec-expectations (>= 2.99.0.beta1)
                   rspec-core (2.99.2)
                   rspec-expectations (2.99.2)
                     diff-lcs (>= 1.1.3, < 2.0)
                   rspec-mocks (2.99.2)
                   rspec-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec-collection_matchers
                     rspec-core (~> 2.99.0)
                     rspec-expectations (~> 2.99.0)
                     rspec-mocks (~> 2.99.0)
                   sass (3.4.1)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
                   sprockets (2.2.2)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   test-unit (3.0.1)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.41)
                   uglifier (2.5.3)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
+            +   best_in_place (~> 3.0.1)
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.19)
                 rdiscount
                 rouge
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

app/assets/javascripts/local_jquery.js ¶ +7

               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require jquery.ui.datepicker
               //= require jquery.ui.slider
               //= require jquery-ui-timepicker-addon
               //= require jquery-tablesorter
+            + //= require best_in_place
+            + //= require best_in_place.jquery-ui
+            +
+            + $(document).ready(function() {
+            +   /* Activating Best In Place */
+            +   jQuery(".best_in_place").best_in_place();
+            + });

app/controllers/configurations_controller.rb ¶ +11 -3

               class ConfigurationsController < ApplicationController
                 before_filter :authenticate
                 before_filter { |controller| controller.authorization_by_roles(['admin'])}
-            -   in_place_edit_for :grader_configuration, :key
-            -   in_place_edit_for :grader_configuration, :type
-            -   in_place_edit_for :grader_configuration, :value
                 def index
                   @configurations = GraderConfiguration.find(:all,
                                                        :order => '`key`')
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
+            +   def update
+            +     @config = GraderConfiguration.find(params[:id])
+            +     respond_to do |format|
+            +       if @config.update_attributes(params[:grader_configuration])
+            +         format.json { head :ok }
+            +       else
+            +         format.json { respond_with_bip(@config) }
+            +       end
+            +     end
+            +   end
+            +
               end

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

+            + - content_for :header do
+            +   = javascript_include_tag 'local_jquery'
+            +
               %h1 System configuration
               %table.info
                 %tr.info-head
                   %th Key
                   %th Type
                   %th Value
                   %th Description
                 - @configurations.each do |conf|
                   - @grader_configuration = conf
                   %tr{:class => cycle("info-odd", "info-even")}
                     %td
                       = in_place_editor_field :grader_configuration, :key, {}, :rows=>1
                     %td
                       = in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
                     %td
-            -         = in_place_editor_field :grader_configuration, :value, {}, :rows=>1
+            +         = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel"
                     %td= conf.description
               - if GraderConfiguration.config_cached?
                 %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 ¶ +1

               - content_for :head do
                 = stylesheet_link_tag 'graders'
+            +   = javascript_include_tag 'local_jquery'
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
               = link_to '[Refresh]', :action => 'list'
               %br/
               .submitbox
                 .item
                   Grader control:
                 .item
                   = form_for :clear, :url => {:action => 'start_grading'} do |f|
                     = submit_tag 'Start graders in grading env'
                 .item
                   = form_for :clear, :url => {:action => 'start_exam'} do |f|
                     = submit_tag 'Start graders in exam env'
                 .item
                   = form_for :clear, :url => {:action => 'stop_all'} do |f|
                     = submit_tag 'Stop all running graders'
                 .item
                   = form_for :clear, :url => {:action => 'clear_all'} do |f|
                     = submit_tag 'Clear all data'
                 %br{:style => 'clear:both'}/
               %div{style: 'width:500px; float: left;'}
                 - 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'
                 %h2 Current graders
                 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
                 %h2 Stalled graders
                 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
                 %h2 Terminated graders
                 = form_for :clear, :url => {:action => 'clear_terminated'} do |f|
                   = submit_tag 'Clear data for terminated graders'

config/routes.rb ¶ +2

               CafeGrader::Application.routes.draw do
                 get "report/login"
                 resources :contests
                 resources :announcements
                 resources :sites
+            +   resources :grader_configuration, controller: 'configurations'
+            +
                 # The priority is based upon order of creation:
                 # first created -> highest priority.
                 # Sample of regular route:
                 #   match 'products/:id' => 'catalog#view'
                 # Keep in mind you can assign values other than :controller and :action
                 # Sample of named route:
                 #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
                 # This route can be invoked with purchase_url(:id => product.id)
                 # Sample resource route (maps HTTP verbs to controller actions automatically):
                 #   resources :products
                 # Sample resource route with options:
                 #   resources :products do
                 #     member do
                 #       get 'short'
                 #       post 'toggle'
                 #     end
                 #
                 #     collection do
                 #       get 'sold'
                 #     end
                 #   end
                 # Sample resource route with sub-resources:
                 #   resources :products do
                 #     resources :comments, :sales
                 #     resource :seller
                 #   end
                 # Sample resource route with more complex sub-resources
                 #   resources :products do
                 #     resources :comments
                 #     resources :sales do
                 #       get 'recent', :on => :collection
                 #     end
                 #   end
                 # Sample resource route within a namespace:
                 #   namespace :admin do
                 #     # Directs /admin/products/* to Admin::ProductsController
                 #     # (app/controllers/admin/products_controller.rb)
                 #     resources :products
                 #   end
                 # You can have the root of your site routed with "root"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r474:24d67ab56dc2 - Fri, 09 Jan 2015 10:36:10 - 7 files changed: 32 inserted, 4 deleted

Sign in to your account

Commit r474:24d67ab56dc2 public

Author

r474:24d67ab56dc2 - Fri, 09 Jan 2015 10:36:10 - 7 files changed: 32 inserted, 4 deleted

Commit `r474:24d67ab56dc2` public