cafe-grader-web Commit - r874:8ff5fd21c79c

cafe-grader-web

Commit `r874:8ff5fd21c79c` public

parent | child

Description:

DRY problem select

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

r874:8ff5fd21c79c - Fri, 23 Sep 2022 03:59:26 - 12 files changed: 120 inserted, 95 deleted

app/views/application/_problem_chooser.html.haml created 644 ¶ +23

@@ -0,0 +1,23
	1	+ .card.border-info.mb-2
	2	+ .card-header.text-bg-info.border-info
	3	+ Select a Task
	4	+ .card-body
	5	+ .row
	6	+ .col-6
	7	+ = select 'submission',
	8	+ 'problem_id',
	9	+ problems.collect {\|p\| ["[#{p.name}] #{p.full_name}", send(target_url_method,p.id)]},
	10	+ { selected: (selected_problem ? problem_submissions_url(selected_problem) : -1) },
	11	+ { class: 'select2 form-control'}
	12	+ .col-6
	13	+ %a.btn.btn-primary.go-button#problem_go{data: {source: '#submission_problem_id'}} Go
	14	+ :javascript
	15	+ $(".go-button").on('click', function(event) {
	16	+ var link, url;
	17	+ link = $(this).attr("data-source");
	18	+ url = $(link).val();
	19	+ if (url) {
	20	+ window.location.href = url;
	21	+ }
	22	+ });
	23	+

Gemfile ¶ -1

               source 'https://rubygems.org'
               git_source(:github) { |repo| "https://github.com/#{repo}.git" }
               ruby '3.1.2'
               #rails
               gem 'rails', '~>7.0'
               # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
               gem "sprockets-rails"
-            - gem 'activerecord-session_store'
               gem 'puma'
               # Reduces boot times through caching; required in config/boot.rb
               gem 'bootsnap', require: false
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               #---------------- database ---------------------
               #the database
               gem 'mysql2'
               #for testing

Gemfile.lock ¶ -10

                     builder (~> 3.1)
                     erubi (~> 1.4)
                     rails-dom-testing (~> 2.0)
                     rails-html-sanitizer (~> 1.1, >= 1.2.0)
                   activejob (7.0.4)
                     activesupport (= 7.0.4)
                     globalid (>= 0.3.6)
                   activemodel (7.0.4)
                     activesupport (= 7.0.4)
                   activerecord (7.0.4)
                     activemodel (= 7.0.4)
                     activesupport (= 7.0.4)
