diff --git a/searchPages/searchUtils/portal-search-result.component.less b/searchPages/searchUtils/portal-search-result.component.less
new file mode 100644
index 00000000..0381bcbf
--- /dev/null
+++ b/searchPages/searchUtils/portal-search-result.component.less
@@ -0,0 +1,23 @@
+@import (reference) "~src/assets/openaire-theme/less/color.less";
+
+.setType(@color) {
+ border-left: 4px solid fade(@color, 30%);
+
+ & .type {
+ color: @color;
+ }
+}
+
+.uk-card {
+ &.funder {
+ .setType(@funder-color);
+ }
+
+ &.ri {
+ .setType(@ri-color);
+ }
+
+ &.organization {
+ .setType(@organization-color);
+ }
+}
\ No newline at end of file
diff --git a/searchPages/searchUtils/portal-search-result.component.ts b/searchPages/searchUtils/portal-search-result.component.ts
index 28f0036f..dfc77c92 100644
--- a/searchPages/searchUtils/portal-search-result.component.ts
+++ b/searchPages/searchUtils/portal-search-result.component.ts
@@ -10,7 +10,8 @@ import {StringUtils} from '../../utils/string-utils.class';
@Component({
selector: 'portal-search-result',
- templateUrl: 'portal-search-result.component.html'
+ templateUrl: 'portal-search-result.component.html',
+ styleUrls: ['portal-search-result.component.less']
})
export class PortalSearchResultComponent implements OnInit{
diff --git a/sharedComponents/numbers/numbers.component.ts b/sharedComponents/numbers/numbers.component.ts
index a9a83872..c80d116a 100644
--- a/sharedComponents/numbers/numbers.component.ts
+++ b/sharedComponents/numbers/numbers.component.ts
@@ -143,7 +143,7 @@ interface Link {
`,
})
export class NumbersComponent implements OnInit, OnDestroy {
- @Input() colorClass = 'portal-color';
+ @Input() colorClass = 'uk-text-primary';
@Input() backgroundClass = null;
/** Add a value if you want to apply refine query*/
@Input() refineValue = null;
diff --git a/utils/email/composer.ts b/utils/email/composer.ts
index 7176f299..4fc023a1 100644
--- a/utils/email/composer.ts
+++ b/utils/email/composer.ts
@@ -77,7 +77,22 @@ export class Composer {
email.recipients = admins;
return email;
}
-
+
+ public static composeEmailForExplore(contactForm: any, admins: any): Email {
+ let email: Email = new Email();
+
+ email.subject = "OpenAIRE - Explore [" + properties.environment.toUpperCase() + "]";
+ email.body = "
"
+ + "
Name: " + contactForm.name + ""
+ + "
Surname: " + contactForm.surname + ""
+ + "
Email: " + contactForm.email + ""
+ + "
Affiliation: " + contactForm.affiliation ? contactForm.affiliation : '-' + ""
+ + "
" + contactForm.message + "
"
+ + "
";
+ email.recipients = admins;
+ return email;
+ }
+
public static composeEmailForUsageCounts(contactForm: any, admins: any): Email {
let email: Email = new Email();
diff --git a/utils/entities/adminTool/portal.ts b/utils/entities/adminTool/portal.ts
index 0c7f62c7..909d8930 100644
--- a/utils/entities/adminTool/portal.ts
+++ b/utils/entities/adminTool/portal.ts
@@ -184,8 +184,9 @@ export class Portal {
};;
};
- public static getMockCommunityInfo(disabledEntities:string[],disabledPages:string[]): any {
+ public static getMockCommunityInfo(pid: string, disabledEntities:string[],disabledPages:string[]): any {
let communityInfo = Object.assign({}, Portal.getmockPortalInfo());
+ communityInfo.pid = pid;
for(let disabledPage of disabledPages) {
for (var i = 0; i < communityInfo.pages.length; i++) {
if (communityInfo.pages[i].route == disabledPage) {
diff --git a/utils/staticAutoComplete/ISVocabularies.service.ts b/utils/staticAutoComplete/ISVocabularies.service.ts
index 13529713..8df594e5 100644
--- a/utils/staticAutoComplete/ISVocabularies.service.ts
+++ b/utils/staticAutoComplete/ISVocabularies.service.ts
@@ -46,11 +46,11 @@ export class ISVocabulariesService {
} else if (field == "access" && (entity == "publication" || entity == "dataset" || entity == "software" || entity == "other" || entity == "result")) {
vocabulary = "dnet:access_modes.json";
return this.getVocabularyFromServiceAsync(vocabulary, properties);
- } else if ((field == "type") && (entity == "dataprovider")) {
+ } else if ((field == "type") && (entity == "dataprovider" || entity == "service")) {
vocabulary = "dnet:datasource_typologies.json";
return this.getVocabularyFromServiceAsync(vocabulary, properties);
- } else if (field == "compatibility" && (entity == "dataprovider")) {
+ } else if (field == "compatibility" && (entity == "dataprovider" || entity == "service")) {
vocabulary = "dnet:datasourceCompatibilityLevel.json";
return this.getVocabularyFromServiceAsync(vocabulary, properties);
} else if (field == "country") {