cafe-grader-web

Commit r874:8ff5fd21c79c public

parent | child
Description:
DRY problem select
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r874:8ff5fd21c79c - - 12 files changed: 120 inserted, 95 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -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 +
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -9,7 +9,6
9 9 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
10 10 gem "sprockets-rails"
11 11
12 - gem 'activerecord-session_store'
13 12 gem 'puma'
14 13
15 14 # Reduces boot times through caching; required in config/boot.rb
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -66,12 +66,6
66 66 activerecord (7.0.4)
67 67 activemodel (= 7.0.4)
68 68 activesupport (= 7.0.4)
69 - activerecord-session_store (2.0.0)
70 - actionpack (>= 5.2.4.1)
71 - activerecord (>= 5.2.4.1)
72 - multi_json (~> 1.11, >= 1.11.2)
73 - rack (>= 2.0.8, < 3)
74 - railties (>= 5.2.4.1)
75 69 activestorage (7.0.4)
76 70 actionpack (= 7.0.4)
77 71 activejob (= 7.0.4)
@@ -145,7 +139,6
145 139 importmap-rails (1.1.5)
146 140 actionpack (>= 6.0.0)
147 141 railties (>= 6.0.0)
148 - in_place_editing (1.2.0)
149 142 jbuilder (2.11.5)
150 143 actionview (>= 5.0.0)
151 144 activesupport (>= 5.0.0)
@@ -176,7 +169,6
176 169 momentjs-rails (2.29.4.1)
177 170 railties (>= 3.1)
178 171 msgpack (1.5.6)
179 - multi_json (1.15.0)
180 172 mysql2 (0.5.4)
181 173 net-imap (0.2.3)
182 174 digest
@@ -299,7 +291,6
299 291
300 292 DEPENDENCIES
301 293 ace-rails-ap
302 - activerecord-session_store
303 294 best_in_place!
304 295 bootsnap
305 296 bootstrap (~> 5.2)
@@ -310,7 +301,6
310 301 haml
311 302 haml-rails
312 303 importmap-rails (~> 1.1)
313 - in_place_editing
314 304 jbuilder
315 305 jquery-rails
316 306 listen (>= 3.0.5, < 3.2)
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -26,14 +26,6
26 26 }
27 27 }
28 28 });
29 - $(".go-button").on('click', function(event) {
30 - var link, url;
31 - link = $(this).attr("data-source");
32 - url = $(link).val();
33 - if (url) {
34 - window.location.href = url;
35 - }
36 - });
37 29 $('.ajax-toggle').on('click', function(event) {
38 30 var target;
39 31 target = $(event.target);
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -29,5 +29,6
29 29 = render 'layouts/header'
30 30
31 31 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
32 + .container-fluid
32 33 = flash_messages
33 34 = yield
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,4 +1,47
1 - %b= GraderConfiguration['ui.front.welcome_message']
1 +
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/
13 +
14 + .card
15 + .card-body{ style: "background: #eeeeff;"}
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 + -#
2 45 %br/
3 46
4 47 - if !@hidelogin
@@ -32,6 +75,8
32 75 .form-group
33 76 .col-sm-offset-3.col-sm-9
34 77 = submit_tag t('login.login_submit'), class: 'btn btn-primary'
78 + - else
79 +
35 80 %br/
36 81
37 82 - if GraderConfiguration['system.online_registration']
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -24,8 +24,7
24 24 }
25 25
26 26
27 - .container-fluid
28 - .row
27 + .row.mb-3
29 28 .col-md-8
30 29 .card
31 30 .card-body
@@ -46,7 +45,7
46 45 Solved/Attempted User
47 46 .col-sm-6
48 47 #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
49 - .row
48 + .row.mb-3
50 49 .col-md-4
51 50 .card
52 51 .card-body
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -5,24 +5,14
5 5 /- else
6 6 / %h1 All-Time Hall of Fame
7 7
8 - .panel.panel-info
9 - .panel-heading
10 - Select Task
11 - .panel-body
12 - .form-inline
13 - = select 'report',
14 - 'problem_id',
15 - @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_hof_report_path(p)]},
16 - {:selected => problem_hof_report_path(@problem)},
17 - { class: 'select2 form-control' }
18 - %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: "#report_problem_id"}} Go
19 -
8 + .row.mb-5
9 + .col-md-6
10 + = render 'problem_chooser', {problems: @problems, selected_problem: @problem, target_url_method: :problem_hof_report_path}
20 11
21 12 - unless params[:id]
22 - /=render partial: 'all_time_hof'
23 13 Please select a problem.
24 14 - else
25 - %h1
15 + %h1.mt-3
26 16 [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name}
27 17 - if @current_user.has_role?('ta')
28 18 %a{href:stat_problem_path(@problem)} (stat)
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,16 +1,4
1 - .card.border-info.mb-2
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
1 + = render 'problem_chooser', {problems: @problems, selected_problem: @problem, target_url_method: :problem_submissions_path}
14 2
15 3 - if @problem!=nil
16 4 %h2= "Task: #{@problem.full_name} (#{@problem.name})"
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,26 +1,26
1 1 %h1 Users
2 2
3 - .panel.panel-primary
4 - .panel-title.panel-heading
3 + .card.border-primary
4 + .card-header.text-bg-primary.border-primary
5 5 Quick Add
6 - .panel-body
7 - = form_tag( {method: 'post'}, {class: 'form-inline'}) do
8 - .form-group
9 - = label_tag 'user_login', 'Login'
10 - = text_field 'user', 'login', :size => 10,class: 'form-control'
6 + .card-body
7 + = form_with url: 'asd', class: 'row row-cols-lg-auto g-3 align-items-center' do |f|
8 + .col-12
9 + = f.label 'user_login', 'Login'
10 + = f.text_field 'login', :size => 10,class: 'form-control'
11 11 .form-group
12 - = label_tag 'user_full_name', 'Full Name'
13 - = text_field 'user', 'full_name', :size => 10,class: 'form-control'
12 + = f.label 'user_full_name', 'Full Name'
13 + = f.text_field 'full_name', :size => 10,class: 'form-control'
14 14 .form-group
15 - = label_tag 'user_password', 'Password'
16 - = text_field 'user', 'password', :size => 10,class: 'form-control'
15 + = f.label 'user_password', 'Password'
16 + = f.text_field 'password', :size => 10,class: 'form-control'
17 17 .form-group
18 - = label_tag 'user_password_confirmation', 'Confirm'
19 - = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
18 + = f.label 'user_password_confirmation', 'Confirm'
19 + = f.text_field 'password_confirmation', :size => 10,class: 'form-control'
20 20 .form-group
21 - = label_tag 'user_email', 'email'
22 - = text_field 'user', 'email', :size => 10,class: 'form-control'
23 - =submit_tag "Create", class: 'btn btn-primary'
21 + = f.label 'user_email', 'email'
22 + = f.text_field 'email', :size => 10,class: 'form-control'
23 + =submit_tag "Create", class: 'btn btn-primary align-items-bottom'
24 24
25 25 .panel.panel-primary
26 26 .panel-title.panel-heading
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -2,7 +2,7
2 2 #
3 3 # Uncomment this and change the path if necessary to include your own
4 4 # components.
5 - # See https://github.com/plataformatec/simple_form#custom-components to know
5 + # See https://github.com/heartcombo/simple_form#custom-components to know
6 6 # more about custom components.
7 7 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
8 8 #
@@ -129,9 +129,6
129 129 # change this configuration to true.
130 130 config.browser_validations = false
131 131
132 - # Collection of methods to detect if a file type was given.
133 - # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]
134 -
135 132 # Custom mappings for input types. This should be a hash containing a regexp
136 133 # to match as key, and the input type that will be used when the field name
137 134 # matches the regexp as value.
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -4,11 +4,11
4 4 # This generator is maintained by the community around simple_form-bootstrap:
5 5 # https://github.com/rafaelfranca/simple_form-bootstrap
6 6 # All future development, tests, and organization should happen there.
7 - # Background history: https://github.com/plataformatec/simple_form/issues/1561
7 + # Background history: https://github.com/heartcombo/simple_form/issues/1561
8 8
9 9 # Uncomment this and change the path if necessary to include your own
10 10 # components.
11 - # See https://github.com/plataformatec/simple_form#custom-components
11 + # See https://github.com/heartcombo/simple_form#custom-components
12 12 # to know more about custom components.
13 13 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
14 14
@@ -57,7 +57,7
57 57 b.optional :pattern
58 58 b.optional :min_max
59 59 b.optional :readonly
60 - b.use :label, class: 'form-control-label'
60 + b.use :label
61 61 b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
62 62 b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
63 63 b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
@@ -76,7 +76,7
76 76 end
77 77
78 78 # vertical input for radio buttons and check boxes
79 - 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|
79 + 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|
80 80 b.use :html5
81 81 b.optional :readonly
82 82 b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -88,7 +88,7
88 88 end
89 89
90 90 # vertical input for inline radio buttons and check boxes
91 - 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|
91 + 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|
92 92 b.use :html5
93 93 b.optional :readonly
94 94 b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -108,7 +108,7
108 108 b.optional :readonly
109 109 b.use :label
110 110 b.use :input, class: 'form-control-file', error_class: 'is-invalid', valid_class: 'is-valid'
111 - b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
111 + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
112 112 b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
113 113 end
114 114
@@ -116,7 +116,7
116 116 config.wrappers :vertical_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
117 117 b.use :html5
118 118 b.optional :readonly
119 - b.use :label, class: 'form-control-label'
119 + b.use :label
120 120 b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
121 121 ba.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
122 122 end
@@ -174,10 +174,10
174 174 end
175 175
176 176 # horizontal input for radio buttons and check boxes
177 - 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|
177 + 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|
178 178 b.use :html5
179 179 b.optional :readonly
180 - b.use :label, class: 'col-sm-3 form-control-label'
180 + b.use :label, class: 'col-sm-3 col-form-label pt-0'
181 181 b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
182 182 ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
183 183 ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -186,10 +186,10
186 186 end
187 187
188 188 # horizontal input for inline radio buttons and check boxes
189 - 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|
189 + 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|
190 190 b.use :html5
191 191 b.optional :readonly
192 - b.use :label, class: 'col-sm-3 form-control-label'
192 + b.use :label, class: 'col-sm-3 col-form-label pt-0'
193 193 b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
194 194 ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
195 195 ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -204,7 +204,7
204 204 b.optional :maxlength
205 205 b.optional :minlength
206 206 b.optional :readonly
207 - b.use :label, class: 'col-sm-3 form-control-label'
207 + b.use :label, class: 'col-sm-3 col-form-label'
208 208 b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
209 209 ba.use :input, error_class: 'is-invalid', valid_class: 'is-valid'
210 210 ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -216,7 +216,7
216 216 config.wrappers :horizontal_multi_select, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
217 217 b.use :html5
218 218 b.optional :readonly
219 - b.use :label, class: 'col-sm-3 control-label'
219 + b.use :label, class: 'col-sm-3 col-form-label'
220 220 b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
221 221 ba.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |bb|
222 222 bb.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
@@ -232,7 +232,7
232 232 b.use :placeholder
233 233 b.optional :readonly
234 234 b.optional :step
235 - b.use :label, class: 'col-sm-3 form-control-label'
235 + b.use :label, class: 'col-sm-3 col-form-label'
236 236 b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
237 237 ba.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid'
238 238 ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -260,7 +260,7
260 260 end
261 261
262 262 # inline input for boolean
263 - 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|
263 + 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|
264 264 b.use :html5
265 265 b.optional :readonly
266 266 b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
@@ -284,10 +284,11
284 284 end
285 285 end
286 286
287 + # custom input switch for boolean
287 288 config.wrappers :custom_boolean_switch, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
288 289 b.use :html5
289 290 b.optional :readonly
290 - b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox-switch' do |bb|
291 + b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-switch' do |bb|
291 292 bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid'
292 293 bb.use :label, class: 'custom-control-label'
293 294 bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
@@ -296,7 +297,7
296 297 end
297 298
298 299 # custom input for radio buttons and check boxes
299 - 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|
300 + 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|
300 301 b.use :html5
301 302 b.optional :readonly
302 303 b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -308,7 +309,7
308 309 end
309 310
310 311 # custom input for inline radio buttons and check boxes
311 - 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|
312 + 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|
312 313 b.use :html5
313 314 b.optional :readonly
314 315 b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -326,7 +327,7
326 327 b.optional :maxlength
327 328 b.optional :minlength
328 329 b.optional :readonly
329 - b.use :label, class: 'form-control-label'
330 + b.use :label
330 331 b.wrapper :custom_file_wrapper, tag: 'div', class: 'custom-file' do |ba|
331 332 ba.use :input, class: 'custom-file-input', error_class: 'is-invalid', valid_class: 'is-valid'
332 333 ba.use :label, class: 'custom-file-label'
@@ -339,7 +340,7
339 340 config.wrappers :custom_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
340 341 b.use :html5
341 342 b.optional :readonly
342 - b.use :label, class: 'form-control-label'
343 + b.use :label
343 344 b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
344 345 ba.use :input, class: 'custom-select mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
345 346 end
@@ -353,7 +354,7
353 354 b.use :placeholder
354 355 b.optional :readonly
355 356 b.optional :step
356 - b.use :label, class: 'form-control-label'
357 + b.use :label
357 358 b.use :input, class: 'custom-range', error_class: 'is-invalid', valid_class: 'is-valid'
358 359 b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
359 360 b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
@@ -370,7 +371,7
370 371 # b.optional :pattern
371 372 # b.optional :min_max
372 373 # b.optional :readonly
373 - # b.use :label, class: 'form-control-label'
374 + # b.use :label
374 375 # b.wrapper :input_group_tag, tag: 'div', class: 'input-group' do |ba|
375 376 # ba.optional :prepend
376 377 # ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
@@ -393,7 +394,7
393 394 b.optional :min_max
394 395 b.optional :readonly
395 396 b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
396 - b.use :label, class: 'form-control-label'
397 + b.use :label
397 398 b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
398 399 b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
399 400 end
@@ -402,8 +403,8
402 403 config.wrappers :floating_labels_select, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
403 404 b.use :html5
404 405 b.optional :readonly
405 - b.use :input, class: 'custom-select custom-select-lg', error_class: 'is-invalid', valid_class: 'is-valid'
406 - b.use :label, class: 'form-control-label'
406 + b.use :input, class: 'custom-select', error_class: 'is-invalid', valid_class: 'is-valid'
407 + b.use :label
407 408 b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
408 409 b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
409 410 end
You need to be logged in to leave comments. Login now