-            -     activerecord-session_store (2.0.0)
-            -       actionpack (>= 5.2.4.1)
-            -       activerecord (>= 5.2.4.1)
-            -       multi_json (~> 1.11, >= 1.11.2)
-            -       rack (>= 2.0.8, < 3)
-            -       railties (>= 5.2.4.1)
                   activestorage (7.0.4)
                     actionpack (= 7.0.4)
                     activejob (= 7.0.4)
                     activerecord (= 7.0.4)
                     activesupport (= 7.0.4)
                     marcel (~> 1.0)
                     mini_mime (>= 1.1.0)
                   activesupport (7.0.4)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
                     i18n (>= 1.6, < 2)
                     minitest (>= 5.1)
                     tzinfo (~> 2.0)
                     html2haml (>= 1.0.1)
                     railties (>= 5.1)
                   html2haml (2.2.0)
                     erubis (~> 2.7.0)
                     haml (>= 4.0, < 6)
                     nokogiri (>= 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (1.12.0)
                     concurrent-ruby (~> 1.0)
                   importmap-rails (1.1.5)
                     actionpack (>= 6.0.0)
                     railties (>= 6.0.0)
-            -     in_place_editing (1.2.0)
                   jbuilder (2.11.5)
                     actionview (>= 5.0.0)
                     activesupport (>= 5.0.0)
                   jquery-rails (4.5.0)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   listen (3.0.8)
                     rb-fsevent (~> 0.9, >= 0.9.4)
                     rb-inotify (~> 0.9, >= 0.9.7)
                   loofah (2.19.0)
                     crass (~> 1.0.2)
                   matrix (0.4.2)
                   method_source (1.0.0)
                   mini_mime (1.1.2)
                   minitest (5.16.3)
                   minitest-reporters (1.5.0)
                     ansi
                     builder
                     minitest (>= 5.0)
                     ruby-progressbar
                   momentjs-rails (2.29.4.1)
                     railties (>= 3.1)
                   msgpack (1.5.6)
-            -     multi_json (1.15.0)
                   mysql2 (0.5.4)
                   net-imap (0.2.3)
                     digest
                     net-protocol
                     strscan
                   net-pop (0.1.1)
                     digest
                     net-protocol
                     timeout
                   net-protocol (0.1.3)
                     timeout
                   net-smtp (0.3.1)
                   websocket-driver (0.7.5)
                     websocket-extensions (>= 0.1.0)
                   websocket-extensions (0.1.5)
                   xpath (3.2.0)
                     nokogiri (~> 1.8)
                   zeitwerk (2.6.0)
               PLATFORMS
                 x86_64-linux
               DEPENDENCIES
                 ace-rails-ap
-            -   activerecord-session_store
                 best_in_place!
                 bootsnap
                 bootstrap (~> 5.2)
                 byebug
                 capybara
                 coffee-rails
                 fuzzy-string-match
                 haml
                 haml-rails
                 importmap-rails (~> 1.1)
-            -   in_place_editing
                 jbuilder
                 jquery-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 material_icons
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 puma
                 rails (~> 7.0)
                 rdiscount
                 rouge

app/javascript/custom.js ¶ -8

                 $('.btn-file :file').on('fileselect', function(event, numFiles, label) {
                   var input, log;
                   input = $(this).parents('.input-group').find(':text');
                   log = numFiles > 1 ? numFiles + ' files selected' : label;
                   if (input.length) {
                     input.val(log);
                   } else {
                     if (log) {
                       alert(log);
                     }
                   }
                 });
-            -   $(".go-button").on('click', function(event) {
-            -     var link, url;
-            -     link = $(this).attr("data-source");
-            -     url = $(link).val();
-            -     if (url) {
-            -       window.location.href = url;
-            -     }
-            -   });
                 $('.ajax-toggle').on('click', function(event) {
                   var target;
                   target = $(event.target);
                   target.removeClass('btn-default');
                   target.removeClass('btn-success');
                   target.addClass('btn-warning');
                   target.text('...');
                 });
                 if ($("#editor").length > 0) {
                   e = ace.edit("editor");
                   e.setTheme('ace/theme/merbivore');
                   e.getSession().setTabSize(2);

app/views/layouts/application.html.haml ¶ +1

                   <link href="https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Krub:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Sarabun:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                   <link href="https://fonts.googleapis.com/css2?family=Mitr:ital,wght@0,300;1,300&family=Kodchasan:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                   <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Sarabun:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
               %body
                 - unless local_assigns[:skip_header]
                   = render 'layouts/header'
                 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
+            +   .container-fluid
                   = flash_messages
                   = yield

app/views/main/_login_box.html.haml ¶ +46 -1

-            - %b= GraderConfiguration['ui.front.welcome_message']
+            + .card
+            +   .card-body
+            +     .card-title
+            +       %h3= GraderConfiguration['ui.front.welcome_message']
+            +     - if !@hidelogin
+            +       .card-subtitle=t 'login.message'
+            +
+            +       - if flash[:notice]
+            +         %hr/
+            +         %b= flash[:notice]
+            +         %hr/
+            +
+            +       .card
+            +         .card-body{ style: "background: #eeeeff;"}
+            +           = form_with url: login_login_path do |f|
+            +             .mb-3
+            +               = f.label :login, "Login", class: 'form-label'
+            +               = f.text_field :login, class: 'form-control'
+            +             .mb-3
+            +               = f.label :password, "Password", class: 'form-label'
+            +               = f.password_field :password, class: 'form-control'
+            +             - unless GraderConfiguration['right.bypass_agreement']
+            +               .col-sm-offset-3.col-sm-9
+            +                 .checkbox
+            +                   %label
+            +                     = check_box_tag 'accept_agree'
+            +                     ยอมรับข้อตกลงการใช้งาน
+            +             .mb-3
+            +               .col-sm-offset-3.col-sm-9
+            +                 = submit_tag t('login.login_submit'), class: 'btn btn-primary'
+            +     - else
+            +       Login is not possible right now
+            +
+            +     %br/
+            +
+            +     - if GraderConfiguration['system.online_registration']
+            +       =t 'login.participation'
+            +       %b
+            +         = "#{t 'login.please'} "
+            +         = link_to "#{t 'login.register'}", :controller => :users, :action => :new
+            +       %br/
+            +       = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget
+            + -#
                 %br/
                 - if !@hidelogin
                   =t 'login.message'
                   %br/
                   %br/
                   - if flash[:notice]
                     %hr/
                     %b= flash[:notice]
                     %hr/
                           =password_field_tag :password, nil, class: 'form-control'
                       - unless GraderConfiguration['right.bypass_agreement']
                         .form-group
                           .col-sm-offset-3.col-sm-9
                             .checkbox
                               %label
                                 = check_box_tag 'accept_agree'
                                 ยอมรับข้อตกลงการใช้งาน
                       .form-group
                         .col-sm-offset-3.col-sm-9
                           = submit_tag t('login.login_submit'), class: 'btn btn-primary'
+            +   - else
+            +
                 %br/
                 - if GraderConfiguration['system.online_registration']
                   =t 'login.participation'
                   %b
                     = "#{t 'login.please'} "
                     = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                   %br/
                   = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

app/views/report/_task_hof.html.haml ¶ +2 -3

                   position: absolute;
                   left: 25px;
                   bottom: 5px;
                   border: 1px solid;
                   padding: 5px;
                   background-color: #FFF;
                   word-wrap: break-word;
                   z-index: 9999;
                   overflow: auto;
                 }
-            - .container-fluid
+            + .row.mb-3
-            -   .row
                 .col-md-8
                   .card
                     .card-body
                       %h2.card-title Submission History
                       %canvas#chart{height: '50px'}
                 .col-md-4
                   .card
                     .card-body
                       %h2.card-title General Info
                       .row
                         .col-sm-6
                           Subs
                         .col-sm-6
                           = @summary[:count]
                       .row
                         .col-sm-6
                           Solved/Attempted User
                         .col-sm-6
                           #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
-            -   .row
+            + .row.mb-3
                 .col-md-4
                   .card
                     .card-body
                       %h2.card-title Model submission
                       %table.table.table-hover
                         %thead
                           %tr
                             %th #Sub (lang)
                             %th Author
                         %tbody
                           - @model_subs.each do |sub|
                             %tr

app/views/report/problem_hof.html.haml ¶ +4 -14

               /- if params[:id]
               /  %h1 Tasks Hall of Fame
               /  = link_to('[back to All-Time Hall of Fame]', action: 'problem_hof', id: nil  )
               /- else
               /  %h1 All-Time Hall of Fame
-            - .panel.panel-info
+            + .row.mb-5
-            -   .panel-heading
+            +   .col-md-6
-            -     Select Task
+            +     = render 'problem_chooser', {problems: @problems, selected_problem: @problem, target_url_method: :problem_hof_report_path}
-            -   .panel-body
-            -     .form-inline
-            -       = select 'report',
-            -         'problem_id',
-            -         @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_hof_report_path(p)]},
-            -         {:selected => problem_hof_report_path(@problem)},
-            -         { class: 'select2 form-control' }
-            -       %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: "#report_problem_id"}} Go
               - unless params[:id]
