Skip to content

Commit 56e45a9

Browse files
117287: Fixed various layout issues
- The unthemed home news didn't stick to the header like the dspace theme - Impersonate user button has additional margin - Submission form loading icon is not translatable - Create resource policy page doesn't have the correct heading
1 parent 6c1212d commit 56e45a9

7 files changed

Lines changed: 14 additions & 17 deletions

File tree

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
3030
</div>
3131
}
3232
@if (canImpersonate$ | async) {
33-
<div between class="btn-group ms-1">
33+
<div between class="btn-group">
3434
@if (!isImpersonated) {
3535
<button class="btn btn-primary" type="button" (click)="impersonate()">
3636
<i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
AsyncPipe,
3-
NgClass,
4-
} from '@angular/common';
1+
import { AsyncPipe } from '@angular/common';
52
import {
63
ChangeDetectorRef,
74
Component,
@@ -84,7 +81,6 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
8481
FormComponent,
8582
AsyncPipe,
8683
TranslateModule,
87-
NgClass,
8884
ThemedLoadingComponent,
8985
PaginationComponent,
9086
RouterLink,

src/app/home-page/home-news/home-news.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
1+
<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-ncs mb-4">
22
<div class="container">
33
<div class="d-flex flex-wrap">
44
<div>

src/app/shared/resource-policies/create/resource-policy-create.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="container">
2-
<h4 class="mb-3">{{'resource-policies.create.page.heading' | translate}} {{targetResourceName}}</h4>
2+
<h1 class="mb-3">{{'resource-policies.create.page.heading' | translate}} {{targetResourceName}}</h1>
33

44
<ds-resource-policy-form [isProcessing]="isProcessing()"
55
(reset)="redirectToAuthorizationsPage()"

src/app/submission/form/submission-form.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
}
3131

3232
<div class="submission-form-content">
33-
@if ((isLoading$ | async)) {
34-
<ds-loading message="Loading..."></ds-loading>
33+
@if (isLoading$ | async) {
34+
<ds-loading [message]="'form.loading' | translate"></ds-loading>
3535
}
3636
@for (object of $any(submissionSections | async); track object) {
3737
<ds-submission-section-container [collectionId]="collectionId"

src/app/submission/form/submission-form.component.spec.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {
22
ChangeDetectorRef,
33
Component,
4-
NO_ERRORS_SCHEMA,
54
SimpleChange,
65
} from '@angular/core';
76
import {
@@ -10,6 +9,7 @@ import {
109
TestBed,
1110
waitForAsync,
1211
} from '@angular/core/testing';
12+
import { TranslateModule } from '@ngx-translate/core';
1313
import {
1414
cold,
1515
getTestScheduler,
@@ -31,12 +31,10 @@ import {
3131
mockSubmissionSelfUrl,
3232
mockSubmissionState,
3333
} from '../../shared/mocks/submission.mock';
34-
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
3534
import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
3635
import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
3736
import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
3837
import { createTestComponent } from '../../shared/testing/utils.test';
39-
import { ThemeService } from '../../shared/theme-support/theme.service';
4038
import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
4139
import { SectionsService } from '../sections/sections.service';
4240
import { VisibilityType } from '../sections/visibility-type';
@@ -47,7 +45,7 @@ import { SubmissionFormSectionAddComponent } from './section-add/submission-form
4745
import { SubmissionFormComponent } from './submission-form.component';
4846
import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/themed-submission-upload-files.component';
4947

50-
describe('SubmissionFormComponent Component', () => {
48+
describe('SubmissionFormComponent', () => {
5149

5250
let comp: SubmissionFormComponent;
5351
let compAsAny: any;
@@ -67,18 +65,19 @@ describe('SubmissionFormComponent Component', () => {
6765

6866
beforeEach(waitForAsync(() => {
6967
TestBed.configureTestingModule({
70-
imports: [SubmissionFormComponent, TestComponent,
68+
imports: [
69+
SubmissionFormComponent,
70+
TestComponent,
71+
TranslateModule.forRoot(),
7172
],
7273
providers: [
7374
{ provide: AuthService, useClass: AuthServiceStub },
7475
{ provide: HALEndpointService, useValue: new HALEndpointServiceStub('workspaceitems') },
7576
{ provide: SubmissionService, useValue: submissionServiceStub },
7677
{ provide: SectionsService, useValue: { isSectionTypeAvailable: () => observableOf(true) } },
77-
{ provide: ThemeService, useValue: getMockThemeService() },
7878
ChangeDetectorRef,
7979
SubmissionFormComponent,
8080
],
81-
schemas: [NO_ERRORS_SCHEMA],
8281
})
8382
.overrideComponent(SubmissionFormComponent, {
8483
remove: {

src/app/submission/form/submission-form.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
OnDestroy,
88
SimpleChanges,
99
} from '@angular/core';
10+
import { TranslatePipe } from '@ngx-translate/core';
1011
import isEqual from 'lodash/isEqual';
1112
import {
1213
Observable,
@@ -64,6 +65,7 @@ import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/
6465
ThemedSubmissionUploadFilesComponent,
6566
SubmissionFormCollectionComponent,
6667
SubmissionFormSectionAddComponent,
68+
TranslatePipe,
6769
],
6870
standalone: true,
6971
})

0 commit comments

Comments
 (0)