cafe-grader-web Commit - r556:b4cf182747cd

cafe-grader-web

Commit `r556:b4cf182747cd` public

parent | child

Description:

wip: bootstrap toggle switch todo: add javascript that thisable button until reponse arrived

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r556:b4cf182747cd - Wed, 15 Jun 2016 17:02:48 - 9 files changed: 23 inserted, 4 deleted

Gemfile ¶ +1

               gem 'mysql2'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.6'
                 gem 'coffee-rails', '~> 3.2.2'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier'
               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'
               #add bootstrap
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
+            + gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
               gem 'haml'
               gem 'mail'
               gem 'rdiscount'
               gem 'test-unit'
               gem 'will_paginate', '~> 3.0.7'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'https://github.com/sikachu/verification.git'
               group :test, :development do
                 gem 'rspec-rails', '~> 2.99.0'
               end

Gemfile.lock ¶ +2

               GIT
                 remote: https://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.21)
                     actionpack (= 3.2.21)
                     mail (~> 2.5.4)
                   actionpack (3.2.21)
                     activemodel (= 3.2.21)
                     activesupport (= 3.2.21)
                     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.21)
                     activesupport (= 3.2.21)
                     builder (~> 3.0.0)
                   activerecord (3.2.21)
                     activemodel (= 3.2.21)
                     activesupport (= 3.2.21)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
                   activeresource (3.2.21)
                     activemodel (= 3.2.21)
                     activesupport (= 3.2.21)
                   activesupport (3.2.21)
                     i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
                   arel (3.0.3)
                   autoprefixer-rails (6.0.3)
                     execjs
                     json
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
+            +     bootstrap-toggle-rails (2.2.1.0)
                   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.9.0)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.3.0)
                   haml (4.0.6)
                     tilt
                   hike (1.2.3)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   jquery-rails (3.1.2)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.13.4)
                     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.2)
                   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.20)
                   polyglot (0.3.5)
                   power_assert (0.2.2)
                   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
                   rspec-collection_matchers (1.1.2)
                     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.3)
                   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.11)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
                   select2-rails (4.0.1)
                     thor (~> 0.14)
                   sprockets (2.2.3)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   test-unit (3.0.9)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.43)
                   uglifier (2.7.0)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
+            +   bootstrap-toggle-rails
                 coffee-rails (~> 3.2.2)
                 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.21)
                 rdiscount
                 rouge
                 rspec-rails (~> 2.99.0)
                 sass-rails (~> 3.2.6)
                 select2-rails
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)

app/assets/javascripts/application.js ¶ +2 -1

               // This is a manifest file that'll be compiled into application.js, which will include all the files
               // listed below.
               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require bootstrap-sprockets
-            - //= require bootstrap-switch
+            + //x= require bootstrap-switch
+            + //= require bootstrap-toggle
               //= require select2
               //= require custom
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop
               //x= require controls