-            -   /=render partial: 'all_time_hof'
                 Please select a problem.
               - else
-            -   %h1
+            +   %h1.mt-3
                   [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name}
                   - if @current_user.has_role?('ta')
                     %a{href:stat_problem_path(@problem)} (stat)
                 =render partial: 'task_hof'

app/views/submissions/index.html.haml ¶ +1 -13

-            - .card.border-info.mb-2
+            + = render 'problem_chooser', {problems: @problems, selected_problem: @problem, target_url_method: :problem_submissions_path}
-            -   .card-header.text-bg-info.border-info
-            -     Select Problems
-            -   .card-body
-            -     .row
-            -       .col-6
-            -         = select 'submission',
-            -           'problem_id',
-            -           @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_submissions_url(p.id)]},
-            -           { selected: (@problem ? problem_submissions_url(@problem) : -1) },
-            -           { class: 'select2 form-control'}
-            -       .col-6
-            -         %a.btn.btn-primary.go-button#problem_go{data: {source: '#submission_problem_id'}} Go
               - if @problem!=nil
                 %h2= "Task: #{@problem.full_name} (#{@problem.name})"
               - if @submissions!=nil
                 - if @submissions.length>0
                   %table.table
                     %thead
                       %th No.
                       %th.text-right #
                       %th At
                       %th Source

