Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix datatables properly #668

Merged
merged 4 commits into from
Jan 30, 2024
Merged

Fix datatables properly #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
436ace9
use own datatables
recursivetree Jan 30, 2024
1316a53
remove old datatables stuff
recursivetree Jan 30, 2024
cf53c32
update comment
recursivetree Jan 30, 2024
610d270
remove loads of removed files
recursivetree Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
"ext-gd": "*",
"almasaeed2010/adminlte": "^3.0",
"components/font-awesome": "^5.9",
"datatables.net/datatables.net-bs4": "dev-master",
"datatables.net/datatables.net-buttons-bs4": "dev-master",
"doctrine/dbal": "^3.0",
"erusev/parsedown": "^1.7",
"eveseat/eseye": "^3.0",
Expand Down
9 changes: 2 additions & 7 deletions src/WebServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,8 @@ private function add_publications()
base_path('vendor/twbs/bootstrap/dist/css/bootstrap.min.css') => public_path('web/css/bootstrap.min.css'),
base_path('vendor/almasaeed2010/adminlte/plugins/bootstrap/js/bootstrap.bundle.min.js') => public_path('web/js/bootstrap.bundle.min.js'),

// Datatables pulled from packagist
__DIR__ . '/resources/js/datatables.min.js' => public_path('web/js/jquery.dataTables.min.js'), // use own file until they sort out packagist
base_path('vendor/datatables.net/datatables.net-bs4/css/dataTables.bootstrap4.min.css') => public_path('web/css/dataTables.bootstrap4.min.css'),
base_path('vendor/datatables.net/datatables.net-bs4/js/dataTables.bootstrap4.min.js') => public_path('web/js/dataTables.bootstrap4.min.js'),
base_path('vendor/datatables.net/datatables.net-buttons/js/dataTables.buttons.min.js') => public_path('web/js/dataTables.buttons.min.js'),
base_path('vendor/datatables.net/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css') => public_path('web/css/buttons.bootstrap4.min.css'),
base_path('vendor/datatables.net/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js') => public_path('web/js/buttons.bootstrap4.min.js'),
// Datatables from https://datatables.net/download/. plugins: bootstrap 4, buttons and row groups
__DIR__ . '/resources/js/datatables.min.js' => public_path('web/js/dataTables.min.js'), // use own file until they sort out packagist

// AdminLTE pulled from packagist
base_path('vendor/almasaeed2010/adminlte/dist/css/adminlte.min.css') => public_path('web/css/adminlte.min.css'),
Expand Down
21 changes: 21 additions & 0 deletions src/resources/css/datatables.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading