Skip to content

Commit cbb01c5

Browse files
alexandrevryghemalexandrevryghem
committed
Merge branch 'bootstrap-issues_contribute-9.0' into bootstrap-issues_contribute-9_x
2 parents 1bc47d0 + e3b5405 commit cbb01c5

File tree

67 files changed

+171
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+171
-224
lines changed

‎cypress/e2e/my-dspace.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ describe('My DSpace page', () => {
8484
cy.url().should('include', '/mydspace');
8585

8686
// Close any open notifications, to make sure they don't get in the way of next steps
87-
cy.get('[data-dismiss="alert"]').click({ multiple: true });
87+
cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
8888

8989
// This is the GET command that will actually run the search
9090
cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');

‎cypress/e2e/submission.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('New Submission page', () => {
9595
// A success alert should be visible
9696
cy.get('ds-notification div.alert-success').should('be.visible');
9797
// Now, dismiss any open alert boxes (may be multiple, as tests run quickly)
98-
cy.get('[data-dismiss="alert"]').click({ multiple: true });
98+
cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
9999

100100
// This is the GET command that will actually run the search
101101
cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');

‎src/app/access-control/group-registry/group-form/members-list/members-list.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h3 id="search" class="border-bottom pb-2">
8383

8484
<form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
8585
<div class="flex-grow-1 me-3">
86-
<div class="form-group input-group me-3">
86+
<div class="mb-3 input-group me-3">
8787
<input type="text" name="query" id="query" formControlName="query"
8888
class="form-control" aria-label="Search input">
8989
<span class="input-group-append">

‎src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
66
<!-- In the toggle section -->
77
@if (!isNewService) {
88
<div class="toggle-switch-container">
9-
<label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
9+
<label class="status-label fw-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
1010
<div>
1111
<input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
1212
<div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
@@ -17,7 +17,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
1717
}
1818
<!-- In the Name section -->
1919
<div class="mb-5">
20-
<label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
20+
<label for="name" class="fw-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
2121
<input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
2222
[placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
2323
formControlName="name"
@@ -33,7 +33,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
3333

3434
<!-- In the description section -->
3535
<div class="mb-5 mt-5 d-flex flex-column">
36-
<label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
36+
<label for="description" class="fw-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
3737
<textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
3838
class="form-control" formControlName="description" id="description" name="description"></textarea>
3939
</div>
@@ -42,7 +42,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
4242
<!-- In the url section -->
4343
<div class="d-flex align-items-center">
4444
<div class="d-flex flex-column w-50 me-2">
45-
<label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
45+
<label for="url" class="fw-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
4646
<input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
4747
[placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
4848
formControlName="url"
@@ -57,7 +57,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
5757
</div>
5858

5959
<div class="d-flex flex-column w-50">
60-
<label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
60+
<label for="score" class="fw-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
6161
<input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
6262
[placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
6363
id="score"
@@ -78,7 +78,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
7878

7979
<!-- In the IP range section -->
8080
<div class="mb-5 mt-5">
81-
<label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
81+
<label for="lowerIp" class="fw-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
8282
<div class="d-flex">
8383
<input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
8484
[placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
@@ -105,7 +105,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
105105

106106
<!-- In the ldnUrl section -->
107107
<div class="mb-5 mt-5">
108-
<label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
108+
<label for="ldnUrl" class="fw-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
109109
<input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
110110
[placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
111111
formControlName="ldnUrl"
@@ -130,7 +130,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
130130

131131
<!-- In the usesActorEmailId section -->
132132
<div class="mb-5 mt-5">
133-
<label class="status-label font-weight-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
133+
<label class="status-label fw-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
134134
<div>
135135
<input formControlName="usesActorEmailId" hidden id="usesActorEmailId"
136136
name="usesActorEmailId" type="checkbox">
@@ -149,14 +149,14 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
149149
@if (areControlsInitialized) {
150150
<div class="row mb-1 mt-5">
151151
<div class="col">
152-
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
152+
<label class="fw-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
153153
</div>
154154
@if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) {
155155
<div class="col">
156-
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
156+
<label class="fw-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
157157
</div>
158158
<div class="col-sm-1">
159-
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
159+
<label class="fw-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
160160
</div>
161161
}
162162
<div class="col-sm-2">
@@ -295,8 +295,8 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
295295
<span (click)="addInboundPattern()"
296296
class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
297297
<hr>
298-
<div class="form-group row">
299-
<div class="col text-right space-children-mr">
298+
<div class="mb-3 row">
299+
<div class="col text-end space-children-mr">
300300
<ng-content select="[before]"></ng-content>
301301
<button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
302302
<span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
@@ -317,9 +317,7 @@ <h4>{{'service.overview.edit.modal' | translate }}</h4>
317317
@if (isNewService) {
318318
<h4>{{'service.overview.create.modal' | translate }}</h4>
319319
}
320-
<button (click)="closeModal()" aria-label="Close"
321-
class="close" type="button">
322-
<span aria-hidden="true">×</span>
320+
<button (click)="closeModal()" aria-label="Close" class="btn-close" type="button">
323321
</button>
324322
</div>
325323

‎src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,15 @@ <h4>{{'service.overview.delete.header' | translate }}</h4>
7777
</div>
7878
<button (click)="closeModal()" aria-label="Close"
7979
[attr.aria-label]="'ldn-service-overview-close-modal' | translate"
80-
class="close" type="button">
81-
<span aria-hidden="true">×</span>
80+
class="btn-close" type="button">
8281
</button>
8382
</div>
8483

8584
<div class="modal-body">
8685
<div>
8786
{{ 'service.overview.delete.body' | translate }}
8887
</div>
89-
<div class="mt-4 text-right">
88+
<div class="mt-4 text-end">
9089
<button (click)="closeModal()"
9190
[attr.aria-label]="'ldn-service-overview-close-modal' | translate"
9291
class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>

‎src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<div class="modal-header">
22
<h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
3-
<button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
4-
<span aria-hidden="true">&times;</span>
3+
<button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
54
</button>
65
</div>
76
<div class="modal-body p-4">
87
@for (key of notifyMessageKeys; track key) {
98
<div>
109
<div class="row mb-4">
11-
<div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
12-
<div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
10+
<div class="fw-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
11+
<div class="col text-end">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
1312
</div>
1413
</div>
1514
}

‎src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="container my-4">
22
<div class="row">
3-
<div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound' : 'admin.notify.dashboard.outbound') | translate}}</div>
3+
<div class="col-12 col-md-3 text-start h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound' : 'admin.notify.dashboard.outbound') | translate}}</div>
44
<div class="col-md-9">
55
<div class="h4">
66
@if ((selectedSearchConfig$ | async) !== defaultConfiguration) {

‎src/app/admin/admin-reports/filtered-items/filtered-items.component.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
1515
<ds-loading></ds-loading>
1616
}
1717
@if ((loadingCollections$ | async) !== true) {
18-
<select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
18+
<select id="collSel" name="collSel" class="form-select" multiple="multiple" size="10" formControlName="collections">
1919
@for (item of collections; track item) {
2020
<option [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
2121
}
@@ -32,11 +32,11 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
3232
{{'admin.reports.items.section.metadataFieldQueries' | translate}}
3333
</ng-template>
3434
<ng-template ngbPanelContent>
35-
<fieldset id="predefqueries" class="form-group">
35+
<fieldset id="predefqueries" class="mb-3">
3636
<label>
3737
{{'admin.reports.items.predefinedQueries' | translate}}
3838
</label>
39-
<select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
39+
<select id="predefselect" formControlName="presetQuery" class="form-select" (change)="setPresetQuery()">
4040
@for (item of presetQueries; track item.id) {
4141
<option [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
4242
}
@@ -46,17 +46,17 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
4646
<div id="queries">
4747
@for (pred of queryPredicatesArray().controls; track pred; let i = $index) {
4848
<div class="metadata">
49-
<div [formGroup]="pred" class="form-group">
50-
<div class="form-row">
49+
<div [formGroup]="pred" class="mb-3">
50+
<div class="row">
5151
<div class="col-4">
52-
<select class="query-tool" formControlName="field" class="form-control">
52+
<select class="query-tool" formControlName="field" class="form-select">
5353
@for (item of metadataFieldsWithAny; track item) {
5454
<option [value]="item.id">{{item.name$ | async}}</option>
5555
}
5656
</select>
5757
</div>
5858
<div class="col-auto">
59-
<select class="query-tool" formControlName="operator" class="form-control">
59+
<select class="query-tool" formControlName="operator" class="form-select">
6060
@for (item of predicates; track item) {
6161
<option [value]="item.id">{{item.name$ | async | translate}}</option>
6262
}
@@ -86,25 +86,25 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
8686
{{'admin.reports.items.section.limitPaginateQueries' | translate}}
8787
</ng-template>
8888
<ng-template ngbPanelContent>
89-
<div class="row align-items-center">
89+
<div class="row align-items-center mb-3">
9090
<label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
9191
<div class="col-6">
92-
<select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
92+
<select id="limit" name="limit" formControlName="pageLimit" class="form-select col-6">
9393
@for (item of pageLimits; track item) {
9494
<option value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
9595
}
9696
</select>
9797
</div>
9898
</div>
99-
<div class="row align-items-center">
99+
<div class="row align-items-center mb-3">
100100
<label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
101101
<div class="col-6">
102102
<input id="offset" name="offset" value="0" class="form-control col-6">
103103
</div>
104104
</div>
105105
<div class="row">
106106
<span class="col-3"></span>
107-
<button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
107+
<button class="btn btn-primary col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
108108
</div>
109109
</ng-template>
110110
</ngb-panel>
@@ -130,7 +130,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
130130
</ng-template>
131131
<ng-template ngbPanelContent>
132132
<div id="show-fields">
133-
<select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
133+
<select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-select" formControlName="additionalFields">
134134
@for (item of metadataFields; track item) {
135135
<option [value]="item.id">{{item.name$ | async}}</option>
136136
}

‎src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {
22
AsyncPipe,
33
isPlatformBrowser,
4-
NgIf,
54
} from '@angular/common';
65
import {
76
ChangeDetectionStrategy,
@@ -45,7 +44,6 @@ import { PaginatedSearchOptions } from '../../shared/search/models/paginated-sea
4544
imports: [
4645
AsyncPipe,
4746
GeospatialMapComponent,
48-
NgIf,
4947
TranslateModule,
5048
],
5149
standalone: true,

‎src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[innerHTML]="mdRepresentation.getValue()"
2020
[ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
2121
@if (mdRepresentation.firstMetadata('person.identifier.orcid')) {
22-
<ds-orcid-badge-and-tooltip class="ml-1"
22+
<ds-orcid-badge-and-tooltip class="ms-1"
2323
[orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
2424
[authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
2525
</ds-orcid-badge-and-tooltip>

0 commit comments

Comments
 (0)