Browse Source

Fix backup layout.

pull/802/head
Sebastian 4 years ago
parent
commit
272b1c90d3
  1. 4
      frontend/app/features/settings/pages/backups/backup.component.html
  2. 7
      frontend/app/features/settings/pages/backups/backups-page.component.html
  3. 4
      frontend/app/features/settings/pages/clients/clients-page.component.html

4
frontend/app/features/settings/pages/backups/backup.component.html

@ -11,7 +11,7 @@
{{ 'backups.backupDuration' | sqxTranslate }}: {{ 'backups.backupDuration' | sqxTranslate }}:
</div> </div>
</div> </div>
<div class="col"> <div class="col text-nowrap">
<div> <div>
{{backup.started | sqxFromNow}} {{backup.started | sqxFromNow}}
</div> </div>
@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div> <div class="text-nowrap">
<span title="i18n:backups.backupCountEventsTooltip"> <span title="i18n:backups.backupCountEventsTooltip">
{{ 'backups.backupCountEventsLabel' | sqxTranslate }}: <strong class="backup-progress">{{backup.handledEvents | sqxKNumber}}</strong> {{ 'backups.backupCountEventsLabel' | sqxTranslate }}: <strong class="backup-progress">{{backup.handledEvents | sqxKNumber}}</strong>
</span>, </span>,

7
frontend/app/features/settings/pages/backups/backups-page.component.html

@ -1,6 +1,6 @@
<sqx-title message="i18n:common.backups"></sqx-title> <sqx-title message="i18n:common.backups"></sqx-title>
<sqx-layout layout="main" titleText="i18n:common.backups" titleIcon="backups" [innerWidth]="40"> <sqx-layout layout="main" titleText="i18n:common.backups" titleIcon="backups" [innerWidth]="50">
<ng-container menu> <ng-container menu>
<button type="button" class="btn btn-text-secondary me-2" (click)="reload()" title="i18n:backups.refreshTooltip" shortcut="CTRL + B"> <button type="button" class="btn btn-text-secondary me-2" (click)="reload()" title="i18n:backups.refreshTooltip" shortcut="CTRL + B">
<i class="icon-reset"></i> {{ 'common.refresh' | sqxTranslate }} <i class="icon-reset"></i> {{ 'common.refresh' | sqxTranslate }}
@ -12,7 +12,7 @@
</ng-container> </ng-container>
<ng-container> <ng-container>
<sqx-list-view innerWidth="40rem" [isLoading]="backupsState.isLoading | async"> <sqx-list-view innerWidth="50rem" [isLoading]="backupsState.isLoading | async">
<div class="alert alert-danger mb-4" *ngIf="backupsState.maxBackupsReached | async"> <div class="alert alert-danger mb-4" *ngIf="backupsState.maxBackupsReached | async">
{{ 'backups.maximumReached' | sqxTranslate }} {{ 'backups.maximumReached' | sqxTranslate }}
</div> </div>
@ -26,7 +26,8 @@
</button> </button>
</div> </div>
<sqx-backup *ngFor="let backup of backups; trackBy: trackByBackup" [backup]="backup"> <sqx-backup *ngFor="let backup of backups; trackBy: trackByBackup"
[backup]="backup">
</sqx-backup> </sqx-backup>
</ng-container> </ng-container>
</sqx-list-view> </sqx-list-view>

4
frontend/app/features/settings/pages/clients/clients-page.component.html

@ -1,6 +1,6 @@
<sqx-title message="i18n:common.clients"></sqx-title> <sqx-title message="i18n:common.clients"></sqx-title>
<sqx-layout layout="main" titleText="i18n:common.clients" titleIcon="clients" [innerWidth]="55"> <sqx-layout layout="main" titleText="i18n:common.clients" titleIcon="clients" [innerWidth]="50">
<ng-container menu> <ng-container menu>
<button type="button" class="btn btn-text-secondary" (click)="reload()" title="i18n:clients.refreshTooltip" shortcut="CTRL + B"> <button type="button" class="btn btn-text-secondary" (click)="reload()" title="i18n:clients.refreshTooltip" shortcut="CTRL + B">
<i class="icon-reset"></i> {{ 'common.refresh' | sqxTranslate }} <i class="icon-reset"></i> {{ 'common.refresh' | sqxTranslate }}
@ -8,7 +8,7 @@
</ng-container> </ng-container>
<ng-container> <ng-container>
<sqx-list-view innerWidth="55rem" [isLoading]="clientsState.isLoading | async"> <sqx-list-view innerWidth="50rem" [isLoading]="clientsState.isLoading | async">
<ng-container *ngIf="(clientsState.isLoaded | async) && (clientsState.clients | async); let clients"> <ng-container *ngIf="(clientsState.isLoaded | async) && (clientsState.clients | async); let clients">
<sqx-client-add-form *ngIf="clientsState.canCreate | async"></sqx-client-add-form> <sqx-client-add-form *ngIf="clientsState.canCreate | async"></sqx-client-add-form>

Loading…
Cancel
Save