diff --git a/Rakefile b/Rakefile index 20d12e2..3dfa230 100755 --- a/Rakefile +++ b/Rakefile @@ -5,7 +5,7 @@ task :fix_css do Dir.glob(File.join("app/assets/stylesheets/dataTables", "*.scss")).each do |filename| content = File.read(filename) content.gsub!(/url\('\.\.\/images\/([A-Za-z0-9_]*\.png)'\)/) do - "image-url('dataTables/#{$1}')" + "image_url('dataTables/#{$1}')" end File.open(filename, 'w') { |f| f << content } end diff --git a/Readme.md b/Readme.md index b2ac9af..96b9aac 100755 --- a/Readme.md +++ b/Readme.md @@ -146,7 +146,7 @@ This will add to the corresponding asset files ## Responsive Installation -1 - Complete steps 1-3 of the General Installation. +1 - Complete steps 1-2 of the General Installation. 2 - Run the install generator: ```bash diff --git a/app/assets/images/dataTables/sort_asc.png b/app/assets/images/dataTables/sort_asc.png old mode 100644 new mode 100755 index a88d797..e1ba61a Binary files a/app/assets/images/dataTables/sort_asc.png and b/app/assets/images/dataTables/sort_asc.png differ diff --git a/app/assets/images/dataTables/sort_asc_disabled.png b/app/assets/images/dataTables/sort_asc_disabled.png old mode 100644 new mode 100755 index dcd7b7b..fb11dfe Binary files a/app/assets/images/dataTables/sort_asc_disabled.png and b/app/assets/images/dataTables/sort_asc_disabled.png differ diff --git a/app/assets/images/dataTables/sort_both.png b/app/assets/images/dataTables/sort_both.png old mode 100644 new mode 100755 index 1867040..af5bc7c Binary files a/app/assets/images/dataTables/sort_both.png and b/app/assets/images/dataTables/sort_both.png differ diff --git a/app/assets/images/dataTables/sort_desc.png b/app/assets/images/dataTables/sort_desc.png old mode 100644 new mode 100755 index def071e..0e156de Binary files a/app/assets/images/dataTables/sort_desc.png and b/app/assets/images/dataTables/sort_desc.png differ diff --git a/app/assets/images/dataTables/sort_desc_disabled.png b/app/assets/images/dataTables/sort_desc_disabled.png old mode 100644 new mode 100755 index 7824973..c9fdd8a Binary files a/app/assets/images/dataTables/sort_desc_disabled.png and b/app/assets/images/dataTables/sort_desc_disabled.png differ diff --git a/app/assets/javascripts/dataTables/bootstrap/3/jquery.dataTables.bootstrap.js b/app/assets/javascripts/dataTables/bootstrap/3/dataTables.bootstrap.js similarity index 100% rename from app/assets/javascripts/dataTables/bootstrap/3/jquery.dataTables.bootstrap.js rename to app/assets/javascripts/dataTables/bootstrap/3/dataTables.bootstrap.js diff --git a/app/assets/javascripts/dataTables/extras/bootstrap/autoFill.bootstrap.js b/app/assets/javascripts/dataTables/extras/bootstrap/autoFill.bootstrap.js new file mode 100755 index 0000000..48e4d49 --- /dev/null +++ b/app/assets/javascripts/dataTables/extras/bootstrap/autoFill.bootstrap.js @@ -0,0 +1,43 @@ +/*! Bootstrap integration for DataTables' AutoFill + * ©2015 SpryMedia Ltd - datatables.net/license + */ + +(function( factory ){ + if ( typeof define === 'function' && define.amd ) { + // AMD + define( ['jquery', 'datatables.net-bs', 'datatables.net-autofill'], function ( $ ) { + return factory( $, window, document ); + } ); + } + else if ( typeof exports === 'object' ) { + // CommonJS + module.exports = function (root, $) { + if ( ! root ) { + root = window; + } + + if ( ! $ || ! $.fn.dataTable ) { + $ = require('datatables.net-bs')(root, $).$; + } + + if ( ! $.fn.dataTable.AutoFill ) { + require('datatables.net-autofill')(root, $); + } + + return factory( $, root, root.document ); + }; + } + else { + // Browser + factory( jQuery, window, document ); + } +}(function( $, window, document, undefined ) { +'use strict'; +var DataTable = $.fn.dataTable; + + +DataTable.AutoFill.classes.btn = 'btn btn-primary'; + + +return DataTable; +})); \ No newline at end of file diff --git a/app/assets/javascripts/dataTables/extras/bootstrap/buttons.bootstrap.js b/app/assets/javascripts/dataTables/extras/bootstrap/buttons.bootstrap.js new file mode 100755 index 0000000..0dc7b5b --- /dev/null +++ b/app/assets/javascripts/dataTables/extras/bootstrap/buttons.bootstrap.js @@ -0,0 +1,68 @@ +/*! Bootstrap integration for DataTables' Buttons + * ©2016 SpryMedia Ltd - datatables.net/license + */ + +(function( factory ){ + if ( typeof define === 'function' && define.amd ) { + // AMD + define( ['jquery', 'datatables.net-bs', 'datatables.net-buttons'], function ( $ ) { + return factory( $, window, document ); + } ); + } + else if ( typeof exports === 'object' ) { + // CommonJS + module.exports = function (root, $) { + if ( ! root ) { + root = window; + } + + if ( ! $ || ! $.fn.dataTable ) { + $ = require('datatables.net-bs')(root, $).$; + } + + if ( ! $.fn.dataTable.Buttons ) { + require('datatables.net-buttons')(root, $); + } + + return factory( $, root, root.document ); + }; + } + else { + // Browser + factory( jQuery, window, document ); + } +}(function( $, window, document, undefined ) { +'use strict'; +var DataTable = $.fn.dataTable; + + +$.extend( true, DataTable.Buttons.defaults, { + dom: { + container: { + className: 'dt-buttons btn-group' + }, + button: { + className: 'btn btn-default' + }, + collection: { + tag: 'ul', + className: 'dt-button-collection dropdown-menu', + button: { + tag: 'li', + className: 'dt-button' + }, + buttonLiner: { + tag: 'a', + className: '' + } + } + } +} ); + +DataTable.ext.buttons.collection.text = function ( dt ) { + return dt.i18n('buttons.collection', 'Collection '); +}; + + +return DataTable.Buttons; +})); diff --git a/app/assets/javascripts/dataTables/extras/bootstrap/responsive.bootstrap.js b/app/assets/javascripts/dataTables/extras/bootstrap/responsive.bootstrap.js new file mode 100755 index 0000000..9eed7f5 --- /dev/null +++ b/app/assets/javascripts/dataTables/extras/bootstrap/responsive.bootstrap.js @@ -0,0 +1,81 @@ +/*! Bootstrap integration for DataTables' Responsive + * ©2015-2016 SpryMedia Ltd - datatables.net/license + */ + +(function( factory ){ + if ( typeof define === 'function' && define.amd ) { + // AMD + define( ['jquery', 'datatables.net-bs', 'datatables.net-responsive'], function ( $ ) { + return factory( $, window, document ); + } ); + } + else if ( typeof exports === 'object' ) { + // CommonJS + module.exports = function (root, $) { + if ( ! root ) { + root = window; + } + + if ( ! $ || ! $.fn.dataTable ) { + $ = require('datatables.net-bs')(root, $).$; + } + + if ( ! $.fn.dataTable.Responsive ) { + require('datatables.net-responsive')(root, $); + } + + return factory( $, root, root.document ); + }; + } + else { + // Browser + factory( jQuery, window, document ); + } +}(function( $, window, document, undefined ) { +'use strict'; +var DataTable = $.fn.dataTable; + + +var _display = DataTable.Responsive.display; +var _original = _display.modal; +var _modal = $( + '