Fix code alignment

(cherry picked from commit af193282da)

src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html

@@ -6,19 +6,13 @@
                     {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
                 </span>
                 <span *ngIf="(countDownDays|async) > 0">
-            {{'system-wide-alert-banner.countdown.days' | translate: {
+                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
-                days: countDownDays|async
-            } }}
                 </span>
                 <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
-            {{'system-wide-alert-banner.countdown.hours' | translate: {
+                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
-                hours: countDownHours| async
-            } }}
                 </span>
                 <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-            {{'system-wide-alert-banner.countdown.minutes' | translate: {
+                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
-                minutes: countDownMinutes|async
-            } }}
                 </span>
             </span>
             <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>

src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html

@@ -6,8 +6,7 @@
                 <div class="col">
                     <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
                         [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
-                               [checked]="formActive.value"
+                        [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
-                               (change)="setActive($event)"></ui-switch>
                 </div>
             </div>
             <div class="row">
@@ -29,10 +28,8 @@
     </div>
     <div class="row">
         <div class="col mb-2 d-flex align-items-end">
-            <ui-switch size="small"
+            <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
-                       [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
+                [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
-                       [checked]="counterEnabled$ |async"
-                       (change)="setCounterEnabled($event)"></ui-switch>
             <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
         </div>
     </div>
@@ -40,16 +37,8 @@
         <div class="row">
             <div class="col-sm-12 col-md-6">
                 <div class="input-group">
-                    <input
+                    <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
-                            class="form-control"
+                        [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
-                            placeholder="yyyy-mm-dd"
-                            name="dp"
-                            [(ngModel)]="date"
-                            [minDate]="minDate"
-                            ngbDatepicker
-                            #d="ngbDatepicker"
-                            (ngModelChange)="updatePreviewTime()"
-                    />
                     <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
                         (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
                     </button>
@@ -70,8 +59,6 @@
     <div class="mb-2">
         <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
     </div>
-
-
     <div *ngIf="formMessage.value">
         <div class="row">
             <div class="col">
@@ -84,33 +71,24 @@
                     {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
                 </span>
                 <span *ngIf="previewDays > 0">
-            {{'system-wide-alert-banner.countdown.days' | translate: {
+                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
-                days: previewDays
-            } }}
                 </span>
                 <span *ngIf="previewDays > 0 || previewHours > 0 ">
-            {{'system-wide-alert-banner.countdown.hours' | translate: {
+                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
-                hours: previewHours
-            } }}
                 </span>
                 <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-            {{'system-wide-alert-banner.countdown.minutes' | translate: {
+                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
-                minutes: previewMinutes
-            } }}
                 </span>
             </span>
             <span [innerHTML]="formMessage.value"></span>
         </div>
     </div>
-
     <div class="btn-row float-right space-children-mr mt-2">
-        <button (click)="back()"
+        <button (click)="back()" class="btn btn-outline-secondary">
-                class="btn btn-outline-secondary"><i
+            <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
-                class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
+        </button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid"
+        <button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
-                (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
-
 </div>