app/views/user_admin/index.html.haml ¶ +16 -16

               %h1 Users
-            - .panel.panel-primary
+            + .card.border-primary
-            -   .panel-title.panel-heading
+            +   .card-header.text-bg-primary.border-primary
                   Quick Add
-            -   .panel-body
+            +   .card-body
-            -     = form_tag( {method: 'post'}, {class: 'form-inline'})  do
+            +     = form_with url: 'asd', class: 'row row-cols-lg-auto g-3 align-items-center'  do |f|
-            -       .form-group
+            +       .col-12
-            -         = label_tag 'user_login', 'Login'
+            +         = f.label 'user_login', 'Login'
-            -         = text_field 'user', 'login', :size => 10,class: 'form-control'
+            +         = f.text_field 'login', :size => 10,class: 'form-control'
                     .form-group
-            -         = label_tag 'user_full_name', 'Full Name'
+            +         = f.label 'user_full_name', 'Full Name'
-            -         = text_field 'user', 'full_name', :size => 10,class: 'form-control'
+            +         = f.text_field 'full_name', :size => 10,class: 'form-control'
                     .form-group
-            -         = label_tag 'user_password', 'Password'
+            +         = f.label 'user_password', 'Password'
-            -         = text_field 'user', 'password', :size => 10,class: 'form-control'
+            +         = f.text_field 'password', :size => 10,class: 'form-control'
                     .form-group
-            -         = label_tag 'user_password_confirmation', 'Confirm'
+            +         = f.label 'user_password_confirmation', 'Confirm'
-            -         = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
+            +         = f.text_field 'password_confirmation', :size => 10,class: 'form-control'
                     .form-group
-            -         = label_tag 'user_email', 'email'
+            +         = f.label 'user_email', 'email'
-            -         = text_field 'user', 'email', :size => 10,class: 'form-control'
+            +         = f.text_field 'email', :size => 10,class: 'form-control'
-            -       =submit_tag "Create", class: 'btn btn-primary'
+            +       =submit_tag "Create", class: 'btn btn-primary align-items-bottom'
               .panel.panel-primary
                 .panel-title.panel-heading
                   Import from site management
                 .panel-body
                   = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do
                     .form-group
                       = label_tag :file, 'File:'
                       .input-group
                         %span.input-group-btn
                           %span.btn.btn-default.btn-file
                             Browse

config/initializers/simple_form.rb ¶ +1 -4

               # frozen_string_literal: true
               #
               # Uncomment this and change the path if necessary to include your own
               # components.
-            - # See https://github.com/plataformatec/simple_form#custom-components to know
+            + # See https://github.com/heartcombo/simple_form#custom-components to know
               # more about custom components.
               # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
               #
               # Use this setup block to configure all options available in SimpleForm.
               SimpleForm.setup do |config|
                 # Wrappers are used by the form builder to generate a
                 # complete input. You can remove any component from the
                 # wrapper, change the order or even add your own to the
                 # stack. The options given below are used to wrap the
                 # whole input.
                 config.wrappers :default, class: :input,
                   hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
                 # config.generate_additional_classes_for = [:wrapper, :label, :input]
                 # Whether attributes are required by default (or not). Default is true.
                 # config.required_by_default = true
                 # Tell browsers whether to use the native HTML5 validations (novalidate form option).
                 # These validations are enabled in SimpleForm's internal config but disabled by default
                 # in this configuration, which is recommended due to some quirks from different browsers.
                 # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
                 # change this configuration to true.
                 config.browser_validations = false
-            -   # Collection of methods to detect if a file type was given.
-            -   # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]
                 # Custom mappings for input types. This should be a hash containing a regexp
                 # to match as key, and the input type that will be used when the field name
                 # matches the regexp as value.
                 # config.input_mappings = { /count/ => :integer }
                 # Custom wrappers for input types. This should be a hash containing an input
                 # type as key and the wrapper that will be used for all inputs with specified type.
                 # config.wrapper_mappings = { string: :prepend }
                 # Namespaces where SimpleForm should look for custom input classes that
                 # override default inputs.
                 # config.custom_inputs_namespaces << "CustomInputs"

