From dd9d37b77e114ea70919483579487b8a4ade668b Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:35:38 +0100 Subject: [PATCH] upgrade `bootstrap` from `v4` to `v5` --- CHANGELOG.md | 1 + ui/angular.json | 6 - ui/package-lock.json | 55 +++------ ui/package.json | 8 +- .../accessory-info.component.html | 36 +++--- .../airpurifier.manage.component.html | 6 +- .../types/door/door.manage.component.html | 6 +- .../types/fan/fan.manage.component.html | 6 +- .../types/fanv2/fanv2.manage.component.html | 6 +- .../heatercooler.manage.component.html | 6 +- ...midifierdehumidifier.manage.component.html | 6 +- .../lightbulb/lightbulb.manage.component.html | 6 +- .../securitysystem.manage.component.html | 6 +- .../speaker/speaker.manage.component.html | 6 +- .../thermostat.manage.component.html | 6 +- .../types/valve/valve.manage.component.html | 8 +- .../types/window/window.manage.component.html | 6 +- .../windowcovering.manage.component.html | 6 +- .../components/confirm/confirm.component.html | 14 +-- .../information/information.component.html | 14 +-- .../restart-child-bridges.component.html | 13 +-- .../restart-homebridge.component.html | 11 +- .../schema-form/schema-form.component.html | 4 +- ui/src/app/core/core.module.ts | 4 +- ui/src/app/core/directives/rtl.directive.ts | 4 +- .../custom-plugins.component.html | 22 ++-- .../custom-plugins/custom-plugins.module.ts | 4 +- .../homebridge-deconz.component.html | 2 +- ...homebridge-google-smarthome.component.html | 12 +- .../homebridge-hue.component.html | 2 +- .../donate/donate.component.html | 13 +-- .../manage-plugin.component.html | 13 +-- .../manage-version.component.html | 28 +++-- .../manual-config.component.html | 19 ++- .../plugin-bridge.component.html | 44 ++++--- .../plugin-compatibility.component.html | 22 ++-- .../plugin-config.component.html | 28 +++-- .../plugin-logs/plugin-logs.component.html | 12 +- .../reset-accessories.component.html | 14 +-- .../uninstall-plugin.component.html | 16 ++- .../accessories/accessories.component.html | 6 +- .../accessories/accessories.component.scss | 4 +- .../add-room/add-room.component.html | 14 +-- .../config-editor.component.html | 8 +- .../config.restore.component.html | 14 +-- ui/src/app/modules/logs/logs.component.html | 4 +- .../startup-script.component.html | 4 +- .../disable-plugin.component.html | 18 ++- .../plugin-card/plugin-card.component.html | 36 +++--- .../plugin-info/plugin-info.component.html | 14 +-- .../modules/restart/restart.component.html | 2 +- .../settings/backup/backup.component.html | 16 ++- .../remove-all-accessories.component.html | 20 ++-- .../remove-bridge-accessories.component.html | 14 +-- .../remove-single-accessory.component.html | 16 ++- .../settings/restore/restore.component.html | 31 ++--- .../select-network-interfaces.component.html | 16 ++- .../modules/settings/settings.component.html | 110 +++++++++--------- .../unpair-all-bridges.component.html | 17 ++- .../unpair-single-bridge.component.html | 14 +-- .../setup-wizard/setup-wizard.component.html | 13 +-- .../setup-wizard/setup-wizard.component.scss | 4 +- .../status/credits/credits.component.html | 13 +-- .../app/modules/status/status.component.html | 4 +- .../widgets-add/widgets-add.component.html | 14 +-- .../widgets-control.component.html | 40 +++---- .../child-bridge-widget.component.html | 6 +- .../homebridge-status-widget.component.html | 2 +- .../modules/support/support.component.html | 36 +++--- .../users-2fa-disable.component.html | 13 +-- .../users-2fa-enable.component.html | 14 +-- .../users/users-add/users-add.component.html | 15 ++- .../users-edit/users-edit.component.html | 15 ++- ui/src/app/modules/users/users.component.html | 2 +- .../layout/sidebar/sidebar.component.html | 4 +- ui/src/scss/base/buttons.scss | 14 +-- ui/src/scss/base/form.scss | 2 +- ui/src/scss/base/layout.scss | 50 ++++++++ ui/src/scss/styles.scss | 1 - ui/src/scss/themes/themes-dark.scss | 14 ++- 80 files changed, 544 insertions(+), 611 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d70d6dc2..f0a94190b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to `homebridge-config-ui-x` will be documented in this file. - retire old use of `pnpm` and code references - update `@homebridge/hap-client` to v2 +- upgrade `bootstrap` from `v4` to `v5` ### Homebridge Dependencies diff --git a/ui/angular.json b/ui/angular.json index 509e699d1..eb2f8dbd2 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -28,12 +28,6 @@ "styles": [ "src/scss/styles.scss" ], - "scripts": [ - "node_modules/jquery/dist/jquery.min.js", - "node_modules/popper.js/dist/umd/popper.min.js", - "node_modules/mdbootstrap/js/bootstrap.min.js", - "node_modules/mdbootstrap/js/mdb.js" - ], "allowedCommonJsDependencies": [ "@/app/modules/status/status.component", "ajv", diff --git a/ui/package-lock.json b/ui/package-lock.json index 96b683542..430054c61 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -22,13 +22,13 @@ "@auth0/angular-jwt": "5.2.0", "@homebridge/hap-client": "2.0.2", "@homebridge/plugin-ui-utils": "1.0.3", - "@ng-bootstrap/ng-bootstrap": "11.0.1", + "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "15.0.0", "@popperjs/core": "2.11.8", - "@zajsf/bootstrap4": "17.2.4", + "@zajsf/bootstrap5": "17.2.4", "@zajsf/core": "17.2.4", "angular-gridster2": "18.0.1", - "bootstrap": "4.6.2", + "bootstrap": "5.3.3", "chart.js": "4.4.4", "dayjs": "1.11.13", "emoji-js": "3.8.0", @@ -36,7 +36,6 @@ "jquery": "3.7.1", "json5": "2.2.3", "lodash-es": "4.17.21", - "mdbootstrap": "4.20.0", "mobile-detect": "1.4.5", "ng-inline-svg-2": "15.0.1", "ng2-charts": "4.1.1", @@ -45,7 +44,6 @@ "ngx-md": "14.0.9", "ngx-monaco-editor": "12.0.0", "ngx-toastr": "19.0.0", - "popper.js": "1.16.1", "qrcode": "1.5.4", "rxjs": "7.8.1", "semver": "7.6.3", @@ -3639,18 +3637,19 @@ ] }, "node_modules/@ng-bootstrap/ng-bootstrap": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.1.tgz", - "integrity": "sha512-xpXpW2x2S9ZQhEu5kCmEAFf8WvkVD+rcKb1NLQiLuiZgAQR7GXVexXy5Y+RIvTjAQmPEVyxaSgYiJA6sWNJLNw==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-17.0.1.tgz", + "integrity": "sha512-utbm8OXIoqVVYGVzQkOS773ymbjc+UMkXv8lyi7hTqLhCQs0rZ0yA74peqVZRuOGXLHgcSTA7fnJhA80iQOblw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^13.0.0", - "@angular/core": "^13.0.0", - "@angular/forms": "^13.0.0", - "@angular/localize": "^13.0.0", + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0", + "@angular/forms": "^18.0.0", + "@angular/localize": "^18.0.0", + "@popperjs/core": "^2.11.8", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -4824,10 +4823,10 @@ "dev": true, "license": "BSD-2-Clause" }, - "node_modules/@zajsf/bootstrap4": { + "node_modules/@zajsf/bootstrap5": { "version": "17.2.4", - "resolved": "https://registry.npmjs.org/@zajsf/bootstrap4/-/bootstrap4-17.2.4.tgz", - "integrity": "sha512-2YJL/y1QALROGJnL2wnbLkh0eG+3giQyJK5Tw28pRLyKankliGfDNjqQEEkD2dMCHHvfk5VrqHloJGhe9CO3Rg==", + "resolved": "https://registry.npmjs.org/@zajsf/bootstrap5/-/bootstrap5-17.2.4.tgz", + "integrity": "sha512-lVFS+kyh+6XOiHmJjyxMuUoMVBdnRubq3B4c9klbxVvOBlku5XP6anaFmG/9YdJYCQtOwNFsvIue1k++aG+Tbw==", "license": "MIT", "dependencies": { "@zajsf/core": "~17.2.4", @@ -5435,9 +5434,9 @@ "license": "ISC" }, "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==", "funding": [ { "type": "github", @@ -5450,8 +5449,7 @@ ], "license": "MIT", "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { @@ -9248,12 +9246,6 @@ "node": ">= 12" } }, - "node_modules/mdbootstrap": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/mdbootstrap/-/mdbootstrap-4.20.0.tgz", - "integrity": "sha512-eIxaYsvHct2BKqkJWphh6j7nFQXHh9NjbbN7a+dctfrVsKaydNW5XpKIxmq2tDSb9+XYGm9hK7hMTlHgeV6wdw==", - "license": "MIT" - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -10979,17 +10971,6 @@ "node": ">=10.13.0" } }, - "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", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.41", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", diff --git a/ui/package.json b/ui/package.json index 29eaf691d..136b3aca4 100644 --- a/ui/package.json +++ b/ui/package.json @@ -23,13 +23,13 @@ "@auth0/angular-jwt": "5.2.0", "@homebridge/hap-client": "2.0.2", "@homebridge/plugin-ui-utils": "1.0.3", - "@ng-bootstrap/ng-bootstrap": "11.0.1", + "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "15.0.0", "@popperjs/core": "2.11.8", - "@zajsf/bootstrap4": "17.2.4", + "@zajsf/bootstrap5": "17.2.4", "@zajsf/core": "17.2.4", "angular-gridster2": "18.0.1", - "bootstrap": "4.6.2", + "bootstrap": "5.3.3", "chart.js": "4.4.4", "dayjs": "1.11.13", "emoji-js": "3.8.0", @@ -37,7 +37,6 @@ "jquery": "3.7.1", "json5": "2.2.3", "lodash-es": "4.17.21", - "mdbootstrap": "4.20.0", "mobile-detect": "1.4.5", "ng-inline-svg-2": "15.0.1", "ng2-charts": "4.1.1", @@ -46,7 +45,6 @@ "ngx-md": "14.0.9", "ngx-monaco-editor": "12.0.0", "ngx-toastr": "19.0.0", - "popper.js": "1.16.1", "qrcode": "1.5.4", "rxjs": "7.8.1", "semver": "7.6.3", diff --git a/ui/src/app/core/accessories/accessory-info/accessory-info.component.html b/ui/src/app/core/accessories/accessory-info/accessory-info.component.html index 80b6cce7d..659143b74 100644 --- a/ui/src/app/core/accessories/accessory-info/accessory-info.component.html +++ b/ui/src/app/core/accessories/accessory-info/accessory-info.component.html @@ -1,10 +1,8 @@
{{ service.customName || service.serviceName }}
- +
@@ -15,18 +13,18 @@
{{ service.customName || service.serviceName }}
-
+
- +
-
+
- +
@@ -34,11 +32,11 @@
{{ service.customName || service.serviceName }}
{{ service.humanType }} - + {{ characteristic.description }} - + {{ characteristic.value }}% {{ characteristic.value | convertTemp }}° @@ -48,39 +46,39 @@
{{ service.customName || service.serviceName }}
{{ information.key }} - {{ information.value }} + {{ information.value }} Homebridge Instance IP - {{ service.instance.ipAddress }} + {{ service.instance.ipAddress }} Homebridge Instance Port - {{ service.instance.port }} + {{ service.instance.port }} Homebridge Instance Username - {{ service.instance.username }} + {{ service.instance.username }} aid - {{ service.aid }} + {{ service.aid }} iid - {{ service.iid }} + {{ service.iid }}
-
+
-
-
+
diff --git a/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html b/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html index 07c84f309..3f8b4bb22 100644 --- a/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html +++ b/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/door/door.manage.component.html b/ui/src/app/core/accessories/types/door/door.manage.component.html index a7ad4998c..21413e028 100644 --- a/ui/src/app/core/accessories/types/door/door.manage.component.html +++ b/ui/src/app/core/accessories/types/door/door.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/fan/fan.manage.component.html b/ui/src/app/core/accessories/types/fan/fan.manage.component.html index 3d3c72589..22d90ad84 100644 --- a/ui/src/app/core/accessories/types/fan/fan.manage.component.html +++ b/ui/src/app/core/accessories/types/fan/fan.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html b/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html index 8df457d75..b3bc82a38 100644 --- a/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html +++ b/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html b/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html index b9f8d859a..a305c5b72 100644 --- a/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html +++ b/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html index 7af4b5605..60c728438 100644 --- a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html +++ b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html index d71f79be8..fb2230924 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html b/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html index 75d9d1f70..6863fcd46 100644 --- a/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html +++ b/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html b/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html index 275098aee..51aaa4858 100644 --- a/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html +++ b/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html b/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html index 5f5fa063c..2e257b609 100644 --- a/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html +++ b/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/valve/valve.manage.component.html b/ui/src/app/core/accessories/types/valve/valve.manage.component.html index 20814f074..04a52f04a 100644 --- a/ui/src/app/core/accessories/types/valve/valve.manage.component.html +++ b/ui/src/app/core/accessories/types/valve/valve.manage.component.html @@ -2,15 +2,13 @@
- +
- diff --git a/ui/src/app/core/accessories/types/window/window.manage.component.html b/ui/src/app/core/accessories/types/window/window.manage.component.html index a7ad4998c..21413e028 100644 --- a/ui/src/app/core/accessories/types/window/window.manage.component.html +++ b/ui/src/app/core/accessories/types/window/window.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html index b7d911d6a..2f5eb0d16 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html @@ -1,10 +1,8 @@
- +
diff --git a/ui/src/app/core/components/confirm/confirm.component.html b/ui/src/app/core/components/confirm/confirm.component.html index caa264416..02a8735fb 100644 --- a/ui/src/app/core/components/confirm/confirm.component.html +++ b/ui/src/app/core/components/confirm/confirm.component.html @@ -1,25 +1,23 @@
{{ title }}
- +

