mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-16 14:33:03 +00:00
Merge remote-tracking branch 'remotes/origin/master' into submission
This commit is contained in:
@@ -481,5 +481,5 @@
|
|||||||
"browse": "browse",
|
"browse": "browse",
|
||||||
"queue-lenght": "Queue length",
|
"queue-lenght": "Queue length",
|
||||||
"processing": "Processing"
|
"processing": "Processing"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
@@ -58,7 +58,6 @@ export class AppComponent implements OnInit, AfterViewInit {
|
|||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private routeService: RouteService,
|
private routeService: RouteService,
|
||||||
private router: Router,
|
|
||||||
private cssService: CSSVariableService,
|
private cssService: CSSVariableService,
|
||||||
private menuService: MenuService,
|
private menuService: MenuService,
|
||||||
private windowService: HostWindowService
|
private windowService: HostWindowService
|
||||||
|
@@ -34,6 +34,7 @@ describe('ChipsComponent test suite', () => {
|
|||||||
imports: [
|
imports: [
|
||||||
NgbModule.forRoot(),
|
NgbModule.forRoot(),
|
||||||
SortablejsModule.forRoot({animation: 150}),
|
SortablejsModule.forRoot({animation: 150}),
|
||||||
|
TranslateModule.forRoot()
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
ChipsComponent,
|
ChipsComponent,
|
||||||
|
@@ -13,21 +13,21 @@
|
|||||||
<ng-template ngbPanelTitle>
|
<ng-template ngbPanelTitle>
|
||||||
<span class="float-left">{{ 'submission.sections.'+sectionData.header | translate }}</span>
|
<span class="float-left">{{ 'submission.sections.'+sectionData.header | translate }}</span>
|
||||||
<div class="d-inline-block float-right">
|
<div class="d-inline-block float-right">
|
||||||
<i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fa fa-exclamation-circle text-warning mr-3"
|
<i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-exclamation-circle text-warning mr-3"
|
||||||
aria-hidden="true"></i>
|
aria-hidden="true"></i>
|
||||||
<i *ngIf="(sectionRef.hasErrors())" class="fa fa-exclamation-circle text-danger mr-3"
|
<i *ngIf="(sectionRef.hasErrors())" class="fas fa-exclamation-circle text-danger mr-3"
|
||||||
aria-hidden="true"></i>
|
aria-hidden="true"></i>
|
||||||
<i *ngIf="(sectionRef.isValid() | async)" class="fa fa-check-circle text-success mr-3"
|
<i *ngIf="(sectionRef.isValid() | async)" class="fas fa-check-circle text-success mr-3"
|
||||||
aria-hidden="true"></i>
|
aria-hidden="true"></i>
|
||||||
<a class="close" aria-label="Close">
|
<a class="close" aria-label="Close">
|
||||||
<span *ngIf="sectionRef.isOpen()" class="fa fa-chevron-up fa-fw"
|
<span *ngIf="sectionRef.isOpen()" class="fas fa-chevron-up fa-fw"
|
||||||
aria-hidden="true"></span>
|
aria-hidden="true"></span>
|
||||||
<span *ngIf="!sectionRef.isOpen()" class="fa fa-chevron-down fa-fw"
|
<span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"
|
||||||
aria-hidden="true"></span>
|
aria-hidden="true"></span>
|
||||||
</a>
|
</a>
|
||||||
<a href="#" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
|
<a href="#" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
|
||||||
(click)="removeSection($event)">
|
(click)="removeSection($event)">
|
||||||
<i class="fa fa-trash-o" aria-hidden="true"></i>
|
<i class="fas fa-trash-o" aria-hidden="true"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
@@ -49,7 +49,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePicke
|
|||||||
label: 'submission.sections.upload.form.from-label',
|
label: 'submission.sections.upload.form.from-label',
|
||||||
placeholder: 'submission.sections.upload.form.from-placeholder',
|
placeholder: 'submission.sections.upload.form.from-placeholder',
|
||||||
inline: false,
|
inline: false,
|
||||||
toggleIcon: 'fa fa-calendar',
|
toggleIcon: 'fas fa-calendar',
|
||||||
relation: [
|
relation: [
|
||||||
{
|
{
|
||||||
action: 'ENABLE',
|
action: 'ENABLE',
|
||||||
@@ -73,7 +73,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerM
|
|||||||
label: 'submission.sections.upload.form.until-label',
|
label: 'submission.sections.upload.form.until-label',
|
||||||
placeholder: 'submission.sections.upload.form.until-placeholder',
|
placeholder: 'submission.sections.upload.form.until-placeholder',
|
||||||
inline: false,
|
inline: false,
|
||||||
toggleIcon: 'fa fa-calendar',
|
toggleIcon: 'fas fa-calendar',
|
||||||
relation: [
|
relation: [
|
||||||
{
|
{
|
||||||
action: 'ENABLE',
|
action: 'ENABLE',
|
||||||
|
Reference in New Issue
Block a user