Merge branch 'beta-4.52.4' into patch-5

homebridge · Nov 15, 2023 · 0928acf · 0928acf
2 parents 44f3f29 + eb7bb1a
commit 0928acf
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 27 deletions.
diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts
@@ -29,7 +29,7 @@ export class LightbulbComponent implements OnInit {
   onLongClick() {
     if ('Brightness' in this.service.values) {
       const ref = this.modalService.open(LightbulbManageComponent, {
-        size: 'sm',
+        size: 'md',
       });
       ref.componentInstance.service = this.service;
     }

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
@@ -6,7 +6,7 @@ <h5 class="modal-title" [innerText]="service.customName || service.serviceName">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <div class="modal-body text-center">
+  <div class="modal-body text-center p-5">
 
     <h5>
       <strong>

diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts
@@ -27,7 +27,7 @@ export class WindowcoveringComponent implements OnInit {
 
   onLongClick() {
     const ref = this.modalService.open(WindowcoveringManageComponent, {
-      size: 'sm',
+      size: 'md',
     });
     ref.componentInstance.service = this.service;
   }

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
@@ -6,7 +6,7 @@ <h5 class="modal-title" [innerText]="service.customName || service.serviceName">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <div class="modal-body text-center">
+  <div class="modal-body text-center p-5">
 
     <h5>
       <strong>

diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html
@@ -18,16 +18,6 @@ <h3 class="text-center primary-text" [translate]="'platform.version.title_servic
         [translate]="'plugins.manage.message_thanks_for_updating_restart_child_bridges'">
         Please restart the plugin's child bridges for the changes to apply.
       </p>
-      <div class="text-center">
-        <button type="button" class="btn btn-primary" *ngIf="!['homebridge', 'homebridge-config-ui-x'].includes(pluginName) && childBridges.length > 0"
-          (click)="onRestartChildBridgeClick()">
-          {{ (childBridges.length === 1 ? 'plugins.manage.child_bridge_button_restart_now_one' : 'plugins.manage.child_bridge_button_restart_now') | translate }}
-        </button>
-        <button type="button" class="btn btn-primary"
-          *ngIf="['homebridge', 'homebridge-config-ui-x'].includes(pluginName) || childBridges.length === 0" (click)="onRestartHomebridgeClick()"
-          [translate]="'plugins.manage.button_restart_now'">Restart Homebridge</button>
-      </div>
-      <hr>
     </div>
     <div class="alert show alert-info pt-3 px-3 pb-0 mb-0">
       <markdown class="plugin-md" [data]="changeLog"></markdown>
@@ -50,7 +40,6 @@ <h4 class="primary-text text-center" [translate]="'plugins.manage.label_manual_u
 npm install -g {{ pluginName }}@{{targetVersion}}
 hb-service start</pre>
     </div>
-    <hr>
   </div>
   <div *ngIf="showReleaseNotes && !actionComplete" class="modal-body plugin-modal-body">
     <h5 *ngIf="!updateToBeta">{{ 'plugins.manage.label_release_notes' | translate }} <span *ngIf="release.name">({{ release.name }})</span></h5>
@@ -61,19 +50,27 @@ <h5 *ngIf="updateToBeta">{{ 'plugins.manage.label_release_notes_beta' | translat
   </div>
   <div class="modal-footer justify-content-between" *ngIf="!onlineUpdateOk || actionComplete || showReleaseNotes || actionFailed">
     <div class="text-left">
-      <button *ngIf="!justUpdatedPlugin && !actionFailed" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
+      <button *ngIf="!actionFailed" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
         {{ 'form.button_close' | translate }}
       </button>
     </div>
     <div class="text-center">
-      <button *ngIf="justUpdatedPlugin || actionFailed" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
+      <button *ngIf="actionFailed" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
         {{ 'form.button_close' | translate }}
       </button>
     </div>
     <div class="text-right">
       <button *ngIf="onlineUpdateOk && showReleaseNotes" type="button" class="btn btn-primary" (click)="update()">
         {{ 'plugins.button_update' | translate }}
       </button>
+      <button type="button" class="btn btn-primary" *ngIf="justUpdatedPlugin && !['homebridge', 'homebridge-config-ui-x'].includes(pluginName) && childBridges.length > 0"
+        (click)="onRestartChildBridgeClick()">
+        {{ (childBridges.length === 1 ? 'plugins.manage.child_bridge_button_restart_now_one' : 'plugins.manage.child_bridge_button_restart_now') | translate }}
+      </button>
+      <button type="button" class="btn btn-primary" *ngIf="justUpdatedPlugin && (['homebridge', 'homebridge-config-ui-x'].includes(pluginName) || childBridges.length === 0)"
+        (click)="onRestartHomebridgeClick()">
+        {{ 'plugins.manage.button_restart_now' | translate }}
+      </button>
     </div>
   </div>
 </div>
diff --git a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html
@@ -87,13 +87,10 @@
           </th>
           <td class="text-nowrap" [translate]="'status.widget.systeminfo.label_yes'">Yes</td>
         </tr>
-        <tr>
+        <tr *ngIf="!serverInfo.homebridgeServiceMode">
           <th scope="row" class="text-nowrap" [translate]="'status.widget.systeminfo.label_service_mode'">Service Mode
           </th>
-          <td class="text-nowrap" *ngIf="serverInfo.homebridgeServiceMode">
-            {{ 'status.widget.systeminfo.label_enabled' | translate }}
-          </td>
-          <td class="text-nowrap" *ngIf="!serverInfo.homebridgeServiceMode">
+          <td class="text-nowrap">
             <a class="system-info-link" href="javascript:void(0)" (click)="serviceModeModal()">
               <i class="primary-text fas fa-fw fa-exclamation-circle"></i>
             </a> {{ 'status.widget.systeminfo.label_disabled' | translate }}

diff --git a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts
@@ -48,6 +48,7 @@ export class SystemInfoWidgetComponent implements OnInit {
     ref.componentInstance.title = this.$translate.instant('status.widget.systeminfo.modal_glibc_title');
     ref.componentInstance.message = this.$translate.instant('status.widget.systeminfo.modal_glibc_message');
     ref.componentInstance.ctaButtonLabel = this.$translate.instant('status.widget.systeminfo.modal_glibc_cta');
+    ref.componentInstance.faIconClass = 'fab fa-fw fa-node-js primary-text';
 
     // eslint-disable-next-line max-len
     ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-config-ui-x/wiki/Troubleshooting/#error---update-node---your-version-of-linux-does-not-meet-the-glibc-version';
@@ -58,6 +59,7 @@ export class SystemInfoWidgetComponent implements OnInit {
     ref.componentInstance.title = this.$translate.instant('status.widget.systeminfo.modal_servicemode_title');
     ref.componentInstance.message = this.$translate.instant('status.widget.systeminfo.modal_servicemode_message');
     ref.componentInstance.ctaButtonLabel = this.$translate.instant('status.widget.systeminfo.modal_servicemode_cta');
+    ref.componentInstance.faIconClass = 'fas fa-fw fa-circle-exclamation primary-text';
 
     // eslint-disable-next-line max-len
     ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-config-ui-x/wiki/How-To-Swap-From-Standalone-Mode-to-Service-Mode';

diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json
@@ -153,7 +153,7 @@
     "menu.linux.label_restart_server": "Restart OS",
     "menu.linux.label_shutdown_server": "Shutdown OS",
     "menu.linux.label_terminal": "Terminal",
-    "menu.restart.title": "Restart Options",
+    "menu.restart.title": "Restart / Shutdown",
     "menu.tooltip_logout": "Log out",
     "menu.tooltip_restart": "Restart Homebridge",
     "menu.tooltip_user_accounts": "User Accounts",

diff --git a/ui/src/i18n/pl.json b/ui/src/i18n/pl.json
@@ -78,7 +78,7 @@
     "backup.title_scheduled_backups": "Planowanie kopii zapasowych",
     "child_bridge.label_bridge_connect_to_homekit": "Połącz z HomeKit",
     "child_bridge.label_bridge_paired": "Mostek sparowany",
-    "child_bridge.label_bridge_restart_child_bridges": "Uruchom ponownie mostek podrzędny",
+    "child_bridge.label_bridge_restart_child_bridges": "Zrestartuj mostek",
     "child_bridge.label_bridge_settings": "Ustawienia mostka",
     "child_bridge.label_child_bridges": "Mostki podrzędne",
     "child_bridge.label_child_start": "Uruchom mostek",
@@ -152,7 +152,7 @@
     "menu.linux.label_restart_server": "Zrestartuj serwer",
     "menu.linux.label_shutdown_server": "Wyłącz serwer",
     "menu.linux.label_terminal": "Terminal",
-    "menu.restart.title": "Restart Options",
+    "menu.restart.title": "Restart / Wyłącz",
     "menu.tooltip_logout": "Wyloguj",
     "menu.tooltip_restart": "Zrestartuj Homebridge",
     "menu.tooltip_user_accounts": "Użytkownicy",
@@ -219,8 +219,8 @@
     "plugins.manage.message_uninstall_remove_plugin_config": "Usunąć również konfigurację tej wtyczki?",
     "plugins.manage.modal_verified_cta": "More Info",
     "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.",
-    "plugins.manage.modal_verified_title": "Verified Plugins",
-    "plugins.manage.plugin_logs": "View Plugin Logs",
+    "plugins.manage.modal_verified_title": "Zweryfikowane wtyczki",
+    "plugins.manage.plugin_logs": "Logi wtyczki",
     "plugins.node_update.are_you_sure_you_want_to_update": "Jesteś pewny, że chcesz zaktualizować {{ pluginName }}?",
     "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} wymaga Node.js w wersji {{minVersion}} lub nowszej. Aktualnie używasz Node.js w wersji {{ installedVersion }}.",
     "plugins.node_update.node_version_too_low": "Wtyczka {{ pluginName }} powinna być instalowana używając Node.js w wersji {{ minVersion }} lub nowszej. Aktualnie używasz Node.js w wersji {{ installedVersion }}.",