Skip to content

Commit b41723c

Browse files
[DURACOM-507] adapt translation prefix, add dso-edit-menu where context menu was, add min width for dynamic thumbnail component
1 parent f96a169 commit b41723c

9 files changed

Lines changed: 46 additions & 34 deletions

File tree

src/app/dynamic-layout/dynamic-layout-leading/dynamic-layout-leading.component.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<div id="dynamic-layout-leading" class="d-flex flex-column mt-5 mb-3">
2-
<div class="container text-end mb-3">
3-
@if (showContextMenu) {
4-
<!-- TODO: replace context menu with DSpace menu -->
5-
}
6-
</div>
2+
@if (showContextMenu) {
3+
<div class="container d-flex justify-content-end mb-3">
4+
<ds-dso-edit-menu></ds-dso-edit-menu>
5+
</div>
6+
}
7+
78
@if (tab) {
89
<ds-dynamic-layout-matrix [tab]="tab" [item]="item"></ds-dynamic-layout-matrix>
910
}

src/app/dynamic-layout/dynamic-layout-leading/dynamic-layout-leading.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import {
66

77
import { DynamicLayoutTab } from '../../core/layout/models/tab.model';
88
import { Item } from '../../core/shared/item.model';
9+
import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
910
import { DynamicLayoutMatrixComponent } from '../dynamic-layout-matrix/dynamic-layout-matrix.component';
1011

1112
@Component({
1213
selector: 'ds-dynamic-layout-leading',
1314
templateUrl: './dynamic-layout-leading.component.html',
1415
styleUrls: ['./dynamic-layout-leading.component.scss'],
1516
imports: [
17+
DsoEditMenuComponent,
1618
DynamicLayoutMatrixComponent,
1719
],
1820
})

src/app/dynamic-layout/dynamic-layout-loader/dynamic-layout-horizontal/dynamic-layout-horizontal.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<div class="pt-4">
44
<div class="d-flex flex-column">
55
@if (showContextMenu) {
6-
<div class="container text-end mb-3">
7-
<!-- TODO: replace context menu with DSpace menu -->
6+
<div class="container d-flex justify-content-end mb-3">
7+
<ds-dso-edit-menu></ds-dso-edit-menu>
88
</div>
99
}
1010
@if (selectedTab$.value) {

src/app/dynamic-layout/dynamic-layout-loader/dynamic-layout-horizontal/dynamic-layout-horizontal.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { DynamicLayoutTab } from '@dspace/core/layout/models/tab.model';
77
import { Item } from '@dspace/core/shared/item.model';
88
import { BehaviorSubject } from 'rxjs';
99

10+
import { DsoEditMenuComponent } from '../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
1011
import { DynamicLayoutMatrixComponent } from '../../dynamic-layout-matrix/dynamic-layout-matrix.component';
1112
import { DynamicLayoutNavbarComponent } from './dynamic-layout-navbar/dynamic-layout-navbar.component';
1213

@@ -16,6 +17,7 @@ import { DynamicLayoutNavbarComponent } from './dynamic-layout-navbar/dynamic-la
1617
styleUrls: ['./dynamic-layout-horizontal.component.scss'],
1718
imports: [
1819
AsyncPipe,
20+
DsoEditMenuComponent,
1921
DynamicLayoutMatrixComponent,
2022
DynamicLayoutNavbarComponent,
2123
],

src/app/dynamic-layout/dynamic-layout-loader/dynamic-layout-vertical/dynamic-layout-vertical.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<div class="vertical-layout">
44
<ds-dynamic-layout-sidebar (selectedTabChange)="selectedTabChanged($event)" [showNav]="tabs.length > 1" [tabs]="tabs" [item]="item">
55
@if (showContextMenu) {
6-
<div class="container text-end mb-3" [class.px-0]="tabs?.length > 1">
7-
<!-- TODO: replace context menu with DSpace menu -->
6+
<div class="container d-flex justify-content-end mb-3" [class.px-0]="tabs?.length > 1">
7+
<ds-dso-edit-menu></ds-dso-edit-menu>
88
</div>
99
}
1010
<ds-dynamic-layout-matrix [showCellPadding]="tabs?.length <= 1" [tab]="(selectedTab$ | async)" [item]="item"></ds-dynamic-layout-matrix>

src/app/dynamic-layout/dynamic-layout-loader/dynamic-layout-vertical/dynamic-layout-vertical.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
Observable,
1111
} from 'rxjs';
1212

13+
import { DsoEditMenuComponent } from '../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
1314
import { HostWindowService } from '../../../shared/host-window.service';
1415
import { DynamicLayoutMatrixComponent } from '../../dynamic-layout-matrix/dynamic-layout-matrix.component';
1516
import { DynamicLayoutNavbarComponent } from '../dynamic-layout-horizontal/dynamic-layout-navbar/dynamic-layout-navbar.component';
@@ -21,6 +22,7 @@ import { DynamicLayoutSidebarComponent } from './dynamic-layout-sidebar/dynamic-
2122
styleUrls: ['./dynamic-layout-vertical.component.scss'],
2223
imports: [
2324
AsyncPipe,
25+
DsoEditMenuComponent,
2426
DynamicLayoutMatrixComponent,
2527
DynamicLayoutNavbarComponent,
2628
DynamicLayoutSidebarComponent,
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@if ((initialized | async)) {
2-
<ds-thumbnail data-test="thumbnail"
3-
[thumbnail]="thumbnail$ | async"
4-
[defaultImage]="default$ | async">
5-
</ds-thumbnail>
2+
<div class="thumbnail-container">
3+
<ds-thumbnail data-test="thumbnail"
4+
[thumbnail]="thumbnail$ | async"
5+
[defaultImage]="default$ | async">
6+
</ds-thumbnail>
7+
</div>
68
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.thumbnail-container {
2+
min-width: var(--ds-thumbnail-max-width);
3+
}

src/assets/i18n/en.json5

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,47 +1791,47 @@
17911791

17921792
"curation-task.task.citationpage.label": "Generate Citation Page",
17931793

1794-
"cris-layout.toggle.open": "Open section",
1794+
"dynamic-layout.toggle.open": "Open section",
17951795

1796-
"cris-layout.toggle.close": "Close section",
1796+
"dynamic-layout.toggle.close": "Close section",
17971797

1798-
"cris-layout.toggle.aria.open": "Expand {{sectionHeader}} section",
1798+
"dynamic-layout.toggle.aria.open": "Expand {{sectionHeader}} section",
17991799

1800-
"cris-layout.toggle.aria.close": "Collapse {{sectionHeader}} section",
1800+
"dynamic-layout.toggle.aria.close": "Collapse {{sectionHeader}} section",
18011801

1802-
"cris-layout.advanced-attachment.dc.title": "Name",
1802+
"dynamic-layout.advanced-attachment.dc.title": "Name",
18031803

1804-
"cris-layout.advanced-attachment.size": "Size",
1804+
"dynamic-layout.advanced-attachment.size": "Size",
18051805

1806-
"cris-layout.advanced-attachment.checksum": "Checksum",
1806+
"dynamic-layout.advanced-attachment.checksum": "Checksum",
18071807

1808-
"cris-layout.advanced-attachment.checksum.info.MD5": "The <b>MD5 message-digest algorithm</b> can be used to verify the integrity of the file that you have uploaded. You can calculate its value locally via tools that are generally available in each operative system like <b>md5sum</b>",
1808+
"dynamic-layout.advanced-attachment.checksum.info.MD5": "The <b>MD5 message-digest algorithm</b> can be used to verify the integrity of the file that you have uploaded. You can calculate its value locally via tools that are generally available in each operative system like <b>md5sum</b>",
18091809

1810-
"cris-layout.advanced-attachment.format": "Format",
1810+
"dynamic-layout.advanced-attachment.format": "Format",
18111811

1812-
"cris-layout.advanced-attachment.dc.type": "Type",
1812+
"dynamic-layout.advanced-attachment.dc.type": "Type",
18131813

1814-
"cris-layout.advanced-attachment.dc.description": "Description",
1814+
"dynamic-layout.advanced-attachment.dc.description": "Description",
18151815

1816-
"cris-layout.advanced-attachment.no_thumbnail": "No Thumbnail Available",
1816+
"dynamic-layout.advanced-attachment.no_thumbnail": "No Thumbnail Available",
18171817

1818-
"cris-layout.advanced-attachment.download": "Download",
1818+
"dynamic-layout.advanced-attachment.download": "Download",
18191819

1820-
"cris-layout.advanced-attachment.requestACopy": "Request a copy",
1820+
"dynamic-layout.advanced-attachment.requestACopy": "Request a copy",
18211821

1822-
"cris-layout.advanced-attachment.viewMore": "View More",
1822+
"dynamic-layout.advanced-attachment.viewMore": "View More",
18231823

1824-
"cris-layout.advanced-attachment.label.not-present": "(not present)",
1824+
"dynamic-layout.advanced-attachment.label.not-present": "(not present)",
18251825

1826-
"cris-layout.attachment.viewMore": "View More",
1826+
"dynamic-layout.attachment.viewMore": "View More",
18271827

1828-
"cris-layout.rendering.collections.owning-collection.label": "Owning collection",
1828+
"dynamic-layout.rendering.collections.owning-collection.label": "Owning collection",
18291829

1830-
"cris-layout.rendering.collections.mapped-collection.label": "Mapped collections",
1830+
"dynamic-layout.rendering.collections.mapped-collection.label": "Mapped collections",
18311831

1832-
"cris-layout.rendering.collections.loading": "Loading...",
1832+
"dynamic-layout.rendering.collections.loading": "Loading...",
18331833

1834-
"cris-layout.rendering.collections.load-more": "Load more",
1834+
"dynamic-layout.rendering.collections.load-more": "Load more",
18351835

18361836
"curation-task.task.checklinks.label": "Check Links in Metadata",
18371837

0 commit comments

Comments
 (0)