{{ message }}

-
-
-
-
diff --git a/ui/src/app/core/components/information/information.component.html b/ui/src/app/core/components/information/information.component.html index be54d0fa0..2cd120ac1 100644 --- a/ui/src/app/core/components/information/information.component.html +++ b/ui/src/app/core/components/information/information.component.html @@ -1,10 +1,8 @@
{{ title }}
- +
@@ -14,19 +12,19 @@
{{ subtitle }}

{{ message }}

-
-
-
-
+
{{ ctaButtonLabel }} diff --git a/ui/src/app/core/components/restart-child-bridges/restart-child-bridges.component.html b/ui/src/app/core/components/restart-child-bridges/restart-child-bridges.component.html index 1a16120d1..88fdfc293 100644 --- a/ui/src/app/core/components/restart-child-bridges/restart-child-bridges.component.html +++ b/ui/src/app/core/components/restart-child-bridges/restart-child-bridges.component.html @@ -1,28 +1,27 @@
{{ 'platform.version.title_service_restart_required' | translate }}
- +

{{ 'restart.child_bridge_list' | translate }}

-
    +
    • {{ bridge.displayName }}
-
-
-
+
diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html index eb92bb3cd..6871c9da8 100644 --- a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html @@ -1,23 +1,22 @@
{{ 'platform.version.title_service_restart_required' | translate }}
- +

