diff --git a/portal-4cli-lib/.angular-cli.json b/portal-4cli-lib/.angular-cli.json index 975ee350..331842ff 100644 --- a/portal-4cli-lib/.angular-cli.json +++ b/portal-4cli-lib/.angular-cli.json @@ -9,7 +9,7 @@ "outDir": "dist/browser", "assets": [ "assets", - "favicon.ico" + "robots.txt" ], "index": "index.html", "main": "main.ts", @@ -38,7 +38,7 @@ "outDir": "dist/server", "assets": [ "assets", - "favicon.ico" + "robots.txt" ], "index": "index.html", "main": "main.server.ts", diff --git a/portal-4cli-lib/explore-production-properties.json b/portal-4cli-lib/explore-production-properties.json index 6005ae48..9f1eecb3 100644 --- a/portal-4cli-lib/explore-production-properties.json +++ b/portal-4cli-lib/explore-production-properties.json @@ -1,4 +1,5 @@ { + "productionMode" : false, "enablePiwikTrack" : true, "enableHelper" : true, "useCache" : true, @@ -37,8 +38,6 @@ "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout", - "cookieDomain" :".openaire.eu", "feedbackmail" :"openaire.test@gmail.com", @@ -65,6 +64,7 @@ "searchLinkToProject" : "/search/project?projectId=", "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", "searchLinkToDataset" : "/search/dataset?datasetId=", + "searchLinkToOrp" : "/search/other?orpId=", "searchLinkToOrganization" : "/search/organization?organizationId=", "searchLinkToPublications" : "/search/find/publications", @@ -88,10 +88,8 @@ "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - "searchLinkToAdvancedPeople" : "/search/advanced/people", - "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", - "showLastIndexInformationLink" : true, - - "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=" + "showLastIndexInformationLink" : false, + "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + "claimsInformationLink": "https://beta.openaire.eu/linking" } diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.component.ts index d2e13bf5..dbac58fe 100644 --- a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.component.ts @@ -1,11 +1,13 @@ import {Component, ViewChild, Input} from '@angular/core'; import {Location} from '@angular/common'; import {Observable} from 'rxjs/Observable'; +import {ActivatedRoute} from '@angular/router'; +import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; @Component({ selector: 'openaire-claims-admin', template: ` - + `, @@ -13,4 +15,16 @@ import {Observable} from 'rxjs/Observable'; }) export class OpenaireClaimsAdminComponent { + claimsInfoURL:string; + + constructor (private route: ActivatedRoute) { + + } + public ngOnInit() { + this.route.data + .subscribe((data: { envSpecific: EnvProperties }) => { + this.claimsInfoURL = data.envSpecific.claimsInformationLink; + + }); + } } diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims.component.ts b/portal-4cli-lib/src/app/claims/myClaims/myClaims.component.ts index 2bd997be..bfbb69e8 100644 --- a/portal-4cli-lib/src/app/claims/myClaims/myClaims.component.ts +++ b/portal-4cli-lib/src/app/claims/myClaims/myClaims.component.ts @@ -1,21 +1,29 @@ import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Observable'; +import {ActivatedRoute} from '@angular/router'; +import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; + @Component({ selector: 'openaire-my-claims', template: ` - + ` }) export class OpenaireMyClaimsComponent { - constructor () { + claimsInfoURL:string; + + constructor (private route: ActivatedRoute) { } - ngOnInit() { - - } + public ngOnInit() { + this.route.data + .subscribe((data: { envSpecific: EnvProperties }) => { + this.claimsInfoURL = data.envSpecific.claimsInformationLink; + }); + } } diff --git a/portal-4cli-lib/src/app/home/home.component.html b/portal-4cli-lib/src/app/home/home.component.html index 8a9bf4ca..c1ac6f41 100644 --- a/portal-4cli-lib/src/app/home/home.component.html +++ b/portal-4cli-lib/src/app/home/home.component.html @@ -41,7 +41,7 @@ - +
@@ -414,7 +414,7 @@ Explore all OA research results. Link all your research. Build your profile

- + OpenAIRE.EXPLORE

