Skip to content

Commit 6a927ee

Browse files
committed
Lint: Use hash for data attributes in views
1 parent 1f50f0e commit 6a927ee

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

app/views/application/_navigation.html.slim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
= render('navigation_collection_link', model: Group, cached: true)
66
- if current_user.role == 'admin'
77
li.nav-item
8-
= link_to(rails_admin.dashboard_path, 'data-turbo': false, class: 'nav-link px-3') do
8+
= link_to(rails_admin.dashboard_path, data: {turbo: false}, class: 'nav-link px-3') do
99
i.fa-solid.fa-lock
1010
=< t('.rails_admin')

app/views/collections/show.html.slim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
- else
8080
- if policy(@collection).edit?
8181
.btn-group
82-
= button_tag type: 'button', 'data-bs-toggle': 'dropdown', aria: {haspopup: 'true', expanded: 'false'}, class: 'btn btn-important nav-btn-exercise dropdown-toggle split' do
82+
= button_tag type: 'button', data: {bs_toggle: 'dropdown'}, aria: {haspopup: 'true', expanded: 'false'}, class: 'btn btn-important nav-btn-exercise dropdown-toggle split' do
8383
=> t('.button.share')
8484
span.caret
8585
.dropdown-menu#share-collection-menu
@@ -92,10 +92,10 @@
9292
.dropdown.btn-group
9393
- if @collection.tasks.empty?
9494
.btn-group data-bs-toggle='tooltip' title=t('.download_no_exercises') data-bs-delay=150
95-
= button_tag class: 'btn btn-important dropdown-toggle disabled', 'data-bs-toggle': 'dropdown' do
95+
= button_tag class: 'btn btn-important dropdown-toggle disabled', data: {bs_toggle: 'dropdown'} do
9696
=> t('common.button.download_zip')
9797
- else
98-
= button_tag class: 'btn btn-important dropdown-toggle', 'data-bs-toggle': 'dropdown' do
98+
= button_tag class: 'btn btn-important dropdown-toggle', data: {bs_toggle: 'dropdown'} do
9999
=> t('common.button.download_zip')
100100
span.caret
101101
.scrollable.dropdown-menu role='menu'
@@ -105,7 +105,7 @@
105105
= link_to(proforma_version, download_all_collection_path(@collection, version: proforma_version), class: 'dropdown-item', target: '_blank', rel: 'noopener noreferrer')
106106

107107
.dropdown.btn-group
108-
= button_tag class: 'btn btn-important dropdown-toggle', 'data-bs-toggle': 'dropdown' do
108+
= button_tag class: 'btn btn-important dropdown-toggle', data: {bs_toggle: 'dropdown'} do
109109
=> t('common.button.export')
110110
span.caret
111111
.scrollable.dropdown-menu role='menu'

app/views/layouts/application.html.slim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ html lang=I18n.locale data-default-locale=I18n.default_locale
1111
= favicon_link_tag('/icon.svg', type: 'image/svg+xml')
1212
= favicon_link_tag('/icon.png', rel: 'apple-touch-icon', type: 'image/png')
1313
= tag.link rel: 'manifest', href: pwa_manifest_path
14-
= stylesheet_pack_tag('stylesheets', "multilang_#{I18n.locale}", media: 'all', 'data-turbo-track': 'reload', integrity: true, crossorigin: 'anonymous')
15-
= stylesheet_link_tag('application', media: 'all', 'data-turbo-track': 'reload', integrity: true, crossorigin: 'anonymous')
16-
= javascript_pack_tag('application', 'data-turbo-track': 'reload', defer: false, integrity: true, crossorigin: 'anonymous')
17-
= javascript_include_tag('application', 'data-turbo-track': 'reload', defer: true, integrity: true, crossorigin: 'anonymous')
14+
= stylesheet_pack_tag('stylesheets', "multilang_#{I18n.locale}", media: 'all', data: {turbo_track: 'reload'}, integrity: true, crossorigin: 'anonymous')
15+
= stylesheet_link_tag('application', media: 'all', data: {turbo_track: 'reload'}, integrity: true, crossorigin: 'anonymous')
16+
= javascript_pack_tag('application', data: {turbo_track: 'reload'}, defer: false, integrity: true, crossorigin: 'anonymous')
17+
= javascript_include_tag('application', data: {turbo_track: 'reload'}, defer: true, integrity: true, crossorigin: 'anonymous')
1818
= yield(:head)
1919
= csrf_meta_tags
2020
/= csp_meta_tag

