effective_datatables 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f740fcfa8103e4a41cd19d78627e660ed8261d7
-  data.tar.gz: 2a38dab4e9bfd6532d6455abdda04f50d928680b
+  metadata.gz: a60414a14abdc45d87dbda78636a95a3e9a0b7e1
+  data.tar.gz: 5c97dbdd9932315966189a6702591e57406623cc
 SHA512:
-  metadata.gz: 28352978829362e667d377d03864e7cde3b9f4ce72230bd61d3c68aa97ba0f29f8ef49697171da41d84931fee1b4beea6229dd9f232e7276b49d82914f3579db
-  data.tar.gz: 255b54c6a2763303e7b9d423fa74cc846fe7fa771bd4292a4681e9b2bb90e70d4e1819bb937d88d0132cb92723f30791dcafab4dba6017bcb449e2e7f556aa03
+  metadata.gz: 5b47935fefc03832d781d6f92e37c4254c54db5b41cc1808f152f8c7668912f71c9afdb59b0a37877eb989628577c52f7caca977f4a090590005d86dd336f1c2
+  data.tar.gz: d77569664a318d3e60b23cbd6533b62ef0049f56e6f11dafef8e9b641bbb7d9c1fb0cde5767aba2739fcae6a3a21f73925d16b9e7d468e448cf987131659aee9

data/app/assets/javascripts/effective_datatables/filters.js.coffee

@@ -1,6 +1,6 @@
 $(document).on 'click', 'a[data-apply-datatable-filters]', (event) ->
   event.preventDefault()
-  $form = $(event.currentTarget).closest('.effective-datatable-filters')
+  $form = $(event.currentTarget).closest('.effective-datatables-filters')
   $table = $('#' + $form.attr('aria-controls'))
   $table.DataTable().draw()
 

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -49,9 +49,9 @@ initializeDataTables = ->
       deferLoading: [datatable.data('display-records'), datatable.data('total-records')]
       deferRender: true
       displayStart: datatable.data('display-start')
-      dom: "<'row'<'col-sm-4'l><'col-sm-8'B>><'row'<'col-sm-12'tr>><'row'<'col-sm-6'i><'col-sm-6'p>>"
+      dom: "<'row'<'col-sm-12'B>><'row'<'col-sm-12'tr>><'row'<'col-sm-2'l><'col-sm-4'i><'col-sm-6'p>>"
       iDisplayLength: datatable.data('display-length')
-      language: { 'lengthMenu': 'Show _MENU_ per page'}
+      language: { 'lengthMenu': '_MENU_ per page'}
       lengthMenu: [[10, 25, 50, 100, 250, 1000, 9999999], ['10', '25', '50', '100', '250', '1000', 'All']]
       order: datatable.data('display-order')
       processing: true
@@ -61,7 +61,7 @@ initializeDataTables = ->
         api.columns().flatten().each (index) => params['columns'][index]['visible'] = api.column(index).visible()
 
         $table = $(api.table().node())
-        $form = $(".effective-datatable-filters[aria-controls='#{$table.attr('id')}']").first()
+        $form = $(".effective-datatables-filters[aria-controls='#{$table.attr('id')}']").first()
 
         params['cookie'] = $table.data('cookie')
 

data/app/assets/stylesheets/effective_datatables/_filters.scss

@@ -0,0 +1,6 @@
+.effective-datatables-filters { margin-bottom: 10px; }
+.effective-datatables-filters-scopes { display: inline-block; margin-right: 10px; }
+.effective-datatables-filters-inputs { display: inline-block; }
+.effective-datatables-filters-inputs .form-group { margin-right: 10px; }
+.effective-datatables-filters-inputs .control-label { margin-right: 3px; }
+.effective-datatables-filters-btn { display: inline-block; }

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

@@ -64,7 +64,6 @@ div.dataTables_wrapper div.dataTables_processing {
   margin-bottom: 4px;
   color: #909090;
   font-size: 12px;
-  padding-left: 6px;
 }
 
 // Buttons
@@ -136,7 +135,7 @@ ul.dt-button-collection {
 div.dataTables_wrapper div.dataTables_info {
   color: #909090;
   font-size: 12px;
-  padding: 10px 0px 0px 6px;
+  padding: 5px 0px 0px 6px;
 }
 
 // Collapsed responsive view

data/app/views/effective/datatables/_filters.html.haml

@@ -1,22 +1,27 @@
-.effective-datatable-filters{'aria-controls': datatable.to_param}
+.effective-datatables-filters{'aria-controls': datatable.to_param}
   = simple_form_for :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], html: { class: 'form-inline' } do |form|
 
     - if datatable._scopes.present?
-      .btn-toolbar
+      .effective-datatables-filters-scopes
         = form.input :scope, label: false, required: false, checked: datatable.state[:scope],
           as: (defined?(EffectiveFormInputs) ? :effective_radio_buttons : :radio_buttons),
           collection: datatable._scopes.map { |name, opts| [opts[:label], name] },
-          buttons: true
+          buttons: true,
+          wrapper_html: {class: 'btn-group-sm'}
 
-      - datatable._filters.each do |name, opts|
-        = form.input name, label: opts[:label], required: false, value: datatable.state[:filter][name],
-          as: opts[:as],
-          collection: opts[:input_html].delete(:collection),
-          multiple: opts[:input_html].delete(:multiple),
-          input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html])
+    - if datatable._filters.present?
+      .effective-datatables-filters-inputs
+        - datatable._filters.each do |name, opts|
+          = form.input name, label: opts[:label], required: false, value: datatable.state[:filter][name],
+            as: opts[:as],
+            collection: opts[:input_html].delete(:collection),
+            multiple: opts[:input_html].delete(:multiple),
+            input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html]),
+            wrapper_html: {class: 'form-group-sm'}
 
-      .btn-group
+    - if datatable._scopes.present? || datatable._filters.present?
+      .effective-datatables-filters-btn
         - if datatable._filters_form_required?
           = form.button :submit, 'Apply', 'data-disable-with': 'Applying...'
         - else
-          = link_to 'Apply', '#', class: 'btn btn-primary btn-effective-datatable-filters', 'data-apply-datatable-filters': true
+          = link_to 'Apply', '#', class: 'btn btn-primary btn-sm btn-effective-datatables-filters', 'data-apply-datatable-filters': true

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.2.5'.freeze
+  VERSION = '3.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails