cafe-grader-web Commit - r562:ede66b5a6449

cafe-grader-web

Commit `r562:ede66b5a6449` public

parent | child

Description:

* DRY the toggle button via application_helper.rb#toggle_button and _toggle_button.js.haml * bootrapize the user_admin * now considering user.enabled * tidy up route

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

r562:ede66b5a6449 - Wed, 29 Jun 2016 06:27:57 - 14 files changed: 169 inserted, 50 deleted

app/views/application/_toggle_button.js.haml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ :plain
	2	+ var t = $("#{button_id}");
	3	+ t.removeClass('btn-default');
	4	+ t.removeClass('btn-success');
	5	+ t.removeClass('btn-warning');
	6	+ t.addClass("btn-#{button_on ? 'success' : 'default'}");
	7	+ t.text("#{button_on ? 'Yes' : 'No'}");

app/views/user_admin/index.html.haml created 644 ¶ +86

@@ -0,0 +1,86
	1	+ %h1 Listing users
	2	+ .submitbox
	3	+ %b Quick add
	4	+ = form_tag :action => 'create' do
	5	+ %table{:border => "0"}
	6	+ %tr
	7	+ %td
	8	+ %label{:for => "user_login"} Login
	9	+ %td
	10	+ %label{:for => "user_full_name"} Full name
	11	+ %td
	12	+ %label{:for => "user_password"} Password
	13	+ %td
	14	+ %label{:for => "user_password_confirmation"} Confirm
	15	+ %td
	16	+ %label{:for => "user_email"} Email
	17	+ %tr
	18	+ %td= text_field 'user', 'login', :size => 10
	19	+ %td= text_field 'user', 'full_name', :size => 30
	20	+ %td= password_field 'user', 'password', :size => 10
	21	+ %td= password_field 'user', 'password_confirmation', :size => 10
	22	+ %td= email_field 'user', 'email', :size => 15
	23	+ %td= submit_tag "Create"
	24	+ %br/
	25	+ %b Import from site management
	26	+ = form_tag({:action => 'import'}, :multipart => true) do
	27	+ File: #{file_field_tag 'file'} #{submit_tag 'Import'}
	28	+ %br/
	29	+ %b What else:
	30	+ = link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}
	31	+ = link_to 'New list of users',{ :action => 'new_list'}, { class: 'btn btn-default btn-sm'}
	32	+ = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default btn-sm'}
	33	+ = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default btn-sm'}
	34	+ = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default btn-sm'}
	35	+ = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default btn-sm'}
	36	+ - if GraderConfiguration.multicontests?
	37	+ %br/
	38	+ %b Multi-contest:
	39	+ = link_to '[Manage bulk users in contests]', :action => 'contest_management'
	40	+ View users in:
	41	+ - @contests.each do \|contest\|
	42	+ = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
	43	+ = link_to "[no contest]", :action => 'contests', :id => 'none'
	44	+ Total #{@user_count} users \|
	45	+ - if !@paginated
	46	+ Display all users.
	47	+ \#{link_to '[show in pages]', :action => 'index', :page => '1'}
	48	+ - else
	49	+ Display in pages.
	50	+ \#{link_to '[display all]', :action => 'index', :page => 'all'} \|
	51	+ \#{will_paginate @users, :container => false}
	52	+
	53	+
	54	+ %table.table.table-hover.table-condense
	55	+ %thead
	56	+ %th Login
	57	+ %th Full name
	58	+ %th email
	59	+ %th Remark
	60	+ %th
	61	+ Activated
	62	+ %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
	63	+ %th
	64	+ Enabled
	65	+ %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
	66	+ %th Last IP
	67	+ %th
	68	+ %th
	69	+ %th
	70	+ %th
	71	+ - for user in @users
	72	+ %tr
	73	+ %td= link_to user.login, controller: :users, :action => 'profile', :id => user
	74	+ %td= user.full_name
	75	+ %td= user.email
	76	+ %td= user.remark
	77	+ %td= toggle_button(user.activated?, toggle_activate_user_url(user),"toggle_activate_user_#{user.id}")
	78	+ %td= toggle_button(user.enabled?, toggle_enable_user_url(user),"toggle_enable_user_#{user.id}")
	79	+ %td= user.last_ip
	80	+ %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
	81	+ %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
	82	+ %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
	83	+ %td= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-xs btn-block'
	84	+ %br/
	85	+ = link_to '[New user]', :action => 'new'
	86	+ = link_to '[New list of users]', :action => 'new_list'

app/assets/javascripts/announcements.js.coffee ¶ -8

               #js for announcement
               $ ->
