diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html index a1faa171..dff6ac40 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/claims/claim-utils/displayClaims/displayClaims.component.html @@ -1,4 +1,4 @@ - +
@@ -107,8 +107,13 @@ [externalPortalUrl]=externalPortalUrl [source]="true">
- available - pending + available + + pending
Claimed by: diff --git a/claims/claim-utils/displayClaims/displayClaims.component.ts b/claims/claim-utils/displayClaims/displayClaims.component.ts index 1bcc1e21..ebc6badd 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.ts +++ b/claims/claim-utils/displayClaims/displayClaims.component.ts @@ -30,7 +30,7 @@ declare var UIkit; }) export class DisplayClaimsComponent { @Input() piwikSiteId = null; - @Input() title: string = ""; + @Input() pageTitle: string = ""; properties: EnvProperties; public searchTermStream = new Subject(); subscriptions: any = []; @@ -113,11 +113,11 @@ export class DisplayClaimsComponent { this.sortOptions.push( {label:"User (asc) ", value:{ sort: "user",descending:false }}) } var description = "Openaire, linking, claim, publication, research data, software, other research product, project, community"; - this.updateTitle(this.title); + this.updateTitle(this.pageTitle); this.updateDescription(description); this.updateUrl(this.url); if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe()); + this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe()); } this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => { diff --git a/claims/claimsAdmin/claimsAdmin.component.ts b/claims/claimsAdmin/claimsAdmin.component.ts index 045b4426..34735396 100644 --- a/claims/claimsAdmin/claimsAdmin.component.ts +++ b/claims/claimsAdmin/claimsAdmin.component.ts @@ -24,7 +24,7 @@ import {Subscriber} from "rxjs"; [fetchId]="(fetchId=='openaire')?null:fetchId" [communityId]="(fetchBy && fetchBy == 'Context' && fetchId && fetchId!='openaire')?fetchId:null" [externalPortalUrl]=externalPortalUrl [claimsInfoURL]=claimsInfoURL - title="Manage links"> + pageTitle="Manage links">
diff --git a/claims/myClaims/myClaims.component.ts b/claims/myClaims/myClaims.component.ts index 43ebeb59..f705ac82 100644 --- a/claims/myClaims/myClaims.component.ts +++ b/claims/myClaims/myClaims.component.ts @@ -23,7 +23,7 @@ import {Subscriber} from "rxjs";
+ [piwikSiteId]="piwikSiteId" pageTitle="My links">
diff --git a/connect/community/CustomizationOptions.ts b/connect/community/CustomizationOptions.ts index ebaf1bbb..8b5360c7 100644 --- a/connect/community/CustomizationOptions.ts +++ b/connect/community/CustomizationOptions.ts @@ -42,10 +42,10 @@ export class CustomizationOptions { color: this.identity.mainColor, }, light : { - color: CustomizationOptions.getRGBA(this.identity.mainColor,0.1), + color: CustomizationOptions.getRGBA(this.identity.mainColor,0.05), }, form : { - color: CustomizationOptions.getRGBA(this.identity.mainColor,0.2), + color: CustomizationOptions.getRGBA(this.identity.mainColor,0.15), } }; diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index 94712434..0e0aaeee 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -4,7 +4,9 @@ import {properties} from "../../../environments/environment"; export class ConnectHelper { public static getCommunityFromDomain(domain: string): string{ - domain = "beta.covid-19.openaire.eu"; //for testing + if(properties.environment == "development") { + domain = "beta.enermaps.openaire.eu"; //for testing + } domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix if (domain.indexOf('openaire.eu') === -1) { return null; diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts index 9872d559..29c53dce 100644 --- a/services/searchResearchResults.service.ts +++ b/services/searchResearchResults.service.ts @@ -144,6 +144,7 @@ export class SearchResearchResultsService { url += "?format=json"; url += "&fq=" + params; url += "&sortBy=resultdateofacceptance,descending"; + url += "&fq=" + encodeURIComponent( "resultacceptanceyear <= " + (new Date()).getFullYear()); url += "&page=" + (page - 1) + "&size=" + size; return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url) diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html index 2edfd66c..a2d87437 100644 --- a/sharedComponents/bottom.component.html +++ b/sharedComponents/bottom.component.html @@ -150,7 +150,7 @@
  • News
  • Events
  • Blogs
    • -
  • Newsletters
    • +
  • Newsletters
  • Documents
    • @@ -207,7 +207,7 @@
    - + Newsletter