From a76bed05bdd49113bac6254a668ed6d5c8229a15 Mon Sep 17 00:00:00 2001 From: Mike Cantelon Date: Sat, 11 Jan 2025 16:42:10 -0800 Subject: [PATCH] Update to Bootstrap 5 --- AIPscan/Reporter/templates/aips.html | 2 +- AIPscan/static/css/custom.css | 7 ++++ AIPscan/templates/partials/navbar.html | 26 +++++++------- .../entry/chart_formats_count.entry.js | 1 - build_config/entry/shared/base_shared.js | 1 - package-lock.json | 34 +++++++++---------- package.json | 2 +- 7 files changed, 39 insertions(+), 34 deletions(-) diff --git a/AIPscan/Reporter/templates/aips.html b/AIPscan/Reporter/templates/aips.html index 5cce1f7b..85a1a91f 100644 --- a/AIPscan/Reporter/templates/aips.html +++ b/AIPscan/Reporter/templates/aips.html @@ -10,7 +10,7 @@ {% if storage_services %} -
+
Search
diff --git a/AIPscan/static/css/custom.css b/AIPscan/static/css/custom.css index 6570f19c..b7839c06 100755 --- a/AIPscan/static/css/custom.css +++ b/AIPscan/static/css/custom.css @@ -56,3 +56,10 @@ body { .table-header { background-color: #ccc !important; } + +/* Use Bootstrap 4 look of button */ +.btn-info { + color: #fff; + background-color: #17a2b8; + border-color: #17a2b8; +} diff --git a/AIPscan/templates/partials/navbar.html b/AIPscan/templates/partials/navbar.html index 74670416..c9b8b788 100644 --- a/AIPscan/templates/partials/navbar.html +++ b/AIPscan/templates/partials/navbar.html @@ -1,18 +1,20 @@
- Crawl Archivematica AIPs to provide repository-wide reporting diff --git a/build_config/entry/chart_formats_count.entry.js b/build_config/entry/chart_formats_count.entry.js index c6cb5e47..ac75532d 100644 --- a/build_config/entry/chart_formats_count.entry.js +++ b/build_config/entry/chart_formats_count.entry.js @@ -6,7 +6,6 @@ window.$ = $; window.jQuery = $; import bootstrap from "bootstrap"; -window.bootstrap = bootstrap; import Chart from "chart.js/auto"; window.Chart = Chart; diff --git a/build_config/entry/shared/base_shared.js b/build_config/entry/shared/base_shared.js index a53c2a07..c94e17c1 100644 --- a/build_config/entry/shared/base_shared.js +++ b/build_config/entry/shared/base_shared.js @@ -8,6 +8,5 @@ import "jquery-ui-dist/jquery-ui.min.js"; window.$ = window.jQuery = $; import bootstrap from "bootstrap"; -window.bootstrap = bootstrap; import "/AIPscan/static/css/custom.css"; diff --git a/package-lock.json b/package-lock.json index 36f7b921..1026025d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "devDependencies": { "@fortawesome/fontawesome-free": "^5.15.4", "@rollup/plugin-inject": "^5.0.5", - "bootstrap": "^4.6.2", + "bootstrap": "^5.3.3", "chart.js": "^4.4.1", "jquery": "^3.7.1", "jquery-ui-dist": "^1.13.2", @@ -470,6 +470,17 @@ "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "dev": true, + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@rollup/plugin-inject": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz", @@ -754,9 +765,9 @@ } }, "node_modules/bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "dev": true, "funding": [ { @@ -769,8 +780,7 @@ } ], "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.11.8" } }, "node_modules/buffer-from": { @@ -928,18 +938,6 @@ "integrity": "sha512-0ANRbzVXbi4H01njmpOSPSUoo6NVTZC/gJJhn4J2lUx6Woc5j1Fye3A0+VwXYV2+UxCEU7WTkyaI2y8l4bCu4A==", "dev": true }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "dev": true, - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.47", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", diff --git a/package.json b/package.json index 4bacad81..0bc5b09c 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "devDependencies": { "@fortawesome/fontawesome-free": "^5.15.4", "@rollup/plugin-inject": "^5.0.5", - "bootstrap": "^4.6.2", + "bootstrap": "^5.3.3", "chart.js": "^4.4.1", "jquery": "^3.7.1", "jquery-ui-dist": "^1.13.2",