From 757b9f9dcdb4f6c9b3919f36000ce635d64ad8ba Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 25 Nov 2019 14:18:21 +0100 Subject: [PATCH] 66156: Persons and Projects search tabs on OrgUnit pages + mantis fix --- resources/i18n/en.json5 | 6 ++++++ .../item-pages/org-unit/org-unit.component.html | 14 ++++++++++++++ .../org-unit.component.html} | 17 +++++++++++++++++ .../org-unit.component.scss} | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) rename themes/mantis/app/entity-groups/research-entities/item-pages/{orgunit/orgunit.component.html => org-unit/org-unit.component.html} (81%) rename themes/mantis/app/entity-groups/research-entities/item-pages/{orgunit/orgunit.component.scss => org-unit/org-unit.component.scss} (86%) diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index 80a7648476..da58d2010c 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -822,6 +822,10 @@ "item.page.relationships.isJournalOfPublication": "Publications", + "item.page.relationships.isOrgUnitOfPerson": "Persons", + + "item.page.relationships.isOrgUnitOfProject": "Projects", + "item.page.subject": "Keywords", "item.page.uri": "URI", @@ -1272,6 +1276,8 @@ "project.page.titleprefix": "Research Project: ", + "project.search.results.head": "Project Search Results", + "publication.listelement.badge": "Publication", diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 4d97868b58..c9227338eb 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -49,4 +49,18 @@ +
+ + +
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html similarity index 81% rename from themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html rename to themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 15529a1bd5..4603b8d327 100644 --- a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html +++ b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -74,3 +74,20 @@ +
+
+ + +
+
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss similarity index 86% rename from themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss rename to themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss index 54651aede0..4a1d2516da 100644 --- a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss +++ b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss @@ -1,4 +1,4 @@ -@import 'src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss'; +@import 'src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss'; :host { > * {