tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'fix/3985-server-spacing' of github.com:maxunbearable/thingsboard into improvement/gateway-dashboard

pull/11251/head
Vladyslav_Prykhodko 2 years ago
parent
62ade89f53 728042680f
commit
4fe5deea21
1 changed files with 83 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 168
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/server-config/server-config.component.html

168
ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/server-config/server-config.component.html
View File

@ -16,95 +16,93 @@
--> -->
<div class="tb-form-panel no-border no-padding padding-top" [formGroup]="serverConfigFormGroup"> <div class="tb-form-panel no-border no-padding padding-top" [formGroup]="serverConfigFormGroup">
<div class="server-settings"> <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
<div class="tb-form-row column-xs" fxLayoutAlign="space-between center"> <div class="fixed-title-width" tbTruncateTooltip translate>gateway.server-url</div>
<div class="fixed-title-width" tbTruncateTooltip translate>gateway.server-url</div> <div class="tb-flex no-gap">
<div class="tb-flex no-gap"> <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic"> <input matInput name="value" formControlName="url" placeholder="{{ 'gateway.set' | translate }}"/>
<input matInput name="value" formControlName="url" placeholder="{{ 'gateway.set' | translate }}"/> <mat-icon matSuffix
<mat-icon matSuffix matTooltipPosition="above"
matTooltipPosition="above" matTooltipClass="tb-error-tooltip"
matTooltipClass="tb-error-tooltip" [matTooltip]="('gateway.server-url-required') | translate"
[matTooltip]="('gateway.server-url-required') | translate" *ngIf="serverConfigFormGroup.get('url').hasError('required') &&
*ngIf="serverConfigFormGroup.get('url').hasError('required') && serverConfigFormGroup.get('url').touched"
serverConfigFormGroup.get('url').touched" class="tb-error">
class="tb-error"> warning
warning </mat-icon>
</mat-icon> </mat-form-field>
</mat-form-field>
</div>
</div> </div>
<div class="tb-form-row column-xs" fxLayoutAlign="space-between center"> </div>
<div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.opcua-timeout' | translate }}"> <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
<div tbTruncateTooltip>{{ 'gateway.timeout' | translate }}</div> <div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.opcua-timeout' | translate }}">
</div> <div tbTruncateTooltip>{{ 'gateway.timeout' | translate }}</div>
<div class="tb-flex no-gap"> </div>
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic"> <div class="tb-flex no-gap">
<input matInput type="number" min="0" name="value" formControlName="timeoutInMillis" placeholder="{{ 'gateway.set' | translate }}"/> <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
<mat-icon matSuffix <input matInput type="number" min="0" name="value" formControlName="timeoutInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
matTooltipPosition="above" <mat-icon matSuffix
matTooltipClass="tb-error-tooltip" matTooltipPosition="above"
[matTooltip]="'gateway.timeout-error' | translate: {min: 1000}" matTooltipClass="tb-error-tooltip"
*ngIf="(serverConfigFormGroup.get('timeoutInMillis').hasError('required') || [matTooltip]="'gateway.timeout-error' | translate: {min: 1000}"
serverConfigFormGroup.get('timeoutInMillis').hasError('min')) && *ngIf="(serverConfigFormGroup.get('timeoutInMillis').hasError('required') ||
serverConfigFormGroup.get('timeoutInMillis').touched" serverConfigFormGroup.get('timeoutInMillis').hasError('min')) &&
class="tb-error"> serverConfigFormGroup.get('timeoutInMillis').touched"
warning class="tb-error">
</mat-icon> warning
</mat-form-field> </mat-icon>
</div> </mat-form-field>
</div> </div>
<div class="tb-form-row column-xs" fxLayoutAlign="space-between center"> </div>
<div class="fixed-title-width" tbTruncateTooltip translate>gateway.security</div> <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
<div class="tb-flex no-gap"> <div class="fixed-title-width" tbTruncateTooltip translate>gateway.security</div>
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic"> <div class="tb-flex no-gap">
<mat-select formControlName="security"> <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
<mat-option *ngFor="let version of securityPolicyTypes" [value]="version.value">{{ version.name }}</mat-option> <mat-select formControlName="security">
</mat-select> <mat-option *ngFor="let version of securityPolicyTypes" [value]="version.value">{{ version.name }}</mat-option>
</mat-form-field> </mat-select>
</div> </mat-form-field>
</div> </div>
<div class="tb-form-row column-xs" fxLayoutAlign="space-between center"> </div>
<div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.scan-period' | translate }}"> <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
<div tbTruncateTooltip>{{ 'gateway.scan-period' | translate }}</div> <div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.scan-period' | translate }}">
</div> <div tbTruncateTooltip>{{ 'gateway.scan-period' | translate }}</div>
<div class="tb-flex no-gap"> </div>
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic"> <div class="tb-flex no-gap">
<input matInput type="number" min="0" name="value" <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
formControlName="scanPeriodInMillis" placeholder="{{ 'gateway.set' | translate }}"/> <input matInput type="number" min="0" name="value"
<mat-icon matSuffix formControlName="scanPeriodInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
matTooltipPosition="above" <mat-icon matSuffix
matTooltipClass="tb-error-tooltip" matTooltipPosition="above"
[matTooltip]="'gateway.scan-period-error' | translate: {min: 1000}" matTooltipClass="tb-error-tooltip"
*ngIf="(serverConfigFormGroup.get('scanPeriodInMillis').hasError('required') || [matTooltip]="'gateway.scan-period-error' | translate: {min: 1000}"
serverConfigFormGroup.get('scanPeriodInMillis').hasError('min')) && *ngIf="(serverConfigFormGroup.get('scanPeriodInMillis').hasError('required') ||
serverConfigFormGroup.get('scanPeriodInMillis').touched" serverConfigFormGroup.get('scanPeriodInMillis').hasError('min')) &&
class="tb-error"> serverConfigFormGroup.get('scanPeriodInMillis').touched"
warning class="tb-error">
</mat-icon> warning
</mat-form-field> </mat-icon>
</div> </mat-form-field>
</div>
</div>
<div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
<div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.sub-check-period' | translate }}">
<div tbTruncateTooltip>{{ 'gateway.sub-check-period' | translate }}</div>
</div> </div>
<div class="tb-form-row column-xs" fxLayoutAlign="space-between center"> <div class="tb-flex no-gap">
<div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.sub-check-period' | translate }}"> <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
<div tbTruncateTooltip>{{ 'gateway.sub-check-period' | translate }}</div> <input matInput type="number" min="0" name="value"
</div> formControlName="subCheckPeriodInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
<div class="tb-flex no-gap"> <mat-icon matSuffix
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic"> matTooltipPosition="above"
<input matInput type="number" min="0" name="value" matTooltipClass="tb-error-tooltip"
formControlName="subCheckPeriodInMillis" placeholder="{{ 'gateway.set' | translate }}"/> [matTooltip]="'gateway.sub-check-period-error' | translate: {min: 10}"
<mat-icon matSuffix *ngIf="(serverConfigFormGroup.get('subCheckPeriodInMillis').hasError('required') ||
matTooltipPosition="above" serverConfigFormGroup.get('subCheckPeriodInMillis').hasError('min')) &&
matTooltipClass="tb-error-tooltip" serverConfigFormGroup.get('subCheckPeriodInMillis').touched"
[matTooltip]="'gateway.sub-check-period-error' | translate: {min: 10}" class="tb-error">
*ngIf="(serverConfigFormGroup.get('subCheckPeriodInMillis').hasError('required') || warning
serverConfigFormGroup.get('subCheckPeriodInMillis').hasError('min')) && </mat-icon>
serverConfigFormGroup.get('subCheckPeriodInMillis').touched" </mat-form-field>
class="tb-error">
warning
</mat-icon>
</mat-form-field>
</div>
</div> </div>
</div> </div>
<div class="tb-form-row" fxLayoutAlign="space-between center"> <div class="tb-form-row" fxLayoutAlign="space-between center">

Write Preview
Loading…
Cancel
Save