diff --git a/ui-ngx/src/app/modules/home/components/device/copy-device-credentials.component.html b/ui-ngx/src/app/modules/home/components/device/copy-device-credentials.component.html index 1fe15c534c..5581e3d524 100644 --- a/ui-ngx/src/app/modules/home/components/device/copy-device-credentials.component.html +++ b/ui-ngx/src/app/modules/home/components/device/copy-device-credentials.component.html @@ -19,7 +19,7 @@ ngxClipboard [cbContent]="credential" (cbOnSuccess)="onCopyCredential()" - [fxHide]="hideButton" + [class.!hidden]="hideButton" [disabled]="disabled || loading"> {{ buttonLabel }} diff --git a/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html index 0f2412b857..31f7fe968a 100644 --- a/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html +++ b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html @@ -15,7 +15,7 @@ limitations under the License. --> - + device.lwm2m-security-config.mode @@ -24,7 +24,7 @@ - + {{ 'device.lwm2m-security-config.client-publicKey-or-id' | translate }} - 1" style="margin-bottom: 16px"> + 1)" style="margin-bottom: 16px"> device.credentials-type diff --git a/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html b/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html index 2590c24699..6852f642e8 100644 --- a/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html +++ b/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html @@ -30,9 +30,9 @@ - + - + @@ -48,7 +48,7 @@ - + - + {{ translations.add }} - + - + - - + + - + {{ entitiesTableConfig.tableTitle }} - - + + @@ -72,7 +72,7 @@ {{actionDescriptor.icon}} {{ actionDescriptor.name }} @@ -82,7 +82,7 @@ @@ -101,14 +101,14 @@ - + search - + - + {{ translations.selectedEntities | translate:{count: dataSource.selection.selected.length} }} - + @@ -136,7 +136,7 @@ - + @@ -148,23 +148,23 @@ - + {{ column.ignoreTranslate ? column.title : (column.title | translate) }} - + [style]="cellStyle(entity, column, row)"> - + {{column.actionCell.icon}} @@ -207,74 +207,83 @@ - {{ column.title | translate }} + {{ column.title | translate }} + [style]="cellStyle(entity, column, row)"> - + {{column.actionDescriptor.iconFunction ? column.actionDescriptor.iconFunction(entity) : column.actionDescriptor.icon}} - - {{ entitiesTableConfig.actionsColumnTitle ? (entitiesTableConfig.actionsColumnTitle | translate) : '' }} + + + + {{ entitiesTableConfig.actionsColumnTitle ? (entitiesTableConfig.actionsColumnTitle | translate) : '' }} + + + {{ entitiesTableConfig.actionsColumnTitle ? (entitiesTableConfig.actionsColumnTitle | translate) : '' }} + + - - - - - {{actionDescriptor.iconFunction ? actionDescriptor.iconFunction(entity) : actionDescriptor.icon}} - - - - - - more_vert - - - + + + - + {{actionDescriptor.iconFunction ? actionDescriptor.iconFunction(entity) : actionDescriptor.icon}} - {{ actionDescriptor.nameFunction ? actionDescriptor.nameFunction(entity) : actionDescriptor.name }} - - + + + + more_vert + + + + + {{actionDescriptor.iconFunction ? actionDescriptor.iconFunction(entity) : actionDescriptor.icon}} + + {{ actionDescriptor.nameFunction ? actionDescriptor.nameFunction(entity) : actionDescriptor.name }} + + + + - - + - {{ translations.noEntities | translate }} - {{ 'common.loading' | translate }} + {{ translations.noEntities | translate }} + {{ 'common.loading' | translate }}