config/initializers/simple_form_bootstrap.rb ¶ +26 -25

               # frozen_string_literal: true
               # Please do not make direct changes to this file!
               # This generator is maintained by the community around simple_form-bootstrap:
               # https://github.com/rafaelfranca/simple_form-bootstrap
               # All future development, tests, and organization should happen there.
-            - # Background history: https://github.com/plataformatec/simple_form/issues/1561
+            + # Background history: https://github.com/heartcombo/simple_form/issues/1561
               # Uncomment this and change the path if necessary to include your own
               # components.
-            - # See https://github.com/plataformatec/simple_form#custom-components
+            + # See https://github.com/heartcombo/simple_form#custom-components
               # to know more about custom components.
               # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
               # Use this setup block to configure all options available in SimpleForm.
               SimpleForm.setup do |config|
                 # Default class for buttons
                 config.button_class = 'btn'
                 # Define the default class of the input wrapper of the boolean input.
                 config.boolean_label_class = 'form-check-label'
                 # How the label text should be generated altogether with the required text.
                 # vertical forms
                 #
                 # vertical default_wrapper
                 config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :maxlength
                   b.optional :minlength
                   b.optional :pattern
                   b.optional :min_max
                   b.optional :readonly
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # vertical input for boolean
                 config.wrappers :vertical_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb|
                     bb.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                     bb.use :label, class: 'form-check-label'
                     bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                     bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # vertical input for radio buttons and check boxes
-            -   config.wrappers :vertical_collection, item_wrapper_class: 'form-check', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :vertical_collection, item_wrapper_class: 'form-check', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
                     ba.use :label_text
                   end
                   b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # vertical input for inline radio buttons and check boxes
-            -   config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
                     ba.use :label_text
                   end
                   b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # vertical file input
                 config.wrappers :vertical_file, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :maxlength
                   b.optional :minlength
                   b.optional :readonly
                   b.use :label
                   b.use :input, class: 'form-control-file', error_class: 'is-invalid', valid_class: 'is-valid'
-            -     b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+            +     b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # vertical multi select
                 config.wrappers :vertical_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
                     ba.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
                   end
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # vertical range input
                 config.wrappers :vertical_range, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :readonly
                   end
                   b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |wr|
                     wr.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb|
                       bb.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                       bb.use :label, class: 'form-check-label'
                       bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                       bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                     end
                   end
                 end
                 # horizontal input for radio buttons and check boxes
-            -   config.wrappers :horizontal_collection, item_wrapper_class: 'form-check', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :horizontal_collection, item_wrapper_class: 'form-check', item_label_class: 'form-check-label', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.use :label, class: 'col-sm-3 form-control-label'
+            +     b.use :label, class: 'col-sm-3 col-form-label pt-0'
                   b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
                     ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                     ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                     ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # horizontal input for inline radio buttons and check boxes
-            -   config.wrappers :horizontal_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :horizontal_collection_inline, item_wrapper_class: 'form-check form-check-inline', item_label_class: 'form-check-label', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.use :label, class: 'col-sm-3 form-control-label'
+            +     b.use :label, class: 'col-sm-3 col-form-label pt-0'
                   b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
                     ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                     ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                     ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # horizontal file input
                 config.wrappers :horizontal_file, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :maxlength
                   b.optional :minlength
                   b.optional :readonly
-            -     b.use :label, class: 'col-sm-3 form-control-label'
+            +     b.use :label, class: 'col-sm-3 col-form-label'
                   b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
                     ba.use :input, error_class: 'is-invalid', valid_class: 'is-valid'
                     ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                     ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # horizontal multi select
                 config.wrappers :horizontal_multi_select, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.use :label, class: 'col-sm-3 control-label'
+            +     b.use :label, class: 'col-sm-3 col-form-label'
                   b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
                     ba.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |bb|
                       bb.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
                     end
                     ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                     ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # horizontal range input
                 config.wrappers :horizontal_range, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :readonly
                   b.optional :step
-            -     b.use :label, class: 'col-sm-3 form-control-label'
+            +     b.use :label, class: 'col-sm-3 col-form-label'
                   b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
                     ba.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid'
                     ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                     ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # inline forms
                 #
                 # inline default_wrapper
                 config.wrappers :inline_form, tag: 'span', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.optional :minlength
                   b.optional :pattern
                   b.optional :min_max
                   b.optional :readonly
                   b.use :label, class: 'sr-only'
                   b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   b.optional :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # inline input for boolean
