forked from 4Science/dspace-angular
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged dspace-cris-2023_02_x into DSC-1111-latest-version-maintenance
- Loading branch information
Showing
24 changed files
with
282 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...o/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <h2 class="mb-3">{{ 'info.end-user-agreement.head' | translate }}</h2> | ||
|
|
||
| <ds-markdown-viewer [value]="userAgreementText$ | async"></ds-markdown-viewer> | ||
| <ds-markdown-viewer [value]="(userAgreementText$ | async)"></ds-markdown-viewer> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 35 additions & 34 deletions
69
...er/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,44 @@ | ||
| <div [formGroup]="group" class="input-group"> | ||
|
|
||
| <input ngbDatepicker class="form-control date-input" #datepicker="ngbDatepicker" | ||
| [attr.aria-labelledby]="'label_' + model.id" | ||
| [class.is-invalid]="showErrorMessages" | ||
| [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])" | ||
| [id]="id" | ||
| [firstDayOfWeek]="model.getAdditional('firstDayOfWeek', config['firstDayOfWeek'])" | ||
| [formControlName]="model.id" | ||
| [maxDate]="model.max" | ||
| [minDate]="model.min" | ||
| [name]="model.name" | ||
| [navigation]="model.getAdditional('navigation', config['navigation'])" | ||
| [ngClass]="getClass('element', 'control')" | ||
| [outsideDays]="model.getAdditional('outsideDays', config['outsideDays'])" | ||
| [placeholder]="model.placeholder" | ||
| [placement]="model.getAdditional('placement', 'bottom-left')" | ||
| [weekdays]="model.getAdditional('showWeekdays', config['showWeekdays'])" | ||
| [showWeekNumbers]="model.getAdditional('showWeekNumbers', config['showWeekNumbers'])" | ||
| [startDate]="model.focusedDate" | ||
| [value]="getInitDate()" | ||
| (blur)="onBlur($event)" | ||
| (dateSelect)="onChange($event)" | ||
| (change)="onChange($event)" | ||
| (focus)="onFocus($event)"> | ||
| <input ngbDatepicker class="form-control date-input" #datepicker="ngbDatepicker" | ||
| [attr.aria-labelledby]="'label_' + model.id" | ||
| [class.is-invalid]="showErrorMessages" | ||
| [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])" | ||
| [id]="id" | ||
| [firstDayOfWeek]="model.getAdditional('firstDayOfWeek', config['firstDayOfWeek'])" | ||
| [formControlName]="model.id" | ||
| [maxDate]="model.max" | ||
| [minDate]="model.min" | ||
| [name]="model.name" | ||
| [navigation]="model.getAdditional('navigation', config['navigation'])" | ||
| [ngClass]="getClass('element', 'control')" | ||
| [outsideDays]="model.getAdditional('outsideDays', config['outsideDays'])" | ||
| [placeholder]="model.placeholder" | ||
| [placement]="model.getAdditional('placement', 'bottom-left')" | ||
| [weekdays]="model.getAdditional('showWeekdays', config['showWeekdays'])" | ||
| [showWeekNumbers]="model.getAdditional('showWeekNumbers', config['showWeekNumbers'])" | ||
| [startDate]="model.focusedDate" | ||
| [value]="formattedDate" | ||
| (blur)="onBlur($event)" | ||
| (dateSelect)="onChange($event)" | ||
| (change)="onChange($event)" | ||
| (focus)="onFocus($event)" | ||
| > | ||
|
|
||
| <div class="input-group-append"> | ||
| <div class="input-group-append"> | ||
|
|
||
| <button class="btn btn-outline-secondary" | ||
| type="button" | ||
| [attr.aria-labelledby]="'label_' + model.id" | ||
| [class.disabled]="model.disabled" | ||
| [disabled]="model.disabled" | ||
| (click)="datepicker.toggle()"> | ||
| <button class="btn btn-outline-secondary" | ||
| type="button" | ||
| [attr.aria-labelledby]="'label_' + model.id" | ||
| [class.disabled]="model.disabled" | ||
| [disabled]="model.disabled" | ||
| (click)="datepicker.toggle()"> | ||
|
|
||
| <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i> | ||
| <span *ngIf="model.toggleLabel">{{ model.toggleLabel }}</span> | ||
| <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i> | ||
| <span *ngIf="model.toggleLabel">{{ model.toggleLabel }}</span> | ||
|
|
||
| </button> | ||
| </button> | ||
|
|
||
| </div> | ||
| </div> | ||
|
|
||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.