Remove datagrid-enum-checkbox-label css class as styling by tag name …

…is good enough
bogdan · Nov 16, 2024 · 757fd56 · 757fd56
1 parent 14452df
commit 757fd56
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/app/views/datagrid/_enum_checkboxes.html.erb b/app/views/datagrid/_enum_checkboxes.html.erb
@@ -5,7 +5,7 @@ You can add indent if whitespace doesn't matter for you
 <div class="datagrid-enum-checkboxes">
 <%- elements.each do |value, text, checked| -%>
 <%- id = [form.object_name, filter.name, value].join('_').underscore -%>
-<%= form.datagrid_label(filter.name, for: id, class: 'datagrid-enum-checkbox-label', **options) do -%>
+<%= form.datagrid_label(filter.name, for: id, **options) do -%>
 <%= form.datagrid_filter_input(filter.name, id: id, value: value) -%>
 <%= text -%>
 <%- end -%>

diff --git a/spec/datagrid/form_builder_spec.rb b/spec/datagrid/form_builder_spec.rb
@@ -451,12 +451,12 @@ class MyTemplate
           should equal_to_dom(
             <<~HTML,
               <div class="datagrid-enum-checkboxes">
-              <label for="report_category_first" class="datagrid-enum-checkbox-label">
+              <label for="report_category_first">
               <input type="checkbox" id="report_category_first"
                   value="first" name="report[category][]" />
               first
               </label>
-              <label for="report_category_second" class="datagrid-enum-checkbox-label">
+              <label for="report_category_second">
               <input type="checkbox" id="report_category_second"
                   value="second" name="report[category][]" />
               second
@@ -643,15 +643,15 @@ class MyTemplate
       let(:expected_html) do
         <<~DOM
           <div class="datagrid-enum-checkboxes">
-            <label for="report_column_names_id" class="datagrid-enum-checkbox-label">
+            <label for="report_column_names_id">
               <input id="report_column_names_id" type="checkbox" value="id" checked name="report[column_names][]">
               Id
             </label>
-            <label for="report_column_names_name" class="datagrid-enum-checkbox-label">
+            <label for="report_column_names_name">
               <input id="report_column_names_name" type="checkbox" value="name" checked name="report[column_names][]"/>
               Name
             </label>
-            <label for="report_column_names_category" class="datagrid-enum-checkbox-label">
+            <label for="report_column_names_category">
               <input id="report_column_names_category" type="checkbox" value="category" name="report[column_names][]">
               Category
             </label>

diff --git a/version-2/Readme.markdown b/version-2/Readme.markdown
@@ -240,10 +240,10 @@ Version 2 layout:
   <div class="datagrid-filter" data-filter="group_id" data-type="enum">
     <label>Group</label>
     <div class="datagrid-enum-checkboxes">
-      <label for="g_group_id_1" class="datagrid-enum-checkbox-label">
+      <label for="g_group_id_1">
         <input id="g_group_id_1" value="1" type="checkbox" name="g[group_id][]" />1
       </label>
-      <label for="g_group_id_2" class="datagrid-enum-checkbox-label">
+      <label for="g_group_id_2">
         <input id="g_group_id_2" value="2" type="checkbox" name="g[group_id][]" />2
       </label>
     </div>

diff --git a/version-2/form-v2.html b/version-2/form-v2.html
@@ -9,10 +9,10 @@
   <div class="datagrid-filter" data-filter="group_id" data-type="enum">
     <label for="g_group_id">Group</label>
     <div class="datagrid-enum-checkboxes">
-      <label class="datagrid-enum-checkbox-label" for="g_group_id_1">
+      <label for="g_group_id_1">
         <input id="g_group_id_1" value="1" type="checkbox" name="g[group_id][]" />1
       </label>
-      <label class="datagrid-enum-checkbox-label" for="g_group_id_2">
+      <label for="g_group_id_2">
         <input id="g_group_id_2" type="checkbox" value="2" name="g[group_id][]" />2
       </label>
     </div>

diff --git a/version-2/views.diff b/version-2/views.diff
@@ -11,7 +11,7 @@ index 9f48319..f225cc6 100644
  <%- id = [form.object_name, filter.name, value].join('_').underscore -%>
 -<%= form.label filter.name, options.merge(for: id) do -%>
 -<%= form.check_box(filter.name, {multiple: true, id: id, checked: checked, include_hidden: false}, value.to_s, nil) -%>
-+<%= form.datagrid_label(filter.name, **options, for: id, class: 'datagrid-enum-checkbox-label') do -%>
++<%= form.datagrid_label(filter.name, **options, for: id) do -%>
 +<%= form.datagrid_filter_input(filter.name, id: id, value: value) -%>
  <%= text -%>
  <%- end -%>