diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 4260568a7e..ddaf0a8119 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -109,6 +109,16 @@ "link": { "simple": "Simple item page", "full": "Full item page" + }, + "journal": { + "search": { + "title": "Articles in this journal" + } + }, + "person": { + "search": { + "title": "Articles by this author" + } } }, "select": { diff --git a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts b/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts index 77ed54d67f..cca1bd76cd 100644 --- a/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts +++ b/src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts @@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel @rendersItemType('JournalIssue', ItemViewMode.Full) @Component({ selector: 'ds-journal-issue', - styleUrls: ['./journal-issue.component.scss'], - templateUrl: './journal-issue.component.html' + styleUrls: ['./themes/journal-issue.component.mantis.scss'], + templateUrl: './themes/journal-issue.component.mantis.html' }) /** * The component for displaying metadata and relations of an item of the type Journal Issue diff --git a/src/app/+item-page/simple/item-types/journal-issue/themes/journal-issue.component.mantis.html b/src/app/+item-page/simple/item-types/journal-issue/themes/journal-issue.component.mantis.html new file mode 100644 index 0000000000..bae579410f --- /dev/null +++ b/src/app/+item-page/simple/item-types/journal-issue/themes/journal-issue.component.mantis.html @@ -0,0 +1,72 @@ +
+
+
+ + +
+

+ +

+
+
+ + + + + + +
+
+ + + + + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
\ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/journal-issue/themes/journal-issue.component.mantis.scss b/src/app/+item-page/simple/item-types/journal-issue/themes/journal-issue.component.mantis.scss new file mode 100644 index 0000000000..8c2e9baf5d --- /dev/null +++ b/src/app/+item-page/simple/item-types/journal-issue/themes/journal-issue.component.mantis.scss @@ -0,0 +1,30 @@ +@import '../../../../../../styles/variables.scss'; + +:host { + > * { + display: block; + padding-top: $content-spacing; + padding-bottom: $content-spacing; + } + + .top-item-page { + background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } +} \ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts b/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts index 616d96178a..dd9b026d52 100644 --- a/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts +++ b/src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts @@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel @rendersItemType('JournalVolume', ItemViewMode.Full) @Component({ selector: 'ds-journal-volume', - styleUrls: ['./journal-volume.component.scss'], - templateUrl: './journal-volume.component.html' + styleUrls: ['./themes/journal-volume.component.mantis.scss'], + templateUrl: './themes/journal-volume.component.mantis.html' }) /** * The component for displaying metadata and relations of an item of the type Journal Volume diff --git a/src/app/+item-page/simple/item-types/journal-volume/themes/journal-volume.component.mantis.html b/src/app/+item-page/simple/item-types/journal-volume/themes/journal-volume.component.mantis.html new file mode 100644 index 0000000000..75ff6ad358 --- /dev/null +++ b/src/app/+item-page/simple/item-types/journal-volume/themes/journal-volume.component.mantis.html @@ -0,0 +1,61 @@ +
+
+
+ + +
+

+ +

+
+
+ + + + + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
\ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/journal-volume/themes/journal-volume.component.mantis.scss b/src/app/+item-page/simple/item-types/journal-volume/themes/journal-volume.component.mantis.scss new file mode 100644 index 0000000000..8c2e9baf5d --- /dev/null +++ b/src/app/+item-page/simple/item-types/journal-volume/themes/journal-volume.component.mantis.scss @@ -0,0 +1,30 @@ +@import '../../../../../../styles/variables.scss'; + +:host { + > * { + display: block; + padding-top: $content-spacing; + padding-bottom: $content-spacing; + } + + .top-item-page { + background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } +} \ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.html b/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.html index 26fe5ce416..371b8dbb00 100644 --- a/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.html +++ b/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.html @@ -1,8 +1,7 @@
- -
+
@@ -45,10 +44,10 @@
-
+
-
+
@@ -57,6 +56,11 @@
- - +
+
+

{{"item.page.journal.search.title" | translate}}

+
+ + +
\ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.scss b/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.scss index a6da279f5e..ff69a658ae 100644 --- a/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.scss +++ b/src/app/+item-page/simple/item-types/journal/themes/journal.component.mantis.scss @@ -1,11 +1,38 @@ @import '../../../../../../styles/variables.scss'; + :host { > * { display: block; - padding-top: $spacer; - padding-bottom: $spacer; + padding-top: $content-spacing; + padding-bottom: $content-spacing; } + .top-item-page { background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } + + .search-container { + margin-bottom: $spacer; + @media screen and (max-width: map-get($grid-breakpoints, lg)) { + width: 100%; + max-width: none; + } } } \ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts b/src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts index 96dc9a5960..13ebfea421 100644 --- a/src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts +++ b/src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts @@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel @rendersItemType('OrgUnit', ItemViewMode.Full) @Component({ selector: 'ds-orgunit', - styleUrls: ['./orgunit.component.scss'], - templateUrl: './orgunit.component.html' + styleUrls: ['./themes/orgunit.component.mantis.scss'], + templateUrl: './themes/orgunit.component.mantis.html' }) /** * The component for displaying metadata and relations of an item of the type Organisation Unit diff --git a/src/app/+item-page/simple/item-types/orgunit/themes/orgunit.component.mantis.html b/src/app/+item-page/simple/item-types/orgunit/themes/orgunit.component.mantis.html new file mode 100644 index 0000000000..5837f24e15 --- /dev/null +++ b/src/app/+item-page/simple/item-types/orgunit/themes/orgunit.component.mantis.html @@ -0,0 +1,75 @@ +
+
+
+ + +
+

+ +

+
+
+ + + + + + + + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
diff --git a/src/app/+item-page/simple/item-types/orgunit/themes/orgunit.component.mantis.scss b/src/app/+item-page/simple/item-types/orgunit/themes/orgunit.component.mantis.scss new file mode 100644 index 0000000000..8c2e9baf5d --- /dev/null +++ b/src/app/+item-page/simple/item-types/orgunit/themes/orgunit.component.mantis.scss @@ -0,0 +1,30 @@ +@import '../../../../../../styles/variables.scss'; + +:host { + > * { + display: block; + padding-top: $content-spacing; + padding-bottom: $content-spacing; + } + + .top-item-page { + background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } +} \ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/person/person.component.ts b/src/app/+item-page/simple/item-types/person/person.component.ts index 67a2ae7a2e..fe02f1f0ee 100644 --- a/src/app/+item-page/simple/item-types/person/person.component.ts +++ b/src/app/+item-page/simple/item-types/person/person.component.ts @@ -12,8 +12,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel @rendersItemType('Person', ItemViewMode.Full) @Component({ selector: 'ds-person', - styleUrls: ['./person.component.scss'], - templateUrl: './person.component.html' + styleUrls: ['./themes/person.component.mantis.scss'], + templateUrl: './themes/person.component.mantis.html' }) /** * The component for displaying metadata and relations of an item of the type Person diff --git a/src/app/+item-page/simple/item-types/person/themes/person.component.mantis.html b/src/app/+item-page/simple/item-types/person/themes/person.component.mantis.html new file mode 100644 index 0000000000..530a1662a4 --- /dev/null +++ b/src/app/+item-page/simple/item-types/person/themes/person.component.mantis.html @@ -0,0 +1,85 @@ +
+
+
+ + +
+

+ +

+
+
+ + + + + + + + +
+
+ + + + + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+

{{"item.page.person.search.title" | translate}}

+
+ + +
\ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/person/themes/person.component.mantis.scss b/src/app/+item-page/simple/item-types/person/themes/person.component.mantis.scss new file mode 100644 index 0000000000..ff69a658ae --- /dev/null +++ b/src/app/+item-page/simple/item-types/person/themes/person.component.mantis.scss @@ -0,0 +1,38 @@ +@import '../../../../../../styles/variables.scss'; + +:host { + > * { + display: block; + padding-top: $content-spacing; + padding-bottom: $content-spacing; + } + + .top-item-page { + background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } + + .search-container { + margin-bottom: $spacer; + @media screen and (max-width: map-get($grid-breakpoints, lg)) { + width: 100%; + max-width: none; + } + } +} \ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/project/project.component.ts b/src/app/+item-page/simple/item-types/project/project.component.ts index eafef36307..72841c6e6e 100644 --- a/src/app/+item-page/simple/item-types/project/project.component.ts +++ b/src/app/+item-page/simple/item-types/project/project.component.ts @@ -12,8 +12,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel @rendersItemType('Project', ItemViewMode.Full) @Component({ selector: 'ds-project', - styleUrls: ['./project.component.scss'], - templateUrl: './project.component.html' + styleUrls: ['./themes/project.component.mantis.scss'], + templateUrl: './themes/project.component.mantis.html' }) /** * The component for displaying metadata and relations of an item of the type Project diff --git a/src/app/+item-page/simple/item-types/project/themes/project.component.mantis.html b/src/app/+item-page/simple/item-types/project/themes/project.component.mantis.html new file mode 100644 index 0000000000..db614e3a24 --- /dev/null +++ b/src/app/+item-page/simple/item-types/project/themes/project.component.mantis.html @@ -0,0 +1,76 @@ +
+
+
+ + +
+

+ +

+
+
+ + + + + + +
+
+ + + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ diff --git a/src/app/+item-page/simple/item-types/project/themes/project.component.mantis.scss b/src/app/+item-page/simple/item-types/project/themes/project.component.mantis.scss new file mode 100644 index 0000000000..8c2e9baf5d --- /dev/null +++ b/src/app/+item-page/simple/item-types/project/themes/project.component.mantis.scss @@ -0,0 +1,30 @@ +@import '../../../../../../styles/variables.scss'; + +:host { + > * { + display: block; + padding-top: $content-spacing; + padding-bottom: $content-spacing; + } + + .top-item-page { + background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } +} \ No newline at end of file diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.ts b/src/app/+item-page/simple/item-types/publication/publication.component.ts index 8798b3c1cf..5e872177f9 100644 --- a/src/app/+item-page/simple/item-types/publication/publication.component.ts +++ b/src/app/+item-page/simple/item-types/publication/publication.component.ts @@ -15,8 +15,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel @rendersItemType(DEFAULT_ITEM_TYPE, ItemViewMode.Full) @Component({ selector: 'ds-publication', - styleUrls: ['./publication.component.scss'], - templateUrl: './publication.component.html', + styleUrls: ['./themes/publication.component.mantis.scss'], + templateUrl: './themes/publication.component.mantis.html', changeDetection: ChangeDetectionStrategy.OnPush, }) export class PublicationComponent extends ItemComponent implements OnInit { diff --git a/src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.html b/src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.html new file mode 100644 index 0000000000..6b6f484183 --- /dev/null +++ b/src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.html @@ -0,0 +1,83 @@ +
+
+
+ + +
+ +
+
+ + + + + + + + + + + +
+
+ + + + + + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
diff --git a/src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.scss b/src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.scss new file mode 100644 index 0000000000..8c2e9baf5d --- /dev/null +++ b/src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.scss @@ -0,0 +1,30 @@ +@import '../../../../../../styles/variables.scss'; + +:host { + > * { + display: block; + padding-top: $content-spacing; + padding-bottom: $content-spacing; + } + + .top-item-page { + background-color: $gray-100; + margin-top: -$content-spacing; + } + + .relationships-item-page { + padding-bottom: $content-spacing - $spacer; + } + + ds-metadata-field-wrapper { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + flex: 1; + padding-right: $spacer/2; + } + + ds-thumbnail { + display: block; + max-width: $thumbnail-max-width; + } + } +} \ No newline at end of file diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 7fc11e9f89..a6221b809e 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -31,6 +31,8 @@ body { .main-content { z-index: $main-z-index; flex: 1 1 100%; + margin-top: $content-spacing; + margin-bottom: $content-spacing; } .alert.hide { diff --git a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html index aff19aec1d..d467edfb21 100644 --- a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html +++ b/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html @@ -12,6 +12,7 @@ class="item-list-authors"> + ; diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 89470965c8..6cd6e727d6 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -32,3 +32,5 @@ $submission-sections-margin-bottom: .5rem !default; $edit-item-button-min-width: 100px; $edit-item-metadata-field-width: 190px; $edit-item-language-field-width: 43px; + +$thumbnail-max-width: 175px;