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: 185 inserted, 160 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

               # 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

Gemfile.lock ¶ -10

                   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)
                   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)
                   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
               DEPENDENCIES
                 ace-rails-ap
-            -   activerecord-session_store
                 best_in_place!
                 bootsnap
                 bootstrap (~> 5.2)
                 haml
                 haml-rails
                 importmap-rails (~> 1.1)
-            -   in_place_editing
                 jbuilder
                 jquery-rails
                 listen (>= 3.0.5, < 3.2)

app/javascript/custom.js ¶ -8

                     }
                   }
                 });
-            -   $(".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);

app/views/layouts/application.html.haml ¶ +3 -2

                   = render 'layouts/header'
                 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
-            -   = flash_messages
+            +   .container-fluid
-            -   = yield
+            +     = flash_messages
+            +     = yield

app/views/main/_login_box.html.haml ¶ +81 -36

@@ -1,43 +1,88
1	- %b= GraderConfiguration['ui.front.welcome_message']	1	+
2	- %br/	2	+ .card
		3	+ .card-body
		4	+ .card-title
		5	+ %h3= GraderConfiguration['ui.front.welcome_message']
		6	+ - if !@hidelogin
		7	+ .card-subtitle=t 'login.message'
		8	+
		9	+ - if flash[:notice]
		10	+ %hr/
		11	+ %b= flash[:notice]
		12	+ %hr/
3		13
4	- - if !@hidelogin	14	+ .card
5	- =t 'login.message'	15	+ .card-body{ style: "background: #eeeeff;"}
6	- %br/	16	+ = form_with url: login_login_path do \|f\|
		17	+ .mb-3
		18	+ = f.label :login, "Login", class: 'form-label'
		19	+ = f.text_field :login, class: 'form-control'
		20	+ .mb-3
		21	+ = f.label :password, "Password", class: 'form-label'
		22	+ = f.password_field :password, class: 'form-control'
		23	+ - unless GraderConfiguration['right.bypass_agreement']
		24	+ .col-sm-offset-3.col-sm-9
		25	+ .checkbox
		26	+ %label
		27	+ = check_box_tag 'accept_agree'
		28	+ ยอมรับข้อตกลงการใช้งาน
		29	+ .mb-3
		30	+ .col-sm-offset-3.col-sm-9
		31	+ = submit_tag t('login.login_submit'), class: 'btn btn-primary'
		32	+ - else
		33	+ Login is not possible right now
		34	+
		35	+ %br/
		36	+
		37	+ - if GraderConfiguration['system.online_registration']
		38	+ =t 'login.participation'
		39	+ %b
		40	+ = "#{t 'login.please'} "
		41	+ = link_to "#{t 'login.register'}", :controller => :users, :action => :new
		42	+ %br/
		43	+ = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget
		44	+ -#
7	%br/	45	%br/
8		46
9	- - if flash[:notice]	47	+ - if !@hidelogin
10	- %hr/	48	+ =t 'login.message'
11	- %b= flash[:notice]	49	+ %br/
12	- %hr/	50	+ %br/
		51	+
		52	+ - if flash[:notice]
		53	+ %hr/
		54	+ %b= flash[:notice]
		55	+ %hr/
13		56
14	- %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}	57	+ %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
15	- = form_tag login_login_path, {class: 'form-horizontal'} do	58	+ = form_tag login_login_path, {class: 'form-horizontal'} do
16	- .form-group	59	+ .form-group
17	- =label_tag :login, "Login",class: 'col-sm-3 control-label'	60	+ =label_tag :login, "Login",class: 'col-sm-3 control-label'
18	- .col-sm-9	61	+ .col-sm-9
19	- =text_field_tag :login, nil, class: 'form-control'	62	+ =text_field_tag :login, nil, class: 'form-control'
20	- .form-group	63	+ .form-group
21	- =label_tag :password, "Password", class: 'col-sm-3 control-label'	64	+ =label_tag :password, "Password", class: 'col-sm-3 control-label'
22	- .col-sm-9	65	+ .col-sm-9
23	- =password_field_tag :password, nil, class: 'form-control'	66	+ =password_field_tag :password, nil, class: 'form-control'
24	- - unless GraderConfiguration['right.bypass_agreement']	67	+ - unless GraderConfiguration['right.bypass_agreement']
		68	+ .form-group
		69	+ .col-sm-offset-3.col-sm-9
		70	+ .checkbox
		71	+ %label
		72	+ = check_box_tag 'accept_agree'
		73	+ ยอมรับข้อตกลงการใช้งาน
		74	+