{{ 'restart.homebridge' | translate }}

-
-
-
+
diff --git a/ui/src/app/core/components/schema-form/schema-form.component.html b/ui/src/app/core/components/schema-form/schema-form.component.html index ff6a16005..1f6fd5ce8 100644 --- a/ui/src/app/core/components/schema-form/schema-form.component.html +++ b/ui/src/app/core/components/schema-form/schema-form.component.html @@ -1,6 +1,6 @@ + [layout]="configSchema.layout" [form]="configSchema.form" [data]="currentData" framework="bootstrap-5" + (onChanges)="onChanges($event)" (isValid)="validChange($event)" class="ng-bs5-validate"> diff --git a/ui/src/app/core/core.module.ts b/ui/src/app/core/core.module.ts index ca0af39d4..f0ccc9035 100644 --- a/ui/src/app/core/core.module.ts +++ b/ui/src/app/core/core.module.ts @@ -16,7 +16,7 @@ import { CommonModule } from '@angular/common' import { NgModule } from '@angular/core' import { ReactiveFormsModule } from '@angular/forms' import { TranslateModule } from '@ngx-translate/core' -import { Bootstrap4FrameworkModule } from '@zajsf/bootstrap4' +import { Bootstrap5FrameworkModule } from '@zajsf/bootstrap5' @NgModule({ declarations: [ @@ -38,7 +38,7 @@ import { Bootstrap4FrameworkModule } from '@zajsf/bootstrap4' imports: [ CommonModule, TranslateModule, - Bootstrap4FrameworkModule, + Bootstrap5FrameworkModule, ReactiveFormsModule, ], providers: [], diff --git a/ui/src/app/core/directives/rtl.directive.ts b/ui/src/app/core/directives/rtl.directive.ts index e3c0eeaf8..f474bd803 100644 --- a/ui/src/app/core/directives/rtl.directive.ts +++ b/ui/src/app/core/directives/rtl.directive.ts @@ -16,9 +16,9 @@ export class RtlDirective implements OnInit { if (this.$settings.rtl) { (this.el.nativeElement as HTMLElement).setAttribute('dir', 'rtl') if (this.rtl === 'right') { - (this.el.nativeElement as HTMLElement).classList.add('text-right') + (this.el.nativeElement as HTMLElement).classList.add('text-end') } else if (this.rtl === 'left') { - (this.el.nativeElement as HTMLElement).classList.add('text-left') + (this.el.nativeElement as HTMLElement).classList.add('text-start') } } } diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html index 9a39730bb..79bc9becc 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html @@ -4,10 +4,8 @@
{{ 'plugins.settings.title_settings' | translate }}: {{ plugin.displayName || plugin.name }}
- +
@@ -37,7 +35,7 @@
-
+
@@ -52,32 +50,32 @@
-
-
-
+
-
-
-
-
+
diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html index 059fd24e3..8df5af632 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html @@ -1,10 +1,8 @@
Homebridge Google Smart Home
- +
@@ -56,13 +54,13 @@

- - -
diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.html b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.html index 186f4aeba..d1140f61f 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.html @@ -1,3 +1,3 @@ - diff --git a/ui/src/app/core/manage-plugins/donate/donate.component.html b/ui/src/app/core/manage-plugins/donate/donate.component.html index 81804d116..0f74302c1 100644 --- a/ui/src/app/core/manage-plugins/donate/donate.component.html +++ b/ui/src/app/core/manage-plugins/donate/donate.component.html @@ -3,9 +3,8 @@
{{ 'plugins.donate.tile_donate_to' | translate: { author: plugin.author ? '@' + plugin.author : plugin.name } }}
- +
@@ -19,19 +18,19 @@

-
+
-
-
+
diff --git a/ui/src/app/core/manage-plugins/manage-plugin/manage-plugin.component.html b/ui/src/app/core/manage-plugins/manage-plugin/manage-plugin.component.html index c7aa11ff9..009a9112f 100644 --- a/ui/src/app/core/manage-plugins/manage-plugin/manage-plugin.component.html +++ b/ui/src/app/core/manage-plugins/manage-plugin/manage-plugin.component.html @@ -1,9 +1,8 @@
{{ presentTenseVerb }}: {{ pluginName }}
- +
@@ -57,19 +56,19 @@
{{ 'plugins.manage.release_notes' | translate }}
-
-
-
-
+
diff --git a/ui/src/app/core/manage-plugins/manage-version/manage-version.component.html b/ui/src/app/core/manage-plugins/manage-version/manage-version.component.html index 7d2861c3a..9dafe29ca 100644 --- a/ui/src/app/core/manage-plugins/manage-version/manage-version.component.html +++ b/ui/src/app/core/manage-plugins/manage-version/manage-version.component.html @@ -1,10 +1,8 @@
{{ 'plugins.manage.install' | translate }}: {{ plugin.displayName || plugin.name }}
- +
@@ -13,36 +11,36 @@
{{ 'plugins.manage.install' | translate }}: {{ plugin.di
-

{{ 'plugins.status_installed' | translate }}: v{{ plugin.installedVersion }}

+

{{ 'plugins.status_installed' | translate }}: v{{ plugin.installedVersion }}

{{ 'plugins.manage.select_version_to_install' | translate }}:

  • - + {{ version.tag }}
    v{{ version.version }}     - -
  • - + {{ 'plugins.manage.all_versions' | translate }}
    -     - -
    • @@ -50,13 +48,13 @@
    {{ 'plugins.manage.install' | translate }}: {{ plugin.di
-
+
-
-
+
diff --git a/ui/src/app/core/manage-plugins/manual-config/manual-config.component.html b/ui/src/app/core/manage-plugins/manual-config/manual-config.component.html index 169583452..024c0d073 100644 --- a/ui/src/app/core/manage-plugins/manual-config/manual-config.component.html +++ b/ui/src/app/core/manage-plugins/manual-config/manual-config.component.html @@ -4,9 +4,8 @@
{{ 'plugins.settings.title_settings' | translate }}: {{ plugin.displayName || plugin.name }}
- +
@@ -33,11 +32,11 @@
{{ block.name || pluginAlias }}
- - @@ -55,17 +54,17 @@
{{ block.name || pluginAlias }}
-
-
-
- -
diff --git a/ui/src/app/core/manage-plugins/plugin-bridge/plugin-bridge.component.html b/ui/src/app/core/manage-plugins/plugin-bridge/plugin-bridge.component.html index df04b7a72..d57320591 100644 --- a/ui/src/app/core/manage-plugins/plugin-bridge/plugin-bridge.component.html +++ b/ui/src/app/core/manage-plugins/plugin-bridge/plugin-bridge.component.html @@ -4,10 +4,8 @@
{{ 'child_bridge.bridge_settings' | translate }}: {{ plugin.displayName || plugin.name }}
- +

@@ -71,26 +69,26 @@

{{ 'child_bridge.config.description' | translate }}
- {{ 'child_bridge.config.name' | translate }} -
+ {{ 'child_bridge.config.name' | translate }} +
- {{ 'child_bridge.config.manufacturer' | translate }} -
+ {{ 'child_bridge.config.manufacturer' | translate }} +
- {{ 'child_bridge.config.model' | translate }} -
+ {{ 'child_bridge.config.model' | translate }} +
- {{ 'child_bridge.config.firmware' | translate }} -
+ {{ 'child_bridge.config.firmware' | translate }} +
@@ -98,24 +96,24 @@
{{ 'child_bridge.config.debug' | translate }} -D - +
- - DEBUG
+ + DEBUG
{{ 'settings.service.debug_tooltip' | translate }} -
+
- - NODE_OPTIONS
+ + NODE_OPTIONS
{{ 'settings.service.node_tooltip' | translate }} -
+
@@ -143,17 +141,17 @@
-
-
-
+
-
diff --git a/ui/src/app/core/manage-plugins/plugin-compatibility/plugin-compatibility.component.html b/ui/src/app/core/manage-plugins/plugin-compatibility/plugin-compatibility.component.html index 28f376586..422c9c9c9 100644 --- a/ui/src/app/core/manage-plugins/plugin-compatibility/plugin-compatibility.component.html +++ b/ui/src/app/core/manage-plugins/plugin-compatibility/plugin-compatibility.component.html @@ -1,17 +1,15 @@
{{ 'plugins.compatibility.title' | translate }}
- +
-