-            -   $('.ajax-toggle').on 'click', (event) ->
-            -     target = $(event.target)
-            -     target.removeClass 'btn-default'
-            -     target.removeClass 'btn-success'
-            -     target.addClass 'btn-warning'
-            -     target.text '...'
-            -     return
                 $(document).ajaxError (event, jqxhr, settings, exception) ->
                   if jqxhr.status
                     alert 'We\'re sorry, but something went wrong (' + jqxhr.status + ')'
                   return

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

                   if input.length
                     input.val log
                   else
                     if log
                       alert log
                   return
                 $(".go-button").on 'click', (event) ->
                   link = $(this).attr("data-source")
                   url = $(link).val()
                   if url
                     window.location.href = url
                   return
+            +   $('.ajax-toggle').on 'click', (event) ->
+            +     target = $(event.target)
+            +     target.removeClass 'btn-default'
+            +     target.removeClass 'btn-success'
+            +     target.addClass 'btn-warning'
+            +     target.text '...'
                   return
+            +   return

app/controllers/announcements_controller.rb ¶ +2 -1

                     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:  !@announcement.published? )
                   respond_to do |format|
-            -       format.js {}
+            +       format.js { render partial: 'toggle_button',
+            +                   locals: {button_id: "#announcement_toggle_#{@announcement.id}",button_on: @announcement.published? } }
                   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 }

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

                 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])