25	.form-group	75	.form-group
26	.col-sm-offset-3.col-sm-9	76	.col-sm-offset-3.col-sm-9
27	- .checkbox	77	+ = submit_tag t('login.login_submit'), class: 'btn btn-primary'
28	- %label	78	+ - else
29	- = check_box_tag 'accept_agree'	79	+
30	- ยอมรับข้อตกลงการใช้งาน	80	+ %br/
31		81
32	- .form-group	82	+ - if GraderConfiguration['system.online_registration']
33	- .col-sm-offset-3.col-sm-9	83	+ =t 'login.participation'
34	- = submit_tag t('login.login_submit'), class: 'btn btn-primary'	84	+ %b
35	- %br/	85	+ = "#{t 'login.please'} "
36	-	86	+ = link_to "#{t 'login.register'}", :controller => :users, :action => :new
37	- - if GraderConfiguration['system.online_registration']	87	+ %br/
38	- =t 'login.participation'	88	+ = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget
39	- %b
40	- = "#{t 'login.please'} "
41	- = link_to "#{t 'login.register'}", :controller => :users, :action => :new
42	- %br/
43	- = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

app/views/report/_task_hof.html.haml ¶ +30 -31

@@ -24,33 +24,32
24	}	24	}
25		25
26		26
27	- .container-fluid	27	+ .row.mb-3
28	- .row	28	+ .col-md-8
29	- .c~~ol-md-8~~	29	+ .card
30	- .card	30	+ .card-body
31	- .card-body	31	+ %h2.card-title Submission History
32	- %h2.card-title Submission History	32	+ %canvas#chart{height: '50px'}
33	- %canvas#chart{height: '50px'}
34		33
35	- .col-md-4	34	+ .col-md-4
36	- .card	35	+ .card
37	- .card-body	36	+ .card-body
38	- %h2.card-title General Info	37	+ %h2.card-title General Info
39	- .row	38	+ .row
40	- .col-sm-6	39	+ .col-sm-6
41	- Subs	40	+ Subs
42	- .col-sm-6	41	+ .col-sm-6
43	- = @summary[:count]	42	+ = @summary[:count]
44	- .row	43	+ .row
45	- .col-sm-6	44	+ .col-sm-6
46	- Solved/Attempted User	45	+ Solved/Attempted User
47	- .col-sm-6	46	+ .col-sm-6
48	- #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)	47	+ #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
49	- .row	48	+ .row.mb-3
50	- .col-md-4	49	+ .col-md-4
51	- .card	50	+ .card
52	- .card-body	51	+ .card-body
53	- %h2.card-title Model submission	52	+ %h2.card-title Model submission
54	%table.table.table-hover	53	%table.table.table-hover
55	%thead	54	%thead
56	%tr	55	%tr
@@ -63,11 +62,11
63	= link_to "##{sub.id}", submission_path(sub)	62	= link_to "##{sub.id}", submission_path(sub)
64	= "(#{sub.language.pretty_name})"	63	= "(#{sub.language.pretty_name})"
65	%td= sub.user.full_name	64	%td= sub.user.full_name
66	- .col-md-8	65	+ .col-md-8
67	- - if @best	66	+ - if @best
68	- .card	67	+ .card
69	- .card-body	68	+ .card-body
70	- %h2.card-title Top Submissions	69	+ %h2.card-title Top Submissions
71	%table.table.table-hover	70	%table.table.table-hover
72	%thead	71	%thead
73	%tr	72	%tr

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

               /- 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)

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

