diff --git a/composer.json b/composer.json index 923404ad7d..b3f84f4d2f 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,6 @@ "asika/simple-console": "^1.0", "bacon/bacon-qr-code": "^2.0.0", "bower-asset/base64": "^1.0", - "bower-asset/chart-js": "^2.8", "bower-asset/dompurify": "^1.0", "bower-asset/fork-awesome": "^1.1", "divineomega/password_exposed": "^3", @@ -50,6 +49,7 @@ "minishlink/web-push": "^6.0", "mobiledetect/mobiledetectlib": "^3.74", "nikic/fast-route": "^1.3", + "npm-asset/chart.js": "^2.8", "npm-asset/cropperjs": "1.2.2", "npm-asset/es-jquery-sortable": "^0.9.13", "npm-asset/fullcalendar": "^3.10", diff --git a/composer.lock b/composer.lock index 6f13b5cdea..84a4dc99cc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "532a759e2f293bbf8f928babff06548a", + "content-hash": "54311f4bed63e279077593d1b357f292", "packages": [ { "name": "asika/simple-console", @@ -107,24 +107,6 @@ "WTFPL" ] }, - { - "name": "bower-asset/chart-js", - "version": "v2.9.4", - "source": { - "type": "git", - "url": "https://github.com/chartjs/Chart.js.git", - "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/9bd4cf82fda9f50a5fb50b72843e06ab88124278", - "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278" - }, - "type": "bower-asset", - "license": [ - "MIT" - ] - }, { "name": "bower-asset/dompurify", "version": "1.0.11", @@ -1810,6 +1792,80 @@ ], "time": "2018-02-13T20:26:39+00:00" }, + { + "name": "npm-asset/chart.js", + "version": "2.9.4", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz" + }, + "require": { + "npm-asset/chartjs-color": ">=2.1.0,<3.0.0", + "npm-asset/moment": ">=2.10.2,<3.0.0" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, + { + "name": "npm-asset/chartjs-color", + "version": "2.4.1", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz" + }, + "require": { + "npm-asset/chartjs-color-string": ">=0.6.0,<0.7.0", + "npm-asset/color-convert": ">=1.9.3,<2.0.0" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, + { + "name": "npm-asset/chartjs-color-string", + "version": "0.6.0", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz" + }, + "require": { + "npm-asset/color-name": ">=1.0.0,<2.0.0" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, + { + "name": "npm-asset/color-convert", + "version": "1.9.3", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" + }, + "require": { + "npm-asset/color-name": "1.1.3" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, + { + "name": "npm-asset/color-name", + "version": "1.1.3", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, { "name": "npm-asset/cropperjs", "version": "1.2.2", diff --git a/view/templates/admin/federation.tpl b/view/templates/admin/federation.tpl index 98a4435a39..55d975b2f1 100644 --- a/view/templates/admin/federation.tpl +++ b/view/templates/admin/federation.tpl @@ -4,7 +4,7 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - +

{{$title}} - {{$page}}