diff --git a/Gruntfile.js b/Gruntfile.js index 1dea50cd8f84ee3343bd992345b17c0c9980bd7d..d9377d8f8ead2663205d5599bcc9d9e5cd2795a6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -219,59 +219,9 @@ module.exports = function(grunt) { cwd: 'node_modules/jquery/dist/', src: './jquery.min.js', dest: '<%= project_paths.web_static_dir %>vendor/jquery/js/' - }, - // ----- DataTables.net - { - expand: true, - flatten: true, - cwd: 'node_modules/datatables.net/js/', - src: './*.js', - dest: '<%= project_paths.web_static_dir %>vendor/datatables/js/' - }, - { - expand: true, - flatten: true, - cwd: 'node_modules/datatables.net-plugins/', - src: [ - './integration/bootstrap/3/dataTables.bootstrap*.js' - ], - dest: '<%= project_paths.web_static_dir %>vendor/datatables/js/' - }, - { - expand: true, - flatten: true, - cwd: 'node_modules/datatables.net-plugins/', - src: [ - './integration/bootstrap/3/dataTables.bootstrap.css', - './integration/font-awesome/dataTables.fontAwesome.css' - ], - dest: '<%= project_paths.web_static_dir %>vendor/datatables/css/' - }, - { - expand: true, - flatten: true, - cwd: 'node_modules/datatables.net-plugins/i18n/', - src: [ - './*.lang' - ], - dest: '<%= project_paths.web_static_dir %>vendor/datatables/i18n/' - }, + } ] } - }, - - // --------------------------------------------------------------------- - // Strip comments from source files - comments: { - // Strip comments from datatables localization files, otherwise they - // are not valid JSON files and table localization does not work. - dti18n: { - options: { - singleline: true, - multiline: true - }, - src: [ '<%= project_paths.web_static_dir %>vendor/datatables/i18n/*.lang'] - }, } }); diff --git a/lib/hawat/__init__.py b/lib/hawat/__init__.py index aaa46915f558293bd366544a30e4da946336f4fa..7e1d9dceb212e697d1bb247824b1b0dbd6333b23 100644 --- a/lib/hawat/__init__.py +++ b/lib/hawat/__init__.py @@ -47,7 +47,6 @@ and with the use of following Python3 key libraries: The application frontend is built on top of following key libraries: * `jQuery <http://jquery.com/>`__ - * `DataTables <https://datatables.net/>`__ * `bootstrap3 <https://getbootstrap.com/docs/3.3/>`__ * bootstrap-select * `font-awesome <http://fontawesome.io/>`__ diff --git a/lib/hawat/static/css/hawat.css b/lib/hawat/static/css/hawat.css index 1a456cc8d65c606834358ef1abaa140398b2291f..0f0252296fcab1987bd71c3b45b4f0b7a0466822 100644 --- a/lib/hawat/static/css/hawat.css +++ b/lib/hawat/static/css/hawat.css @@ -120,13 +120,6 @@ body { padding-left: 1em !important; } -/* - * Fix for wrong indentation of search field in datatables. - * */ -#DataTables_Table_0_filter { - text-align: right; -} - /* * Implement hover functionality for list group items. * */ diff --git a/package.json b/package.json index 8f21e53e5df75450caba0d7623f85e71929e0924..2450f6ab38dcfcd4b911c79ff35ca304966dd36a 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,6 @@ "cldr-segments-modern": "^34.0.0", "cldr-units-modern": "^34.0.0", "d3": "3.5.17", - "datatables.net": "^1.10.16", - "datatables.net-plugins": "^1.10.15", "eonasdan-bootstrap-datetimepicker": "^4.17.47", "globalize": "^1.4.0", "iana-tz-data": "^2018.5.0", diff --git a/yarn.lock b/yarn.lock index a2cd2edb8b4cc67498adf72c6c0ab9571c684155..80d7cd873069b60185d1122c13812281a142065c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,11 +55,6 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-regex@*: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -633,18 +628,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -datatables.net-plugins@^1.10.15: - version "1.10.20" - resolved "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz#c89f6bed3fa7e6605cbeaa35d60f223659e84c8c" - integrity sha512-rnhNmRHe9UEzvM7gtjBay1QodkWUmxLUhHNbmJMYhhUggjtm+BRSlE0PRilkeUkwckpNWzq+0fPd7/i0fpQgzA== - -datatables.net@^1.10.16: - version "1.10.20" - resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.20.tgz#9d65ecc3c83cbe7baa4fa5a053405c8fe42c1350" - integrity sha512-4E4S7tTU607N3h0fZPkGmAtr9mwy462u+VJ6gxYZ8MxcRIjZqHy3Dv1GNry7i3zQCktTdWbULVKBbkAJkuHEnQ== - dependencies: - jquery ">=1.7" - date-time@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/date-time/-/date-time-1.1.0.tgz#18876d0bda4c19fe70dd3bf4b034f281b12a40b6" @@ -1554,7 +1537,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -1757,7 +1740,7 @@ isstream@0.1.x, isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -jquery@>=1.7, "jquery@>=1.7.1 <4.0.0", "jquery@^1.8.3 || ^2.0 || ^3.0", jquery@^3.3.1: +"jquery@>=1.7.1 <4.0.0", "jquery@^1.8.3 || ^2.0 || ^3.0", jquery@^3.3.1: version "3.4.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==