Commit e196150d3c672bd14e31271d428ed0bcd8040aba
1 parent
560e3fe1
Transfer units and dicimals fields to data tab
Showing
4 changed files
with
27 additions
and
15 deletions
... | ... | @@ -290,6 +290,26 @@ |
290 | 290 | </div> |
291 | 291 | </mat-expansion-panel> |
292 | 292 | </div> |
293 | + <div [formGroup]="widgetSettings" class="mat-content mat-padding" fxLayout="column" fxLayoutGap="8px"> | |
294 | + <mat-expansion-panel> | |
295 | + <mat-expansion-panel-header> | |
296 | + <mat-panel-title translate>widget-config.data-settings</mat-panel-title> | |
297 | + </mat-expansion-panel-header> | |
298 | + <ng-template matExpansionPanelContent> | |
299 | + <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" | |
300 | + fxLayoutGap="8px"> | |
301 | + <mat-form-field fxFlex> | |
302 | + <mat-label translate>widget-config.units</mat-label> | |
303 | + <input matInput formControlName="units"> | |
304 | + </mat-form-field> | |
305 | + <mat-form-field fxFlex> | |
306 | + <mat-label translate>widget-config.decimals</mat-label> | |
307 | + <input matInput formControlName="decimals" type="number" min="0" max="15" step="1"> | |
308 | + </mat-form-field> | |
309 | + </div> | |
310 | + </ng-template> | |
311 | + </mat-expansion-panel> | |
312 | + </div> | |
293 | 313 | </mat-tab> |
294 | 314 | <mat-tab label="{{ 'widget-config.settings' | translate }}"> |
295 | 315 | <div class="mat-content mat-padding" fxLayout="column"> |
... | ... | @@ -447,17 +467,6 @@ |
447 | 467 | </ng-template> |
448 | 468 | </mat-expansion-panel> |
449 | 469 | </fieldset> |
450 | - <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" | |
451 | - fxLayoutGap="8px"> | |
452 | - <mat-form-field fxFlex> | |
453 | - <mat-label translate>widget-config.units</mat-label> | |
454 | - <input matInput formControlName="units"> | |
455 | - </mat-form-field> | |
456 | - <mat-form-field fxFlex> | |
457 | - <mat-label translate>widget-config.decimals</mat-label> | |
458 | - <input matInput formControlName="decimals" type="number" min="0" max="15" step="1"> | |
459 | - </mat-form-field> | |
460 | - </div> | |
461 | 470 | </div> |
462 | 471 | </div> |
463 | 472 | </mat-tab> | ... | ... |
... | ... | @@ -3028,7 +3028,7 @@ |
3028 | 3028 | "general-settings": "General settings", |
3029 | 3029 | "display-title": "Display widget title", |
3030 | 3030 | "drop-shadow": "Drop shadow", |
3031 | - "enable-fullscreen": "Allow fullscreen", | |
3031 | + "enable-fullscreen": "Enable fullscreen", | |
3032 | 3032 | "background-color": "Background color", |
3033 | 3033 | "text-color": "Text color", |
3034 | 3034 | "padding": "Padding", |
... | ... | @@ -3076,7 +3076,8 @@ |
3076 | 3076 | "display-icon": "Display title icon", |
3077 | 3077 | "icon-color": "Icon color", |
3078 | 3078 | "icon-size": "Icon size", |
3079 | - "advanced-settings": "Advanced settings" | |
3079 | + "advanced-settings": "Advanced settings", | |
3080 | + "data-settings": "Data settings" | |
3080 | 3081 | }, |
3081 | 3082 | "widget-type": { |
3082 | 3083 | "import": "Import widget type", | ... | ... |
... | ... | @@ -1678,7 +1678,8 @@ |
1678 | 1678 | "display-icon": "Показывать иконку в названии виджета", |
1679 | 1679 | "icon-color": "Цвет иконки", |
1680 | 1680 | "icon-size": "Размер иконки", |
1681 | - "advanced-settings": "Расширенные настройки" | |
1681 | + "advanced-settings": "Расширенные настройки", | |
1682 | + "data-settings": "Настройки данных" | |
1682 | 1683 | }, |
1683 | 1684 | "widget-type": { |
1684 | 1685 | "import": "Импортировать тип виджета", | ... | ... |
... | ... | @@ -2250,7 +2250,8 @@ |
2250 | 2250 | "display-icon": "Показувати іконку у назві віджету", |
2251 | 2251 | "icon-color": "Колір іконки", |
2252 | 2252 | "icon-size": "Розмір іконки", |
2253 | - "advanced-settings": "Розширені налаштування" | |
2253 | + "advanced-settings": "Розширені налаштування", | |
2254 | + "data-settings": "Налаштування даних" | |
2254 | 2255 | }, |
2255 | 2256 | "widget-type": { |
2256 | 2257 | "import": "Імпортувати тип віджета", | ... | ... |