app/views/tasks/_editor.html.slim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ a.btn.btn-main.btn-sm.toggle-input href='#'
1818
- if file.object.persisted? && file.object.attachment.image?
1919
= image_tag file.object.attachment.variant(resize_to_limit: [600, 600])
2020
- elsif file.object.persisted?
21-
= link_to(file.object.attachment.filename, download_attachment_task_file_path(file.object), class: 'btn btn-light border-right-0', 'data-turbo' => false)
21+
= link_to(file.object.attachment.filename, download_attachment_task_file_path(file.object), class: 'btn btn-light border-right-0', data: {turbo: false})
2222
- else
2323
.btn.btn-light.border-right-0.disabled = file.object.attachment.filename
2424
= link_to('#', class: 'btn btn-light reupload-attachment border-left-0 me-1', title: t('.button.upload_a_new_file')) do

app/views/tasks/_form.html.slim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
- unless @task.contribution?
4444
.field-element
4545
= f.label :uuid, Task.human_attribute_name('uuid'), class: 'form-label'
46-
= f.text_field :uuid, type: :uuid, class: 'form-control not-allowed', disabled: true, title: t('.unchangeable_uuid'), 'data-bs-toggle': 'tooltip', pattern: uuid_pattern
46+
= f.text_field :uuid, type: :uuid, class: 'form-control not-allowed', disabled: true, title: t('.unchangeable_uuid'), data: {bs_toggle: 'tooltip'}, pattern: uuid_pattern
4747
.field-element
4848
= f.label :parent_uuid, Task.human_attribute_name('parent_uuid'), class: 'form-label'
4949
= f.text_field :parent_uuid, type: :uuid, class: 'form-control', pattern: uuid_pattern
@@ -87,7 +87,7 @@
8787
= f.label :license, Task.human_attribute_name('license'), class: 'form-label'
8888
.license
8989
.select
90-
= f.select :license_id, options_for_select(License.all.collect {|l| [l.name, l.id, {'data-link' => l.link}] }, @task.license_id), {include_blank: t('.no_license')}, {class: 'form-select'}
90+
= f.select :license_id, options_for_select(License.all.collect {|l| [l.name, l.id, {data: {link: l.link}}] }, @task.license_id), {include_blank: t('.no_license')}, {class: 'form-select'}
9191
.link
9292
fieldset.form-group
9393
legend.toggle-next
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
- content_for :modal_footer, flush: true do
2-
= button_tag class: 'btn btn-important', 'data-bs-dismiss': 'modal' do
2+
= button_tag class: 'btn btn-important', data: {bs_dismiss: 'modal'} do
33
= t('common.button.close')

app/views/tasks/index.html.slim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
= link_to(new_task_path, class: 'btn btn-main nav-btn-exercise') do
1616
i.fa-solid.fa-plus.text-success
1717
=< t('.button.new_task')
18-
= button_tag type: 'button', 'data-bs-toggle': 'dropdown', aria: {haspopup: 'true', expanded: 'false'}, class: 'btn btn-main nav-btn-exercise dropdown-toggle split' do
18+
= button_tag type: 'button', data: {bs_toggle: 'dropdown'}, aria: {haspopup: 'true', expanded: 'false'}, class: 'btn btn-main nav-btn-exercise dropdown-toggle split' do
1919
span.caret
2020
ul.dropdown-menu.rounded-0.shadow-sm#xml-import
2121
li.dropdown-header.dropdown-title
@@ -69,7 +69,7 @@
6969
p
7070
b = t('.search.has_all_labels')
7171
span.form-group
72-
= f.select 'has_all_labels', options_for_select(@req_labels.map {|l| [l.name, l.name, {label_color: l.color, label_font_color: l.font_color}] }, @req_labels.pluck(:name)), {}, {class: 'labels-select2-tag form-control ransack-filter', multiple: true, 'data-tags': false}
72+
= f.select 'has_all_labels', options_for_select(@req_labels.map {|l| [l.name, l.name, {label_color: l.color, label_font_color: l.font_color}] }, @req_labels.pluck(:name)), {}, {class: 'labels-select2-tag form-control ransack-filter', multiple: true, data: {tags: false}}
7373
- if @visibility == :owner
7474
.other.col-md-4.pt-3
7575
p

