effective_datatables 4.17.3 → 4.18.0

data/app/assets/stylesheets/effective_datatables/_overrides.bootstrap4.scss

@@ -1,35 +1,85 @@
 // Override dataTables.bootstrap4.css defaults
 table.dataTable { border-collapse: collapse !important; }
 
-// Override default padding
-table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sorting_desc, table.dataTable thead > tr > th.sorting,
+// Override default hover effect
+table.dataTable.table-striped > tbody > tr.odd > *,
+table.dataTable.table-striped > tbody > tr.odd.selected > *,
+table.dataTable.table-hover > tbody > tr:hover > *,
+table.dataTable.table-hover > tbody > tr.selected:hover > * { 
+  box-shadow: unset; 
+}
+
+// Override default sorting
+table.dataTable thead > tr > th.sorting:before, 
+table.dataTable thead > tr > th.sorting_asc:before, 
+table.dataTable thead > tr > th.sorting_desc:before,
+table.dataTable thead > tr > th.sorting_asc_disabled:before,
+table.dataTable thead > tr > th.sorting_desc_disabled:before,
+table.dataTable thead > tr > td.sorting:before,
+table.dataTable thead > tr > td.sorting_asc:before,
+table.dataTable thead > tr > td.sorting_desc:before,
+table.dataTable thead > tr > td.sorting_asc_disabled:before,
+table.dataTable thead > tr > td.sorting_desc_disabled:before {
+  content: '';
+}
+
+table.dataTable thead > tr > th.sorting:after,
+table.dataTable thead > tr > th.sorting_asc:after,
+table.dataTable thead > tr > th.sorting_desc:after,
+table.dataTable thead > tr > th.sorting_asc_disabled:after,
+table.dataTable thead > tr > th.sorting_desc_disabled:after,
+table.dataTable thead > tr > td.sorting:after,
+table.dataTable thead > tr > td.sorting_asc:after,
+table.dataTable thead > tr > td.sorting_desc:after,
+table.dataTable thead > tr > td.sorting_asc_disabled:after,
+table.dataTable thead > tr > td.sorting_desc_disabled:after {
+  content: '';
+}
+
+table.dataTable thead > tr > th.sorting, table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sorting_desc, table.dataTable thead > tr > th.sorting_asc_disabled, table.dataTable thead > tr > th.sorting_desc_disabled,
+table.dataTable thead > tr > td.sorting,
 table.dataTable thead > tr > td.sorting_asc,
 table.dataTable thead > tr > td.sorting_desc,
-table.dataTable thead > tr > td.sorting { padding: 0.5em 0.5em 0.5em 0.5em; }
-
-// Override default sort icons
-table.dataTable thead .sorting:before,
-table.dataTable thead .sorting_asc:before,
-table.dataTable thead .sorting_desc:before,
-table.dataTable thead .sorting_asc_disabled:before,
-table.dataTable thead .sorting_desc_disabled:before,
-table.dataTable thead .sorting:after,
-table.dataTable thead .sorting_asc:after,
-table.dataTable thead .sorting_desc:after,
-table.dataTable thead .sorting_asc_disabled:after,
-table.dataTable thead .sorting_desc_disabled:after { content: ''; }
+table.dataTable thead > tr > td.sorting_asc_disabled,
+table.dataTable thead > tr > td.sorting_desc_disabled {
+  padding: 0.5em 0.5em 0.5em 0.5em;
+}
 
-table.dataTable > thead {
+table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) { padding-right: 0.5em; }
+table.dataTable thead > tr > th.sorting_disabled { padding-bottom: 8px; }
+
+table.dataTable > thead th {
+  background-repeat: no-repeat;
+  > span { padding-right: 1rem; }
+}
+
+table.dataTable > thead .sorting {
+  background-image: asset-data-url('dataTables/sort.svg');
+  background-position: right 0.25rem top 0.25rem;
+}
+
+table.dataTable > thead .sorting_asc {
+  background-image: asset-data-url('dataTables/sort-up.svg');
+  background-position: right 0.25rem top 0.25rem;
+}
+
+table.dataTable > thead .sorting_desc {
+  background-image: asset-data-url('dataTables/sort-down.svg');
+  background-position: right 0.25rem top 0.25rem;
+}
+
+// The New button
+table.dataTable thead {
   th.col-actions {
     text-align: right;
-
     span { display: block; height: 1.25em; }
   }
 }
 