-            -   config.wrappers :inline_boolean, tag: 'span', class: 'form-check flex-wrap justify-content-start mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :inline_boolean, tag: 'span', class: 'form-check mb-2 mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :label, class: 'form-check-label'
                   b.use :error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   b.optional :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # bootstrap custom forms
                 #
                 # custom input for boolean
                 config.wrappers :custom_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox' do |bb|
                     bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid'
                     bb.use :label, class: 'custom-control-label'
                     bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                     bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
+            +   # custom input switch for boolean
                 config.wrappers :custom_boolean_switch, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox-switch' do |bb|
+            +     b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-switch' do |bb|
                     bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid'
                     bb.use :label, class: 'custom-control-label'
                     bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                     bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                   end
                 end
                 # custom input for radio buttons and check boxes
-            -   config.wrappers :custom_collection, item_wrapper_class: 'custom-control', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :custom_collection, item_wrapper_class: 'custom-control', item_label_class: 'custom-control-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
                     ba.use :label_text
                   end
                   b.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # custom input for inline radio buttons and check boxes
-            -   config.wrappers :custom_collection_inline, item_wrapper_class: 'custom-control custom-control-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+            +   config.wrappers :custom_collection_inline, item_wrapper_class: 'custom-control custom-control-inline', item_label_class: 'custom-control-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
                   b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
                     ba.use :label_text
                   end
                   b.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # custom file input
                 config.wrappers :custom_file, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :maxlength
                   b.optional :minlength
                   b.optional :readonly
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.wrapper :custom_file_wrapper, tag: 'div', class: 'custom-file' do |ba|
                     ba.use :input, class: 'custom-file-input', error_class: 'is-invalid', valid_class: 'is-valid'
                     ba.use :label, class: 'custom-file-label'
                     ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   end
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # custom multi select
                 config.wrappers :custom_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
                     ba.use :input, class: 'custom-select mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
                   end
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # custom range input
                 config.wrappers :custom_range, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :readonly
                   b.optional :step
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.use :input, class: 'custom-range', error_class: 'is-invalid', valid_class: 'is-valid'
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # Input Group - custom component
                 # see example app and config at https://github.com/rafaelfranca/simple_form-bootstrap
                 # config.wrappers :input_group, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                 #   b.use :html5
                 #   b.use :placeholder
                 #   b.optional :maxlength
                 #   b.optional :minlength
                 #   b.optional :pattern
                 #   b.optional :min_max
                 #   b.optional :readonly
-            -   #   b.use :label, class: 'form-control-label'
+            +   #   b.use :label
                 #   b.wrapper :input_group_tag, tag: 'div', class: 'input-group' do |ba|
                 #     ba.optional :prepend
                 #     ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
                 #     ba.optional :append
                 #   end
                 #   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
                 #   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 # end
                 # Floating Labels form
                 #
                 # floating labels default_wrapper
                 config.wrappers :floating_labels_form, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.use :placeholder
                   b.optional :maxlength
                   b.optional :minlength
                   b.optional :pattern
                   b.optional :min_max
                   b.optional :readonly
                   b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # custom multi select
                 config.wrappers :floating_labels_select, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
                   b.use :html5
                   b.optional :readonly
-            -     b.use :input, class: 'custom-select custom-select-lg', error_class: 'is-invalid', valid_class: 'is-valid'
+            +     b.use :input, class: 'custom-select', error_class: 'is-invalid', valid_class: 'is-valid'
-            -     b.use :label, class: 'form-control-label'
+            +     b.use :label
                   b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
                   b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
                 end
                 # The default wrapper to be used by the FormBuilder.
                 config.default_wrapper = :vertical_form
                 # Custom wrappers for input types. This should be a hash containing an input
                 # type as key and the wrapper that will be used for all inputs with specified type.
                 config.wrapper_mappings = {
                   boolean:       :vertical_boolean,

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 r874:8ff5fd21c79c public

Author

r874:8ff5fd21c79c - Fri, 23 Sep 2022 03:59:26 - 12 files changed: 120 inserted, 95 deleted

Commit `r874:8ff5fd21c79c` public