app/assets/javascripts/custom.js.coffee ¶ +2 -1

               $(document).on 'change', '.btn-file :file', ->
                 input = $(this)
                 numFiles = if input.get(0).files then input.get(0).files.length else 1
                 label = input.val().replace(/\\/g, '/').replace(/.*\//, '')
                 input.trigger 'fileselect', [
                   numFiles
                   label
                 ]
                 return
               # document ready
               $ ->
                 $(".select2").select2()
-            -   $(".bootstrap-switch").bootstrapSwitch()
+            +   #$(".bootstrap-switch").bootstrapSwitch()
+            +   $(".bootstrap-toggle").bootstrapToggle()
                 $('.btn-file :file').on 'fileselect', (event, numFiles, label) ->
                   input = $(this).parents('.input-group').find(':text')
                   log = if numFiles > 1 then numFiles + ' files selected' else label
                   if input.length
                     input.val log
                   else
                     if log
                       alert log
                   return
                 return

app/assets/stylesheets/application.css.sass ¶ +2 -1

               /*
                * This is a manifest file that'll be compiled into application.css, which will include all the files
                * listed below.
                *
                * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
                * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
                *
                * You're free to add application-wide styles to this file and they'll appear at the bottom of the
                * compiled file so the styles you add here take precedence over styles defined in any styles
                * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
                * file per style scope.
                *
                // bootstrap says that we should not do this, but @import each file instead
                #   *= require_tree .
                #   *= require_self
                */
               @import jquery.ui.all
               @import jquery.ui.core
               @import jquery.ui.core
               @import jquery.ui.theme
               @import jquery.ui.datepicker
               @import jquery.ui.slider
               @import jquery-ui-timepicker-addon
               @import jquery-tablesorter/theme.metro-dark
               @import tablesorter-theme.cafe
               //bootstrap
               @import bootstrap-sprockets
               @import bootstrap
               @import select2
               @import select2-bootstrap
-            - @import bootstrap3-switch
+            + //@import bootstrap3-switch
+            + @import bootstrap-toggle
               .secondnavbar
                 top: 50px
               .btn-file
                 position: relative
                 overflow: hidden
               .btn-file input[type=file]
                 position: absolute
                 top: 0
                 right: 0
                 min-width: 100%
                 min-height: 100%
                 font-size: 100px
                 text-align: right
                 filter: alpha(opacity=0)
                 opacity: 0
                 outline: none
                 background: white
                 cursor: inherit
                 display: block
               body
                 background: white image-url("topbg.jpg") repeat-x top center
                 //font-size: 13px
                 //font-family: Tahoma, "sans-serif"
                 margin: 10px
                 padding: 10px
                 padding-top: 100px
               input
                 font-family: Tahoma, "sans-serif"
               h1
                 font-size: 24px
                 color: #334488
                 line-height: 2em
               h2
                 font-size: 18px
                 color: #5566bb
                 line-height: 1.5em

app/controllers/announcements_controller.rb ¶ +10

                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/new
                 # GET /announcements/new.xml
                 def new
                   @announcement = Announcement.new
                   respond_to do |format|
                     format.html # new.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/1/edit
                 def edit
                   @announcement = Announcement.find(params[:id])
                 end
                 # POST /announcements
                 # POST /announcements.xml
                 def create
                   @announcement = Announcement.new(params[:announcement])
                   respond_to do |format|
                     if @announcement.save
                       flash[:notice] = 'Announcement was successfully created.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { render :xml => @announcement, :status => :created, :location => @announcement }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /announcements/1
                 # PUT /announcements/1.xml
                 def update
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     if @announcement.update_attributes(params[:announcement])
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
+            +         format.js   {}
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
+            +         format.js   {}
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
+            +   def toggle
+            +     @announcement = Announcement.find(params[:id])
+            +     @announcement.update_attributes( published: params[:published] == 1)
+            +     respond_to do |format|
+            +       format.js {}
+            +     end
+            +   end
+            +
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy
                   respond_to do |format|
                     format.html { redirect_to(announcements_url) }
                     format.xml  { head :ok }
                   end
                 end
               end

app/controllers/application_controller.rb ¶ +1

               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 before_filter :current_user
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 # Returns the current logged-in user (if any).
                 def current_user
+            +     return nil unless session[:user_id]
                   @current_user ||= User.find(session[:user_id])
                 end
                 def admin_authorization
                   return false unless authenticate
                   user = User.find(session[:user_id], :include => ['roles'])
                   unless user.admin?
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login' unless user.admin?
                     return false
                   end
                   return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 protected
                 def authenticate
                   unless session[:user_id]
                     flash[:notice] = 'You need to login'
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       flash[:notice] = 'You need to login but you cannot log in at this time'
                     end
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find(session[:user_id])
                     if user==nil or (not user.admin?)
                       flash[:notice] = 'You cannot log in at this time'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     return true
                   end
                   if GraderConfiguration.multicontests?

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

               <h1>Listing announcements</h1>
               <%= link_to 'New announcement', new_announcement_path %>
               <table class="info">
                 <tr class="info-head">
                   <th>Updated</th>
                   <th>Announcement</th>
                   <th>Author</th>
                   <th>Published</th>
                   <th></th>
                   <th></th>
                   <th></th>
                 </tr>
               <% for announcement in @announcements %>
                 <tr class="info-<%= cycle 'odd', 'even' %>">
                   <% @announcement = announcement %>
                   <td><%= time_ago_in_words announcement.updated_at %></td>
                   <td>
                     <% if !announcement.title.blank? %>
                       <b>Title:</b> <%=h announcement.title %><br/>
                     <% end %>
                     <% if !announcement.notes.blank? %>
                       <b>Notes: <%=h announcement.notes %></b><br/>
                     <% end %>
                     <%=h announcement.body %>
                   </td>
                   <td><%=h announcement.author %></td>
-            -     <td><%= check_box_tag :published, 1, announcement.published, class: 'bootstrap-switch', data: {size: 'small'} %></td>
+            +     <td><%= check_box_tag :published, 1, announcement.published, { class: 'bootstrap-toggle', id: "published-#{announcement.id}", data: {remote: true, method: 'PUT', url: url_for(controller: :announcements, action: :toggle, id: announcement), size: 'small', toggle: 'toggle' } } %></td>
                   <!-- <td><%= in_place_editor_field :announcement, :published, {}, :rows => 1 %></td> -->
                   <td><%= link_to 'Show', announcement %></td>
                   <td><%= link_to 'Edit', edit_announcement_path(announcement) %></td>
                   <td><%= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New announcement', new_announcement_path %>

config/routes.rb ¶ +2

               CafeGrader::Application.routes.draw do
                 root :to => 'main#login'
                 get "report/login"
                 resources :contests
                 resources :announcements
+            +   match 'announcements/toggle/:id' => 'announcements#toggle', via: :put
+            +
                 resources :sites
                 resources :grader_configuration, controller: 'configurations'
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)'
               end

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

Commit r556:b4cf182747cd public

Author

r556:b4cf182747cd - Wed, 15 Jun 2016 17:02:48 - 9 files changed: 23 inserted, 4 deleted

Commit `r556:b4cf182747cd` public