+// Turbolinks destroy fix
 .dataTables_wrapper {
   table.dataTable {
-    tr.effective-datatables-inline-row { visibility: collapse; }  // Turbolinks destroy fix
+    tr.effective-datatables-inline-row { visibility: collapse; }
   }
 }
 
@@ -53,25 +103,17 @@ table.dataTable > thead {
   }
 }
 
-table.dataTable > thead th {
-  background-repeat: no-repeat;
-
-  > span { padding-right: 1rem; }
+table.dataTable.dtr-inline.collapsed > tbody > tr > td.dtr-control:before,
+table.dataTable.dtr-inline.collapsed > tbody > tr > th.dtr-control:before {
+  color: #0275d8;
 }
-
-table.dataTable > thead .sorting {
-  background-image: asset-data-url('dataTables/sort.svg');
-  background-position: right 0.25rem top 0.25rem;
+table.dataTable.dtr-inline.collapsed > tbody > tr > td.dtr-control.arrow-right::before,
+table.dataTable.dtr-inline.collapsed > tbody > tr > th.dtr-control.arrow-right::before {
+  color: #0275d8;
 }
-
-table.dataTable > thead .sorting_asc {
-  background-image: asset-data-url('dataTables/sort-up.svg');
-  background-position: right 0.25rem top 0.25rem;
-}
-
-table.dataTable > thead .sorting_desc {
-  background-image: asset-data-url('dataTables/sort-down.svg');
-  background-position: right 0.25rem top 0.25rem;
+table.dataTable.dtr-inline.collapsed > tbody > tr.parent > td.dtr-control:before,
+table.dataTable.dtr-inline.collapsed > tbody > tr.parent > th.dtr-control:before {
+  color: #0275d8;
 }
 
 // Collapsed Responsive View
@@ -90,6 +132,10 @@ table.dataTable > tbody > tr.child {
   }
 }
 
+table.dataTable.collapsed  {
+  th.col-bulk_actions:first-child { div { margin-left: 18px; } }
+}
+
 // Buttons
 .dataTables_buttons {
   text-align: right;
@@ -124,10 +170,6 @@ table.dataTable > thead {
   }
 }
 
-table.dataTable.collapsed  {
-  th.col-bulk_actions:first-child { div { margin-left: 18px; } }
-}
-
 // Processing div
 div.dataTables_wrapper div.dataTables_processing {
   margin: -26px 25% 0px 25%;

data/app/models/effective/datatable.rb

@@ -61,8 +61,14 @@ module Effective
 
     # Checks en.datatables.admin/my_datatable
     def self.datatable_name
-      value = I18n.t("datatables.#{name.underscore}").to_s
-      value.start_with?('translation missing:') ? name.titleize.split('/').last.chomp(' Datatable') : value
+      key = "datatables.#{name.underscore}"
+      value = ::I18n.t(key)
+
+      if value.include?(key) # missing translation
+        name.titleize.split('/').last.chomp(' Datatable')
+      else
+        value
+      end
     end
 
     def datatable_name

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.17.3'.freeze
+  VERSION = '4.18.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.17.3
+  version: 4.18.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,7 @@ files:
 - app/assets/images/dataTables/sort-down.svg
 - app/assets/images/dataTables/sort-up.svg
 - app/assets/images/dataTables/sort.svg
+- app/assets/javascripts/dataTables/UPGRADE.md
 - app/assets/javascripts/dataTables/buttons/buttons.bootstrap4.js
 - app/assets/javascripts/dataTables/buttons/buttons.colVis.js
 - app/assets/javascripts/dataTables/buttons/buttons.html5.js