diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts index 60fdc481..d5cc7e1f 100644 --- a/searchPages/searchUtils/entitiesSelection.component.ts +++ b/searchPages/searchUtils/entitiesSelection.component.ts @@ -99,10 +99,9 @@ export class EntitiesSelectionComponent { ngOnInit() { this.show = 0; if (this.properties) { - console.log(this.customFilter) + // console.log(this.customFilter) this.config.getCommunityInformation(this.properties, (this.customFilter && this.customFilter.queryFieldName == "communityId") ? this.customFilter.valueId : this.properties.adminToolsCommunity).subscribe(data => { var showEntity = {}; - console.log(data) for (var i = 0; i < data['entities'].length; i++) { showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"]; diff --git a/searchPages/searchUtils/searchPageTableView.component.ts b/searchPages/searchUtils/searchPageTableView.component.ts index 4f8ded06..d27b2fda 100644 --- a/searchPages/searchUtils/searchPageTableView.component.ts +++ b/searchPages/searchUtils/searchPageTableView.component.ts @@ -242,8 +242,8 @@ public getParametersFromUrl(params) { } } if(this.searchUtils.keyword.length > 0 ){ - allLimits+=(allLimits.length==0?"?":"&")+'keyword=' + this.searchUtils.keyword; - this.parameterNames.push("keyword"); + allLimits+=(allLimits.length==0?"?":"&")+'fv0=' + this.searchUtils.keyword; + this.parameterNames.push("fv0"); this.parameterValues.push(this.searchUtils.keyword); } diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html index 22e7735f..82e4cf14 100644 --- a/sharedComponents/bottom.component.html +++ b/sharedComponents/bottom.component.html @@ -1,90 +1,52 @@ -
-
-
-
-
-
- OpenAIRE +
+
+ +
+
+
+ OpenAIRE
-
+
+
+ flag black white low + +
- flag black white low - + flag black white low +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+
+
-
-
-
+
+
-
+
- -
+
+ +
-
+
- - + @@ -208,9 +185,13 @@ -   - - +   + + + {{' '}} + @@ -220,6 +201,15 @@ + + + + + + + +  Unless otherwise indicated, all materials created by OpenAIRE are licenced under CC ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
diff --git a/sharedComponents/bottom.component.ts b/sharedComponents/bottom.component.ts index 6a0dec1a..02a334f9 100644 --- a/sharedComponents/bottom.component.ts +++ b/sharedComponents/bottom.component.ts @@ -22,14 +22,20 @@ export class BottomComponent { // @Input() environment:string = "beta"; showPage ={}; @Input() grantAdvance:boolean = true; -grantAdvanceText = "OpenAIRE-Advance receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541." -grantConenctText = "OpenAIRE-Connect receives funding from the European Union's Horizon 2020 Research and Innovation programme under grant agreement No. 731011." +grantAdvanceText = "OpenAIRE-Advance receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541."; +grantConenctText = "OpenAIRE-Connect receives funding from the European Union's Horizon 2020 Research and Innovation programme under grant agreement No. 731011."; @Input() properties:EnvProperties; +@Input() darkBackground:boolean=true; +@Input() centered:boolean=false; +sectionClass= "uk-section-primary"; constructor(private config: ConfigurationService, private route: ActivatedRoute,) { } ngOnInit() { + if(!this.darkBackground){ + this.sectionClass= " footer-light-background"; + } this.route.queryParams.subscribe(params => { if(this.showMenuItems){ if( this.properties.adminToolsAPIURL && this.communityId ){ diff --git a/sharedComponents/searchBar/searchBar.component.ts b/sharedComponents/searchBar/searchBar.component.ts index 59265512..04454381 100644 --- a/sharedComponents/searchBar/searchBar.component.ts +++ b/sharedComponents/searchBar/searchBar.component.ts @@ -32,8 +32,6 @@ export class SearchBarComponent { // this.activeRouteEnabled = false; this.route.queryParams.subscribe(params => { - console.log("Init"); - console.log(params); this.parameters = Object.assign({}, params); this.entityType = "all"; if (params["type"] && params["type"].length > 0) { @@ -50,7 +48,6 @@ export class SearchBarComponent { } } } -console.log(this.entityType); if(this.getCurrentRoute() == "/search/advanced/research-outcomes" ){ this.enableSearchbar = false; }else{ @@ -107,7 +104,6 @@ console.log(this.entityType); } getCurrentRoute() { - console.log(this.router.url.split('?')[0]); return this.router.url.split('?')[0]; } entityChanged($event){