Skip to content

Commit ed28f8e

Browse files
alexandrevryghemalexandrevryghem
committed
Merge branch 'fix/5604-viewport-initial-scale-contribute-9.0' into fix/5604-viewport-initial-scale
# Conflicts: # src/app/item-page/full/field-components/file-section/full-file-section.component.html
2 parents d929c2c + e4d5c7d commit ed28f8e

17 files changed

Lines changed: 90 additions & 95 deletions

File tree

‎src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</button>
3232
}
3333
</div>
34-
<div role="table" [attr.aria-label]="'item.edit.head' | translate">
34+
<div class="overflow-auto" role="table" [attr.aria-label]="'item.edit.head' | translate">
3535
<ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
3636
@if (form.newValue) {
3737
<div class="d-flex flex-row ds-field-row" role="row">

‎src/app/footer/footer.component.scss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,20 @@
4343
}
4444
}
4545
ul {
46+
flex-direction: column;
47+
48+
@media screen and (min-width: map-get($grid-breakpoints, md)) {
49+
flex-direction: row;
50+
}
51+
4652
li {
4753
display: inline-flex;
4854

4955
a, .btn-link {
5056
padding: 0 calc(var(--bs-spacer) / 2);
5157
color: inherit;
5258
font-size: .875em;
59+
margin: 0 auto;
5360

5461
&:focus {
5562
box-shadow: none;

‎src/app/item-page/full/field-components/file-section/full-file-section.component.html‎

Lines changed: 46 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,9 @@ <h3 class="h5 simple-view-element-header">
99
<ds-pagination [hideGear]="true" [hidePagerWhenSinglePage]="true" [paginationOptions]="originalOptions"
1010
[collectionSize]="originals?.totalElements" [retainScrollPosition]="true">
1111
@for (file of originals?.page; track file) {
12-
<div class="file-section row mb-3">
13-
<div class="col-3">
14-
<ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
15-
</div>
16-
<div class="col-7">
17-
<dl class="row dont-break-out">
18-
<dt class="col-md-4">
19-
{{ "item.page.filesection.name" | translate }}
20-
</dt>
21-
<dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
22-
<dt class="col-md-4">
23-
{{ "item.page.filesection.size" | translate }}
24-
</dt>
25-
<dd class="col-md-8">{{ file.sizeBytes | dsFileSize }}</dd>
26-
<dt class="col-md-4">
27-
{{ "item.page.filesection.format" | translate }}
28-
</dt>
29-
<dd class="col-md-8">
30-
{{ (file.format | async)?.payload?.description }}
31-
</dd>
32-
@if (file.hasMetadata('dc.description')) {
33-
<dt class="col-md-4">
34-
{{ "item.page.filesection.description" | translate }}
35-
</dt>
36-
<dd class="col-md-8" [dsMetadata]="file.firstMetadata('dc.description')">
37-
</dd>
38-
}
39-
</dl>
40-
</div>
41-
<div class="col-2">
42-
<ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
43-
<span class="d-none d-md-inline">
44-
{{ "item.page.filesection.download" | translate }}
45-
</span>
46-
</ds-file-download-link>
47-
</div>
48-
</div>
12+
<ng-container [ngTemplateOutlet]="fileSection"
13+
[ngTemplateOutletContext]="{ file : file }">
14+
</ng-container>
4915
}
5016
</ds-pagination>
5117
}
@@ -62,45 +28,53 @@ <h3 class="h5 simple-view-element-header">
6228
<ds-pagination [hideGear]="true" [hidePagerWhenSinglePage]="true" [paginationOptions]="licenseOptions"
6329
[collectionSize]="licenses?.totalElements" [retainScrollPosition]="true">
6430
@for (file of licenses?.page; track file) {
65-
<div class="file-section row">
66-
<div class="col-3">
67-
<ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
68-
</div>
69-
<div class="col-7">
70-
<dl class="row">
71-
<dt class="col-md-4">
72-
{{ "item.page.filesection.name" | translate }}
73-
</dt>
74-
<dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
75-
<dt class="col-md-4">
76-
{{ "item.page.filesection.size" | translate }}
77-
</dt>
78-
<dd class="col-md-8">{{ file.sizeBytes | dsFileSize }}</dd>
79-
<dt class="col-md-4">
80-
{{ "item.page.filesection.format" | translate }}
81-
</dt>
82-
<dd class="col-md-8">
83-
{{ (file.format | async)?.payload?.description }}
84-
</dd>
85-
<dt class="col-md-4">
86-
{{ "item.page.filesection.description" | translate }}
87-
</dt>
88-
<dd class="col-md-8" [dsMetadata]="file.firstMetadata('dc.description')">
89-
</dd>
90-
</dl>
91-
</div>
92-
<div class="col-2">
93-
<ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
94-
<span class="d-none d-md-inline">
95-
{{ "item.page.filesection.download" | translate }}
96-
</span>
97-
</ds-file-download-link>
98-
</div>
99-
</div>
31+
<ng-container [ngTemplateOutlet]="fileSection"
32+
[ngTemplateOutletContext]="{ file : file }">
33+
</ng-container>
10034
}
10135
</ds-pagination>
10236
}
10337
</div>
10438
}
10539
</div>
10640
</ds-metadata-field-wrapper>
41+
42+
<ng-template #fileSection let-file="file">
43+
<div class="file-section row mb-3">
44+
<div class="col-3">
45+
<ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
46+
</div>
47+
<div class="col-7">
48+
<dl class="row dont-break-out">
49+
<dt class="col-md-4">
50+
{{ "item.page.filesection.name" | translate }}
51+
</dt>
52+
<dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
53+
<dt class="col-md-4">
54+
{{ "item.page.filesection.size" | translate }}
55+
</dt>
56+
<dd class="col-md-8">{{ file.sizeBytes | dsFileSize }}</dd>
57+
<dt class="col-md-4">
58+
{{ "item.page.filesection.format" | translate }}
59+
</dt>
60+
<dd class="col-md-8">
61+
{{ (file.format | async)?.payload?.description }}
62+
</dd>
63+
@if (file.hasMetadata('dc.description')) {
64+
<dt class="col-md-4">
65+
{{ "item.page.filesection.description" | translate }}
66+
</dt>
67+
<dd class="col-md-8" [dsMetadata]="file.firstMetadata('dc.description')">
68+
</dd>
69+
}
70+
</dl>
71+
</div>
72+
<div class="col-2">
73+
<ds-file-download-link [showIcon]="true" [bitstream]="file" [item]="item" cssClasses="btn btn-outline-primary btn-download">
74+
<span class="d-none d-md-inline">
75+
{{ "item.page.filesection.download" | translate }}
76+
</span>
77+
</ds-file-download-link>
78+
</div>
79+
</div>
80+
</ng-template>

‎src/app/item-page/full/field-components/file-section/full-file-section.component.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { AsyncPipe } from '@angular/common';
1+
import {
2+
AsyncPipe,
3+
NgTemplateOutlet,
4+
} from '@angular/common';
25
import {
36
Component,
47
Inject,
@@ -57,6 +60,7 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
5760
FileSizePipe,
5861
MetadataDirective,
5962
MetadataFieldWrapperComponent,
63+
NgTemplateOutlet,
6064
PaginationComponent,
6165
ThemedFileDownloadLinkComponent,
6266
ThemedThumbnailComponent,

‎src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@if ((moreThanOne$ | async) !== true) {
22
<div class="add">
3-
<button class="btn btn-lg btn-outline-primary mt-1 ms-2"
3+
<button class="btn btn-lg btn-outline-primary"
44
[attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
55
(click)="openPage(singleEntity)" role="button"
66
title="{{'mydspace.new-submission-external' | translate}}">
@@ -12,7 +12,7 @@
1212
<div class="add w-100" display="dynamic" placement="bottom-right"
1313
ngbDropdown
1414
>
15-
<button class="btn btn-lg btn-outline-primary mt-1 ms-2" id="dropdownImport" ngbDropdownToggle
15+
<button class="btn btn-lg btn-outline-primary" id="dropdownImport" ngbDropdownToggle
1616
type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
1717
[attr.aria-label]="'mydspace.new-submission-external' | translate"
1818
[attr.data-test]="'import-dropdown' | dsBrowserOnly"

‎src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@if ((moreThanOne$ | async) !== true) {
22
<div class="add">
3-
<button class="btn btn-lg btn-primary mt-1 ms-2" [attr.aria-label]="'mydspace.new-submission' | translate"
3+
<button class="btn btn-lg btn-primary" [attr.aria-label]="'mydspace.new-submission' | translate"
44
[dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
55
<i class="fa fa-plus-circle" aria-hidden="true"></i>
66
</button>
@@ -10,7 +10,7 @@
1010
<div class="add w-100" display="dynamic" placement="bottom-right"
1111
ngbDropdown
1212
>
13-
<button class="btn btn-lg btn-primary mt-1 ms-2" id="dropdownSubmission" ngbDropdownToggle
13+
<button class="btn btn-lg btn-primary" id="dropdownSubmission" ngbDropdownToggle
1414
type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
1515
[attr.aria-label]="'mydspace.new-submission' | translate"
1616
[attr.data-test]="'submission-dropdown' | dsBrowserOnly"

‎src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55
[uploadFilesOptions]="uploadFilesOptions"
66
(onCompleteItem)="onCompleteItem($event)"
77
(onUploadError)="onUploadError($event)"
8-
(onFileSelected)="afterFileLoaded($event)"></ds-uploader>
8+
(onFileSelected)="afterFileLoaded($event)"></ds-uploader>
99
}
1010

1111
</div>
12-
<div class="add">
13-
<ds-my-dspace-new-submission-dropdown></ds-my-dspace-new-submission-dropdown>
14-
</div>
15-
<div class="add">
16-
<ds-my-dspace-new-external-dropdown></ds-my-dspace-new-external-dropdown>
17-
</div>
18-
12+
<ds-my-dspace-new-submission-dropdown></ds-my-dspace-new-submission-dropdown>
13+
<ds-my-dspace-new-external-dropdown></ds-my-dspace-new-external-dropdown>
1914
</div>

‎src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.parent {
22
display: flex;
3+
flex-wrap: wrap;
4+
justify-content: end;
5+
gap: calc(var(--ds-content-spacing) / 2);
36
}
47

58
.upload {

‎src/app/profile-page/profile-page.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h1>{{'profile.title' | translate}}</h1>
6060
<h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
6161
<ul class="list-group list-group-flush">
6262
@for (group of groups; track group) {
63-
<li class="list-group-item">{{ dsoNameService.getName(group) }}</li>
63+
<li class="list-group-item text-break">{{ dsoNameService.getName(group) }}</li>
6464
}
6565
</ul>
6666
</div>

‎src/app/shared/search-form/search-form.component.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<input type="text" [(ngModel)]="query" name="query" class="form-control"
1313
[attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
1414
[placeholder]="searchPlaceholder" tabindex="0">
15-
<button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly" role="button" tabindex="0"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
15+
<button [attr.aria-label]="'search.form.search' | translate" type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly" role="button" tabindex="0">
16+
<i aria-hidden="true" class="fas fa-search"></i>
17+
<span class="d-none d-sm-inline ms-1">{{ ('search.form.search' | translate) }}</span>
18+
</button>
1619
</div>
1720
</div>
1821
</form>

0 commit comments

Comments
 (0)