diff --git a/portal-4cli-lib/src/app/home/home.component.ts b/portal-4cli-lib/src/app/home/home.component.ts index a4802c4d..283675ed 100644 --- a/portal-4cli-lib/src/app/home/home.component.ts +++ b/portal-4cli-lib/src/app/home/home.component.ts @@ -19,6 +19,7 @@ import { RouterHelper} from '../openaireLibrary/utils/routerHelper.class'; import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service'; @Component({ selector: 'home', @@ -61,17 +62,19 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr; private _searchOrganizationsService: SearchOrganizationsService, private _refineFieldResultsService:RefineFieldResultsService, private location: Location, private _piwikService:PiwikService, - private config: ConfigurationService, private _meta: Meta, private _title: Title + private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService ) { - var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects "; + var description = "openAIRE explore, open access, publications, research results, European commission, search"; - var title = "OpenAIRE"; + var title = "OpenAIRE | Explore"; this._title.setTitle(title); this._meta.updateTag({content:description},"name='description'"); this._meta.updateTag({content:description},"property='og:description'"); this._meta.updateTag({content:title},"property='og:title'"); + this.seoService.createLinkForCanonicalURL(false); + //this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); } diff --git a/portal-4cli-lib/src/app/home/home.module.ts b/portal-4cli-lib/src/app/home/home.module.ts index 8328760e..c986f152 100644 --- a/portal-4cli-lib/src/app/home/home.module.ts +++ b/portal-4cli-lib/src/app/home/home.module.ts @@ -20,6 +20,8 @@ import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refin import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module'; +import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module'; @@ -34,7 +36,8 @@ import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module PiwikServiceModule, HomeRoutingModule, HelperModule, - ErrorMessagesModule + ErrorMessagesModule, + Schema2jsonldModule, SEOServiceModule ], declarations: [ HomeComponent diff --git a/portal-4cli-lib/src/app/searchPages/find/search.component.ts b/portal-4cli-lib/src/app/searchPages/find/search.component.ts index 2eb4d835..bfa55ace 100644 --- a/portal-4cli-lib/src/app/searchPages/find/search.component.ts +++ b/portal-4cli-lib/src/app/searchPages/find/search.component.ts @@ -2,8 +2,9 @@ import {Component, ViewChild, ElementRef} from '@angular/core'; @Component({ selector: 'openaire-search-find', - template: ` - + template: ` + + `, }) export class OpenaireSearchComponent{ diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index c26541b5..322a59f7 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -1,4 +1,5 @@ { + "productionMode" : false, "enablePiwikTrack" : false, "enableHelper" : true, "useCache" : false, @@ -95,5 +96,6 @@ "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", "showLastIndexInformationLink" : true, - "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=" + "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + "claimsInformationLink": "https://www.openaire.eu/linking-beta" } diff --git a/portal-4cli-lib/src/assets/explore-custom.css b/portal-4cli-lib/src/assets/explore-custom.css index a50a128f..9d7969ad 100644 --- a/portal-4cli-lib/src/assets/explore-custom.css +++ b/portal-4cli-lib/src/assets/explore-custom.css @@ -12,8 +12,8 @@ --explore-portal-lower-tone: #a0462c; --provide-portal-lower-tone: #3A8FA3; - --monitor-portal-lower-tone: #b48536; - --connect-portal-lower-tone: #7c9144; + --monitor-portal-lower-tone: #7c9144; + --connect-portal-lower-tone: #b48536; --develop-portal-lower-tone: #9f4e7e; } diff --git a/portal-4cli-lib/src/assets/sitemap.xml b/portal-4cli-lib/src/assets/sitemap.xml index 4284145a..393b33aa 100644 --- a/portal-4cli-lib/src/assets/sitemap.xml +++ b/portal-4cli-lib/src/assets/sitemap.xml @@ -5,11 +5,6 @@ weekly 0.5 - - - weekly - 0.5 - weekly diff --git a/portal-4cli-lib/src/index.html b/portal-4cli-lib/src/index.html index 83bf9e2b..951bd022 100644 --- a/portal-4cli-lib/src/index.html +++ b/portal-4cli-lib/src/index.html @@ -7,13 +7,13 @@ - + - - + + - + @@ -69,42 +69,14 @@ $(document).ready(function(){ - - - - - - - - - - @@ -129,7 +101,7 @@ $(document).ready(function(){ return n&&n.parentNode&&n.parentNode.removeChild(n),n=document[d+"NS"]&&document.documentElement.namespaceURI,n=n?document[d+"NS"](n,"script"):document[d]("script"),n[m]("id",e),n[m]("src",t),(document[c]("head")[0]||document[c]("body")[0]).appendChild(n),n=new Image,void n[m]("src","https://d1uo4w7k31k5mn.cloudfront.net/donut/0.png") }; - + diff --git a/portal-4cli-lib/src/robots.txt b/portal-4cli-lib/src/robots.txt new file mode 100644 index 00000000..e44c1d47 --- /dev/null +++ b/portal-4cli-lib/src/robots.txt @@ -0,0 +1,4 @@ +User-Agent: * +Disallow: /cache +Disallow: /upload +Disallow: /