+            +       user = User.find_by_id(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
+            +       unless user.enabled?
+            +         flash[:notice] = 'Your account is disabled'
+            +         redirect_to :controller => 'main', :action => 'login'
+            +         return false
+            +       end
                     return true
                   end
                   if GraderConfiguration.multicontests?
                     user = User.find(session[:user_id])
                     return true if user.admin?
                     begin
                       if user.contest_stat(true).forced_logout
                         flash[:notice] = 'You have been automatically logged out.'
                         redirect_to :controller => 'main', :action => 'index'
                       end
                     rescue

app/controllers/user_admin_controller.rb ¶ -1

                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
                 def index
                   list
-            -     render :action => 'list'
                 end
                 def list
                   @user_count = User.count
                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']

app/controllers/users_controller.rb ¶ +19

                     @histogram[:data][d.to_i] += 1 if d < range
                     @summary[:count] += 1
                     next unless sub.problem
                     problem[sub.problem] = [problem[sub.problem], ( (sub.try(:points) || 0) >= sub.problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = problem.count
                   problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
+            +   def toggle_activate
+            +     @user = User.find(params[:id])
+            +     @user.update_attributes( activated:  !@user.activated? )
+            +     respond_to do |format|
+            +       format.js { render partial: 'toggle_button',
+            +                   locals: {button_id: "#toggle_activate_user_#{@user.id}",button_on: @user.activated? } }
+            +     end
+            +   end
+            +
+            +   def toggle_enable
+            +     @user = User.find(params[:id])
+            +     @user.update_attributes( enabled:  !@user.enabled? )
+            +     respond_to do |format|
+            +       format.js { render partial: 'toggle_button',
+            +                   locals: {button_id: "#toggle_enable_user_#{@user.id}",button_on: @user.enabled? } }
+            +     end
+            +   end
+            +
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                 def profile_authorization
                   #if view admins' profile, allow only admin
                   return false unless(params[:id])
                   user = User.find(params[:id])
                   return false unless user
                   return admin_authorization if user.admin?
                   return true if GraderConfiguration["right.user_view_submission"]
                   #finally, we allow only admin
                   admin_authorization
                 end
+            +
               end

app/helpers/application_helper.rb ¶ +5 -10

                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
-            -   def problem_select(problems, options = {})
+            +   def toggle_button(on,toggle_url,id)
-            -     prefix = options[:with_specific_in_header] ? [[(t 'main.specified_in_header'),'-1']] : []
+            +       link_to (on ? "Yes" : "No"), toggle_url,
-            -     selected = options[:selected] || (options[:with_specific_in_header] ? -1 : nil)
+            +         {class: "btn btn-block btn-xs btn-#{on ? 'success' : 'default'} ajax-toggle",
-            -     puts "selected =  #{selected} hehe"
+            +          id: id,
-            -     html_options = {class: 'select2 form-control'}
+            +          data: {remote: true, method: 'get'}}
-            -     html_options[:id] = options[:id]if options[:id]
-            -     select 'submission',
-            -            'problem_id',  prefix + problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},
-            -            (selected ? { selected: "#{selected}"} : {} ),
-            -            html_options
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">

app/views/announcements/index.html.haml ¶ +2 -3

                     %td= time_ago_in_words announcement.updated_at
                     %td
                       - if !announcement.title.blank?
                         %b Title:
                         = h announcement.title
                         %br/
                       - if !announcement.notes.blank?
                         %b
                           Notes: #{h announcement.notes}
                         %br/
                       = h announcement.body
                     %td= h announcement.author
-            -       // %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= toggle_button(announcement.published?, toggle_announcement_url(@announcement), "announcement_toggle_#{@announcement.id}")
-            -       // <td><haml_loud> in_place_editor_field :announcement, :published, {}, :rows => 1 </haml_loud></td>
+            +       //%td= link_to (announcement.published? ? "Yes" : "No"), url_for(controller: :announcements, action: :toggle, id: announcement), { class: "btn btn-block btn-sm btn-#{(announcement.published? ? 'success' : 'default')} ajax-toggle", id: "published-#{announcement.id}", data: {remote: true, method: 'post' } }
-            -       %td= link_to (announcement.published? ? "Yes" : "No"), url_for(controller: :announcements, action: :toggle, id: announcement), { class: "btn btn-block btn-sm btn-#{(announcement.published? ? 'success' : 'default')} ajax-toggle", id: "published-#{announcement.id}", data: {remote: true, method: 'post' } }
                     %td= link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-block btn-sm btn-info'
                     %td= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete, class: "btn btn-block btn-sm btn-danger"
               %br
               = link_to '+ Add announcement', new_announcement_path, class: 'btn btn-success'

app/views/problems/index.html.haml ¶ +7 -6

                 = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
               .submitbox
                 = form_tag :action => 'quick_create' do
                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
-            - %table.table.table-condensed.table-hover
+            + %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
                   %th Full score
                   %th Date added
                   %th Avail?
                   %th Test?
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= in_place_editor_field :problem, :name, {}, :rows=>1
                     %td= in_place_editor_field :problem, :full_name, {}, :rows=>1
                     %td= in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td= problem.date_added
-            -       %td{}= link_to (@problem.available? ? "Yes" : "No"), url_for(controller: :problems, action: :toggle, id: @problem), { class: "btn btn-block btn-sm btn-#{(@problem.available? ? 'success' : 'default')} ajax-toggle", id: "prob-#{@problem.id}-avail", data: {remote: true, method: 'post' } }
+            +       %td= toggle_button(@problem.available?, url_for(controller: :problems, action: :toggle, id: @problem), "problem-avail-#{@problem.id}")
+            +       //%td{}= link_to (@problem.available? ? "Yes" : "No"), url_for(controller: :problems, action: :toggle, id: @problem), { class: "btn btn-block btn-sm btn-#{(@problem.available? ? 'success' : 'default')} ajax-toggle", id: "problem-avail-#{@problem.id}", data: {remote: true, method: 'post' } }
                     %td= problem.test_allowed
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
-            -       %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-primary btn-sm'
+            +       %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
-            -       %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-primary btn-sm'
+            +       %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
-            -       %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-primary btn-sm'
+            +       %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
-            -       %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-sm'
+            +       %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

app/views/problems/toggle.js.haml ¶ +2 -6

+            + = render partial: 'toggle_button',
+            +                   locals: {button_id: "#problem-avail-#{@problem.id}",button_on: @problem.available }
               :plain
-            -   b = $("#prob-#{@problem.id}-avail");
-            -   b.removeClass('btn-default');
-            -   b.removeClass('btn-success');
-            -   b.removeClass('btn-warning');
-            -   b.addClass("btn-#{@problem.available? ? 'success' : 'default'}");
-            -   b.text("#{@problem.available? ? 'Yes' : 'No'}");
                 r = $("#prob-#{@problem.id}");
                 r.removeClass('success');
                 r.removeClass('danger');
                 r.addClass("#{@problem.available? ? 'success' : 'danger'}");

config/routes.rb ¶ +26 -5

               CafeGrader::Application.routes.draw do
                 root :to => 'main#login'
-            -   get "report/login"
                 resources :contests
-            -   resources :announcements
-            -   match 'announcements/toggle/:id' => 'announcements#toggle'
                 resources :sites
-            -   resources :problem
+            +   resources :announcements do
+            +     member do
+            +       get 'toggle'
+            +     end
+            +   end
+            +
+            +
+            +   resources :problems do
+            +     member do
+            +       get 'toggle'
+            +     end
+            +     collection do
+            +       get 'turn_all_off'
+            +       get 'turn_all_on'
+            +       get 'import'
+            +       get 'manage'
+            +     end
+            +   end
                 resources :grader_configuration, controller: 'configurations'
+            +   resources :users do
+            +     member do
+            +       get 'toggle_activate', 'toggle_enable'
+            +     end
+            +   end
+            +
+            +
                 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"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #report
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
+            +   get "report/login"
                 # 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

app/views/announcements/toggle.js.haml removed ¶ -8

deleted file

Write
Preview

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

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

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

Sign in to your account

Author

r562:ede66b5a6449 - Wed, 29 Jun 2016 06:27:57 - 14 files changed: 169 inserted, 50 deleted

Sign in to your account

Commit r562:ede66b5a6449 public

Author

r562:ede66b5a6449 - Wed, 29 Jun 2016 06:27:57 - 14 files changed: 169 inserted, 50 deleted

Commit `r562:ede66b5a6449` public