@@ -60,6 +60,10 @@ export class YouWeComponent implements AfterViewInit, AfterContentChecked, OnDes
public type: StakeholderEntities.FUNDER | StakeholderEntities.RI | StakeholderEntities.ORGANIZATION = StakeholderEntities.FUNDER;
@Input()
public id;
+ @Input()
+ titleClass: string = "uk-text-primary";
+ @Input()
+ backgroundClass: string = "uk-background-default uk-blur-background";
@ViewChild('sticky') sticky: ElementRef;
public isSticky: boolean = false;
public offset: number
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index f2e4218..5d7fdc3 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -235,7 +235,7 @@
tabTitle="{{stakeholderEntities.ORGANIZATIONS | titlecase}}">
-
+
-
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index c7c1aec..6c4a4d9 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit c7c1aec26ea7ff3decda4675a7bdb0e6ea83a4ae
+Subproject commit 6c4a4d9721030ad43ca7e4112a9bc8c548557123
diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts
index 6a82e17..d559e4f 100644
--- a/src/app/search-stakeholders/search-stakeholders.component.ts
+++ b/src/app/search-stakeholders/search-stakeholders.component.ts
@@ -100,7 +100,7 @@ export class SearchStakeholdersComponent {
this.searchPage.refineFields = this.refineFields;
this.searchLink = this.properties.searchLinkToStakeholders;
this.selectedFields = [];
- this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, null, params, "stakeholder", null);
+ this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap, null, params, "stakeholder", null);
let queryParams = params;
if (typeof document !== 'undefined') {
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
diff --git a/src/assets/common-assets b/src/assets/common-assets
index b68f375..8d2f834 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1
+Subproject commit 8d2f8348d8a601fad14844d920791fe7370bd4a2
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 7aa9e57..954a1fe 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 7aa9e577193e3a77415434fd5e6e856a21d5efeb
+Subproject commit 954a1fe8af0653740882c7db4b9bf92b8f9000f4
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index d486b5e..93dfb07 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -1,91 +1,17 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";
-export let properties: EnvProperties = {
+let props: EnvProperties = {
environment: "beta",
enablePiwikTrack: true,
- useCache: true,
- showContent: true,
- statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
- statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
- statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
- useNewStatistisTool: true,
- claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
- searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
- searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
- openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
- csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
- searchCrossrefAPIURL: "https://api.crossref.org/works",
- searchDataciteAPIURL: "https://api.datacite.org/works",
- searchOrcidURL: "https://pub.orcid.org/v2.1/",
- orcidURL: "https://orcid.org/",
- doiURL: "https://dx.doi.org/",
- pmcURL: "http://europepmc.org/articles/",
- pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
- handleURL: "http://hdl.handle.net/",
- cordisURL: "http://cordis.europa.eu/projects/",
- openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
- r3DataURL: "http://service.re3data.org/repository/",
- zenodo: "https://zenodo.org/",
- zenodoCommunities: "https://zenodo.org/api/communities/",
- helpdesk: "https://www.openaire.eu/support/helpdesk",
- utilsService: "https://demo.openaire.eu/utils-service",
- vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
- piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
- piwikSiteId: "298",
- registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
- loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
- userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
- logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
- cookieDomain: ".openaire.eu",
- feedbackmail: "feedback@openaire.eu",
- cacheUrl: "https://demo.openaire.eu/cache/get?url=",
- monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
- adminToolsCommunity: "monitor",
adminToolsPortalType: "monitor",
- datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
- contextsAPI: "https://beta.services.openaire.eu/openaire/context",
- communityAPI: "https://beta.services.openaire.eu/openaire/community/",
- communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities",
- csvLimit: 2000,
- pagingLimit: 20,
- resultsPerPage: 10,
- baseLink : "",
+ adminToolsCommunity: "monitor",
domain : "https://beta.monitor.openaire.eu",
afterLoginRedirectLink: '/my-dashboards',
- searchLinkToResult: "/search/result?id=",
- searchLinkToPublication: "/search/publication?articleId=",
- searchLinkToProject: "/search/project?projectId=",
- searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
- searchLinkToDataset: "/search/dataset?datasetId=",
- searchLinkToSoftwareLanding: "/search/software?softwareId=",
- searchLinkToOrganization: "/search/organization?organizationId=",
- searchLinkToOrp: "/search/other?orpId=",
- searchLinkToStakeholders: "/browse",
- searchLinkToResults: "/search/find/research-outcomes",
- searchLinkToDataProviders: "/search/find/dataproviders",
- searchLinkToProjects: "/search/find/projects",
- searchLinkToOrganizations: "/search/find/organizations",
- searchLinkToCompatibleDataProviders: "/search/content-providers",
- searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
- searchLinkToJournals: "/search/journals",
- searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
- searchLinkToAdvancedProjects: "/search/advanced/projects",
- searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
- searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
- errorLink: '/error',
- lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
- showLastIndexInformationLink: true,
- widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- claimsInformationLink: "https://beta.openaire.eu/linking",
- depositLearnHowPage: "/participate/deposit/learn-how",
- depositSearchPage: "/participate/deposit/search",
- shareInZenodoPage: "/participate/deposit/zenodo",
- reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
- admins: ["feedback@openaire.eu"],
- lastIndexUpdate: "2019-08-07",
- indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
- altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
- b2noteAPIURL: "http://b2note-dev.bsc.es/",
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
};
+
+export let properties: EnvProperties = {
+ ...common, ...commonBeta, ...props
+}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 87e21bc..58151ba 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,91 +1,17 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
-export let properties: EnvProperties = {
+let props: EnvProperties = {
environment: "production",
enablePiwikTrack: true,
- useCache: true,
- showContent: true,
- statisticsAPIURL: "https://services.openaire.eu/stats-api/",
- statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
- statisticsFrameNewAPIURL: "",
- useNewStatistisTool: false,
- claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
- searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
- searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
- openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
- csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
- searchCrossrefAPIURL: "https://api.crossref.org/works",
- searchDataciteAPIURL: "https://api.datacite.org/works",
- searchOrcidURL: "https://pub.orcid.org/v2.1/",
- orcidURL: "https://orcid.org/",
- doiURL: "https://dx.doi.org/",
- pmcURL: "http://europepmc.org/articles/",
- pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
- handleURL: "http://hdl.handle.net/",
- cordisURL: "http://cordis.europa.eu/projects/",
- openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
- r3DataURL: "http://service.re3data.org/repository/",
- zenodo: "https://zenodo.org/",
- zenodoCommunities: "https://zenodo.org/api/communities/",
- helpdesk: "https://www.openaire.eu/support/helpdesk",
- utilsService: "https://explore.openaire.eu/utils-service",
- vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
- piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
- piwikSiteId: "104",
- registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
- loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
- userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
- logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
- cookieDomain: ".openaire.eu",
- feedbackmail: "feedback@openaire.eu",
- cacheUrl: "https://explore.openaire.eu/cache/get?url=",
- datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
- monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/",
adminToolsPortalType: "monitor",
adminToolsCommunity: "monitor",
- contextsAPI: "https://services.openaire.eu/openaire/context",
- communityAPI: "https://services.openaire.eu/openaire/community/",
- communitiesAPI: "https://services.openaire.eu/openaire/community/communities",
- csvLimit: 2000,
- pagingLimit: 20,
- resultsPerPage: 10,
- baseLink : "",
domain : "https://monitor.openaire.eu",
afterLoginRedirectLink: '/my-dashboards',
- searchLinkToResult: "/search/result?id=",
- searchLinkToPublication: "/search/publication?articleId=",
- searchLinkToProject: "/search/project?projectId=",
- searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
- searchLinkToDataset: "/search/dataset?datasetId=",
- searchLinkToSoftwareLanding: "/search/software?softwareId=",
- searchLinkToOrp: "/search/other?orpId=",
- searchLinkToOrganization: "/search/organization?organizationId=",
- searchLinkToStakeholders: "/browse",
- searchLinkToResults: "/search/find/research-outcomes",
- searchLinkToDataProviders: "/search/find/dataproviders",
- searchLinkToProjects: "/search/find/projects",
- searchLinkToOrganizations: "/search/find/organizations",
- searchLinkToCompatibleDataProviders: "/search/content-providers",
- searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
- searchLinkToJournals: "/search/journals",
- searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
- searchLinkToAdvancedProjects: "/search/advanced/projects",
- searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
- searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
- errorLink: '/error',
- lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
- showLastIndexInformationLink: true,
- widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- claimsInformationLink: "https://www.openaire.eu/linking",
- depositLearnHowPage: "/participate/deposit/learn-how",
- depositSearchPage: "/participate/deposit/search",
- shareInZenodoPage: "/participate/deposit/zenodo",
- reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
- admins: ["feedback@openaire.eu"],
- lastIndexUpdate: "2019-07-24",
- indexInfoAPI: "https://services.openaire.eu/openaire/info/",
- altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
- b2noteAPIURL: "http://b2note-dev.bsc.es/",
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
};
+
+export let properties: EnvProperties = {
+ ...common, ...commonProd, ...props
+}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 88e3d67..6886d76 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,91 +1,19 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";
-export let properties: EnvProperties = {
+let props: EnvProperties = {
environment: "development",
enablePiwikTrack: false,
useCache: false,
showContent: true,
- statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
- statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
- statisticsFrameNewAPIURL: "http://88.197.53.71:8080/stats-api/",
- useNewStatistisTool: false,
- claimsAPIURL: "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
- searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
- searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
- openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
- csvAPIURL: "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports",
- searchCrossrefAPIURL: "https://api.crossref.org/works",
- searchDataciteAPIURL: "https://api.datacite.org/works",
- searchOrcidURL: "https://pub.orcid.org/v2.1/",
- orcidURL: "https://orcid.org/",
- doiURL: "https://dx.doi.org/",
- pmcURL: "http://europepmc.org/articles/",
- pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
- handleURL: "http://hdl.handle.net/",
- cordisURL: "http://cordis.europa.eu/projects/",
- openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
- r3DataURL: "http://service.re3data.org/repository/",
- zenodo: "https://zenodo.org/",
- zenodoCommunities: "https://zenodo.org/api/communities/",
- helpdesk: "https://www.openaire.eu/support/helpdesk",
- utilsService: "http://mpagasas.di.uoa.gr:8000",
- vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
- piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
- piwikSiteId: "298",
- registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
- loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
- userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
- logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
- cookieDomain: ".di.uoa.gr",
- feedbackmail: "openaire.test@gmail.com",
- cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
- monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service",
adminToolsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/",
adminToolsPortalType: "monitor",
adminToolsCommunity: "monitor",
- datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
- contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
- communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
- communitiesAPI: "https://dev-openaire.d4science.org/openaire/community/communities",
- csvLimit: 2000,
- pagingLimit: 20,
- resultsPerPage: 10,
- baseLink : "",
- domain : "http://dl170.madgik.di.uoa.gr/monitor",
+ domain : "http://mpagasas.di.uoa.gr:4000",
afterLoginRedirectLink: '/my-dashboards',
- searchLinkToResult: "/search/result?id=",
- searchLinkToPublication: "/search/publication?articleId=",
- searchLinkToProject: "/search/project?projectId=",
- searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
- searchLinkToDataset: "/search/dataset?datasetId=",
- searchLinkToSoftwareLanding: "/search/software?softwareId=",
- searchLinkToOrganization: "/search/organization?organizationId=",
- searchLinkToOrp: "/search/other?orpId=",
- searchLinkToStakeholders: "/browse",
- searchLinkToResults: "/search/find/research-outcomes",
- searchLinkToDataProviders: "/search/find/dataproviders",
- searchLinkToProjects: "/search/find/projects",
- searchLinkToOrganizations: "/search/find/organizations",
- searchLinkToCompatibleDataProviders: "/search/content-providers",
- searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
- searchLinkToJournals: "/search/journals",
- searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
- searchLinkToAdvancedProjects: "/search/advanced/projects",
- searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
- searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
- errorLink: '/error',
- lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
- showLastIndexInformationLink: true,
- widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- claimsInformationLink: "https://beta.openaire.eu/linking",
- depositLearnHowPage: "/participate/deposit/learn-how",
- depositSearchPage: "/participate/deposit/search",
- shareInZenodoPage: "/participate/deposit/zenodo",
- reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu",
- admins: ["kostis30fylloy@gmail.com"],
- lastIndexUpdate: "2019-05-16",
- indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
- altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
- b2noteAPIURL: "http://b2note-dev.bsc.es/",
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
};
+
+export let properties: EnvProperties = {
+ ...common, ...commonDev, ...props
+}