@@ -1,16 +1,4
1	- .card.border-info.mb-2	1	+ = render 'problem_chooser', {problems: @problems, selected_problem: @problem, target_url_method: :problem_submissions_path}
2	- .card-header.text-bg-info.border-info
3	- Select Problems
4	- .card-body
5	- .row
6	- .col-6
7	- = select 'submission',
8	- 'problem_id',
9	- @problems.collect {\|p\| ["[#{p.name}] #{p.full_name}", problem_submissions_url(p.id)]},
10	- { selected: (@problem ? problem_submissions_url(@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		2
15	- if @problem!=nil	3	- if @problem!=nil
16	%h2= "Task: #{@problem.full_name} (#{@problem.name})"	4	%h2= "Task: #{@problem.full_name} (#{@problem.name})"

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

@@ -1,26 +1,26
1	%h1 Users	1	%h1 Users
2		2
3	- .panel.panel-primary	3	+ .card.border-primary
4	- .panel-title.panel-heading	4	+ .card-header.text-bg-primary.border-primary
5	Quick Add	5	Quick Add
6	- .~~panel~~-body	6	+ .card-body
7	- = form_tag( {method: 'post'}, {class: 'form-inline'}) do	7	+ = form_with url: 'asd', class: 'row row-cols-lg-auto g-3 align-items-center' do \|f\|
8	- .~~form-group~~	8	+ .col-12
9	- = label~~_tag~~ 'user_login', 'Login'	9	+ = f.label 'user_login', 'Login'
10	- = text_field ~~'user'~~, 'login', :size => 10,class: 'form-control'	10	+ = f.text_field 'login', :size => 10,class: 'form-control'
11	.form-group	11	.form-group
12	- = label~~_tag~~ 'user_full_name', 'Full Name'	12	+ = f.label 'user_full_name', 'Full Name'
13	- = text_field ~~'user'~~, 'full_name', :size => 10,class: 'form-control'	13	+ = f.text_field 'full_name', :size => 10,class: 'form-control'
14	.form-group	14	.form-group
15	- = label~~_tag~~ 'user_password', 'Password'	15	+ = f.label 'user_password', 'Password'
16	- = text_field ~~'user'~~, 'password', :size => 10,class: 'form-control'	16	+ = f.text_field 'password', :size => 10,class: 'form-control'
17	.form-group	17	.form-group
18	- = label~~_tag~~ 'user_password_confirmation', 'Confirm'	18	+ = f.label 'user_password_confirmation', 'Confirm'
19	- = text_field ~~'user'~~, 'password_confirmation', :size => 10,class: 'form-control'	19	+ = f.text_field 'password_confirmation', :size => 10,class: 'form-control'
20	.form-group	20	.form-group
21	- = label~~_tag~~ 'user_email', 'email'	21	+ = f.label 'user_email', 'email'
22	- = text_field ~~'user'~~, 'email', :size => 10,class: 'form-control'	22	+ = f.text_field 'email', :size => 10,class: 'form-control'
23	- =submit_tag "Create", class: 'btn btn-primary'	23	+ =submit_tag "Create", class: 'btn btn-primary align-items-bottom'
24		24
25	.panel.panel-primary	25	.panel.panel-primary
26	.panel-title.panel-heading	26	.panel-title.panel-heading

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

               #
               # 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 }
               #
                 # 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/initializers/simple_form_bootstrap.rb ¶ +26 -25

               # 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 }
                   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 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|
                 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|
                   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
                 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
                 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' }
                 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' }
                   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' }
                 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'
                   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' }
                 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'
                   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' }
                 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|
                 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|
                   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'
                 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 :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' }
                 #   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'
                   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
                 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

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

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

Sign in to your account

Commit r874:8ff5fd21c79c public

Author

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

Commit `r874:8ff5fd21c79c` public