Skip to content

Commit

Permalink
Fix code alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
abelgomez committed May 10, 2024
1 parent b9fb4e2 commit af19328
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,20 @@
<div class="rounded-0 alert alert-warning w100 m-0 px-1">
<div class="container">
<span class="font-weight-bold">
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
{{'system-wide-alert-banner.countdown.prefix' | translate }}
</span>
<span *ngIf="(countDownDays|async) > 0">
{{'system-wide-alert-banner.countdown.days' | translate: {
days: countDownDays|async
} }}
</span>
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
{{'system-wide-alert-banner.countdown.hours' | translate: {
hours: countDownHours| async
} }}
</span>
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
{{'system-wide-alert-banner.countdown.minutes' | translate: {
minutes: countDownMinutes|async
} }}
</span>
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
{{ 'system-wide-alert-banner.countdown.prefix' | translate }}
</span>
<span *ngIf="(countDownDays|async) > 0">
{{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
</span>
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
{{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
</span>
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
{{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
</span>
</span>
<span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
</div>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,42 @@ <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
<div class="row mb-2">
<div class="col">
<ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
[uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
[checked]="formActive.value"
(change)="setActive($event)"></ui-switch>
[uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
[checked]="formActive.value" (change)="setActive($event)"></ui-switch>
</div>
</div>
<div class="row">
<div class="col">
<label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
<textarea id="formMessage" rows="5"
[className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
formControlName="formMessage">
[className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
formControlName="formMessage">
</textarea>
<div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
class="invalid-feedback show-feedback">
<span *ngIf="formMessage.errors">
{{ 'system-wide-alert.form.error.message' | translate }}
</span>
class="invalid-feedback show-feedback">
<span *ngIf="formMessage.errors">
{{ 'system-wide-alert.form.error.message' | translate }}
</span>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col mb-2 d-flex align-items-end">
<ui-switch size="small"
[ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
[checked]="counterEnabled$ |async"
(change)="setCounterEnabled($event)"></ui-switch>
<ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
[checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
<span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
</div>
</div>
<div *ngIf="counterEnabled$ |async">
<div class="row">
<div class="col-sm-12 col-md-6">
<div class="input-group">
<input
class="form-control"
placeholder="yyyy-mm-dd"
name="dp"
[(ngModel)]="date"
[minDate]="minDate"
ngbDatepicker
#d="ngbDatepicker"
(ngModelChange)="updatePreviewTime()"
/>
<input class="form-control" 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">
(click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
</button>
</div>
</div>
Expand All @@ -68,49 +57,38 @@ <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
</div>
</div>
<div class="mb-2">
<span class="text-muted"> {{'system-wide-alert.form.label.countdownTo.hint' | translate}}</span>
<span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
</div>


<div *ngIf="formMessage.value">
<div class="row">
<div class="col">
<label>{{ 'system-wide-alert.form.label.preview' | translate }}</label>
<label>{{ 'system-wide-alert.form.label.preview' | translate}}</label>
</div>
</div>
<div class="rounded-0 alert alert-warning">
<span class="font-weight-bold">
<span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
{{'system-wide-alert-banner.countdown.prefix' | translate }}
</span>
<span *ngIf="previewDays > 0">
{{'system-wide-alert-banner.countdown.days' | translate: {
days: previewDays
} }}
</span>
<span *ngIf="previewDays > 0 || previewHours > 0 ">
{{'system-wide-alert-banner.countdown.hours' | translate: {
hours: previewHours
} }}
</span>
<span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
{{'system-wide-alert-banner.countdown.minutes' | translate: {
minutes: previewMinutes
} }}
</span>
<span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
{{ 'system-wide-alert-banner.countdown.prefix' | translate }}
</span>
<span *ngIf="previewDays > 0">
{{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
</span>
<span *ngIf="previewDays > 0 || previewHours > 0 ">
{{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
</span>
<span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
{{ 'system-wide-alert-banner.countdown.minutes' | translate: { 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()"
class="btn btn-outline-secondary"><i
class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
<button class="btn btn-primary" [disabled]="alertForm.invalid"
(click)="save()">
<i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
<button (click)="back()" class="btn btn-outline-secondary">
<i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
</button>
<button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
<i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
</button>
</div>

</div>
</div>

0 comments on commit af19328

Please sign in to comment.