app/views/tasks/show.html.slim

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
- if file.attachment.image?
218218
= image_tag(file.attachment.variant(resize_to_limit: [900, 900]))
219219
- else
220-
= link_to(file.attachment.filename, download_attachment_task_file_path(file), 'data-turbo': false)
220+
= link_to(file.attachment.filename, download_attachment_task_file_path(file), data: {turbo: false})
221221
.row
222222
.col-auto.row-label
223223
= TaskFile.human_attribute_name('used_by_grader')
@@ -358,7 +358,7 @@
358358
- if file.attachment.image?
359359
= image_tag(file.attachment.variant(resize_to_limit: [900, 900]))
360360
- else
361-
= link_to(file.attachment.filename, download_attachment_task_file_path(file), 'data-turbo': false)
361+
= link_to(file.attachment.filename, download_attachment_task_file_path(file), data: {turbo: false})
362362
.row
363363
.col-auto.row-label
364364
= TaskFile.human_attribute_name('used_by_grader')
@@ -459,7 +459,7 @@
459459
- if file.attachment.image?
460460
= image_tag(file.attachment.variant(resize_to_limit: [900, 900]))
461461
- else
462-
= link_to(file.attachment.filename, download_attachment_task_file_path(file), 'data-turbo': false)
462+
= link_to(file.attachment.filename, download_attachment_task_file_path(file), data: {turbo: false})
463463
.row
464464
.col-auto.row-label
465465
= TaskFile.human_attribute_name('used_by_grader')
@@ -486,7 +486,7 @@
486486
.wrapper
487487
- if policy(@task).add_to_collection?
488488
.dropdown.btn-group
489-
= button_tag class: 'btn btn-light dropdown-toggle', 'data-bs-toggle': 'dropdown' do
489+
= button_tag class: 'btn btn-light dropdown-toggle', data: {bs_toggle: 'dropdown'} do
490490
= t('.button.add_to_collection')
491491
ul.scrollable.dropdown-menu role='menu'
492492
- current_user.collections.order(created_at: :desc).each do |collection|
@@ -510,7 +510,7 @@
510510
= f.submit class: 'btn btn-light submit', value: t('.button.create_collection')
511511
- else
512512
div data-bs-toggle='tooltip' title=unavailable_tooltip data-bs-delay=150
513-
= button_tag class: 'btn btn-outline-dark dropdown-toggle disabled', 'data-bs-toggle': 'dropdown' do
513+
= button_tag class: 'btn btn-outline-dark dropdown-toggle disabled', data: {bs_toggle: 'dropdown'} do
514514
= t('.button.add_to_collection')
515515
.col-md-4.col-sm-6.mb-3.p-0
516516
.button-box.border.p-3.h-100
@@ -519,7 +519,7 @@
519519
.wrapper
520520
- if policy(@task).download?
521521
.dropdown.btn-group
522-
= button_tag class: 'btn btn-light dropdown-toggle', 'data-bs-toggle': 'dropdown' do
522+
= button_tag class: 'btn btn-light dropdown-toggle', data: {bs_toggle: 'dropdown'} do
523523
= t('common.button.download_zip')
524524
ul.scrollable.dropdown-menu role='menu'
525525
li.dropdown-header = "#{t('common.button.available_versions')}: "
@@ -529,11 +529,11 @@
529529

530530
- else
531531
div data-bs-toggle='tooltip' title=unavailable_tooltip data-bs-delay=150
532-
= link_to(t('common.button.download_zip'), download_task_path(@task), class: 'btn btn-outline-dark disabled', 'data-turbo' => false)
532+
= link_to(t('common.button.download_zip'), download_task_path(@task), class: 'btn btn-outline-dark disabled', data: {turbo: false})
533533

534534
- if policy(@task).export_external_start?
535535
.dropdown.btn-group
536-
= button_tag class: 'btn btn-light dropdown-toggle', 'data-bs-toggle': 'dropdown' do
536+
= button_tag class: 'btn btn-light dropdown-toggle', data: {bs_toggle: 'dropdown'} do
537537
= t('.button.export')
538538
ul.scrollable.dropdown-menu role='menu'
539539
li.dropdown-header = "#{t('tasks.show.export_to')}: "
@@ -546,7 +546,7 @@
546546
= button_to(acc_link.name, export_external_start_task_path(account_link: acc_link), method: :post, remote: true, class: 'dropdown-item export-test')
547547
- else
548548
div data-bs-toggle='tooltip' title=unavailable_tooltip data-bs-delay=150
549-
= button_tag class: 'btn btn-outline-dark dropdown-toggle disabled', 'data-bs-toggle': 'dropdown' do
549+
= button_tag class: 'btn btn-outline-dark dropdown-toggle disabled', data: {bs_toggle: 'dropdown'} do
550550
= t('.button.export')
551551
.col-md-4.col-sm-6.mb-3.p-0
552552
.button-box.border.p-3.h-100
@@ -587,7 +587,7 @@
587587

588588
.actions.btn-group role='group'
589589
- if policy(@task).edit?
590-
= link_to(@task.url_for(:edit), class: 'btn btn-important', 'data-turbo': false) do
590+
= link_to(@task.url_for(:edit), class: 'btn btn-important', data: {turbo: false}) do
591591
i.fa-solid.fa-pen-to-square
592592
=< t('common.button.edit')
593593
- if policy(@task).destroy?

0 commit comments

Comments
 (0)