hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-13 04:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix code alignment

Browse Source 
(cherry picked from commit af193282da)
This commit is contained in:
Abel Gómez
2024-05-10 02:10:37 +02:00
committed by github-actions[bot]
parent 7a364fddeb
commit 40b4df6354
2 changed files with 46 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
View File

@@ -2,26 +2,20 @@
<div class="rounded-0 alert alert-warning w100 m-0 px-1"> <div class="rounded-0 alert alert-warning w100 m-0 px-1">
<div class="container"> <div class="container">
<span class="font-weight-bold"> <span class="font-weight-bold">
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 "> <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
{{'system-wide-alert-banner.countdown.prefix' | translate }} {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
</span> </span>
<span *ngIf="(countDownDays|async) > 0"> <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 ">
</span> {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
<span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 "> </span>
{{'system-wide-alert-banner.countdown.hours' | translate: { <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
hours: countDownHours| async {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
} }} </span>
</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>
<span [innerHTML]="(systemWideAlert$ |async)?.message"></span> <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
</div> </div>
</div> </div>
</div> </div>

88
src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
View File

@@ -5,23 +5,22 @@
<div class="row mb-2"> <div class="row mb-2">
<div class="col"> <div class="col">
<ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate" <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
[uncheckedLabel]="'system-wide-alert.form.label.inactive' | 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> </div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label> <label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
<textarea id="formMessage" rows="5" <textarea id="formMessage" rows="5"
[className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'" [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
formControlName="formMessage"> formControlName="formMessage">
</textarea> </textarea>
<div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)" <div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
class="invalid-feedback show-feedback"> class="invalid-feedback show-feedback">
<span *ngIf="formMessage.errors"> <span *ngIf="formMessage.errors">
{{ 'system-wide-alert.form.error.message' | translate }} {{ 'system-wide-alert.form.error.message' | translate }}
</span> </span>
</div> </div>
</div> </div>
</div> </div>
@@ -29,10 +28,8 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col mb-2 d-flex align-items-end"> <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> <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
</div> </div>
</div> </div>
@@ -40,18 +37,10 @@
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-6"> <div class="col-sm-12 col-md-6">
<div class="input-group"> <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" <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> </button>
</div> </div>
</div> </div>
@@ -68,49 +57,38 @@
</div> </div>
</div> </div>
<div class="mb-2"> <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>
<div *ngIf="formMessage.value"> <div *ngIf="formMessage.value">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<label>{{ 'system-wide-alert.form.label.preview' | translate }}</label> <label>{{ 'system-wide-alert.form.label.preview' | translate}}</label>
</div> </div>
</div> </div>
<div class="rounded-0 alert alert-warning"> <div class="rounded-0 alert alert-warning">
<span class="font-weight-bold"> <span class="font-weight-bold">
<span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 "> <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
{{'system-wide-alert-banner.countdown.prefix' | translate }} {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
</span> </span>
<span *ngIf="previewDays > 0"> <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 ">
</span> {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
<span *ngIf="previewDays > 0 || previewHours > 0 "> </span>
{{'system-wide-alert-banner.countdown.hours' | translate: { <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
hours: previewHours {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
} }} </span>
</span>
<span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
{{'system-wide-alert-banner.countdown.minutes' | translate: {
minutes: previewMinutes
} }}
</span>
</span> </span>
<span [innerHTML]="formMessage.value"></span> <span [innerHTML]="formMessage.value"></span>
</div> </div>
</div> </div>
<div class="btn-row float-right space-children-mr mt-2"> <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 }}
<i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
</button> </button>
</div> </div>
</div>
</div>