adding images in every search page | add home page separately with numbers and link to /search/find | more layout changes

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48789 d315682c-612b-4755-9ff5-7f18f6832af3

portal-2/src/app/app-routing.module.ts

@@ -1,6 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
+export function getHomeModule() {
+  return System.import('./home/home.module' + (process.env.AOT ? '.ngfactory' : ''))
+    .then(mod => mod[(process.env.AOT ? 'HomeModuleNgFactory' : 'HomeModule')]);
+}
 export function getPublicationModule() {
   return System.import('./landingPages/publication/publication.module' + (process.env.AOT ? '.ngfactory' : ''))
     .then(mod => mod[(process.env.AOT ? 'PublicationModuleNgFactory' : 'PublicationModule')]);
@@ -147,7 +151,8 @@ export function getUserModule() {
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', redirectTo: '/search/find', pathMatch: 'full'},
+      { path: '', loadChildren: getHomeModule},
+      { path: 'home', loadChildren: getHomeModule},
       { path: 'search/publication', loadChildren: getPublicationModule },
       { path: 'search/dataset', loadChildren: getDatasetModule },
       { path: 'search/organization', loadChildren: getOrganizationModule },
@@ -183,8 +188,6 @@ export function getUserModule() {
       { path: 'claims-project-manager', loadChildren: getClaimsByTokenModule },
       { path: 'user-info', loadChildren: getUserModule },
 
-
-
     ])
   ],
 })

portal-2/src/app/deposit/depositResult.component.ts

@@ -71,10 +71,8 @@ import {PiwikService} from '../utils/piwik/piwik.service';
 					</a-->
 
                     <a  [queryParams]="routerHelper.createQueryParams(['organizationId', 'or'], [organizationId, 'and'])"
-                        routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders">
+                        routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders" class="uk-button uk-button-text">
-                        View all {{fetchDataproviders.searchUtils.totalResults}} results <span class="uk-icon">
+                        View all {{fetchDataproviders.searchUtils.totalResults}} results 
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-</span>
                     </a>
 				</div>
                 <search-result  [(results)]="fetchDataproviders.results"

portal-2/src/app/home/home-routing.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{HomeComponent} from './home.component';
+import {FreeGuard} from'../login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../utils/piwik/previousRouteRecorder.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: HomeComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class HomeRoutingModule { }

portal-2/src/app/home/home.component.ts

@@ -0,0 +1,235 @@
+import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+import {ActivatedRoute, Router} from '@angular/router';
+import {Location} from '@angular/common';
+
+import { Meta, MetaDefinition} from '../../angular2-meta';
+import {SearchPublicationsService} from '../services/searchPublications.service';
+import {SearchDataprovidersService} from '../services/searchDataproviders.service';
+import {SearchProjectsService} from '../services/searchProjects.service';
+import {SearchDatasetsService} from '../services/searchDatasets.service';
+import {SearchOrganizationsService} from '../services/searchOrganizations.service';
+
+import {OpenaireProperties} from '../utils/properties/openaireProperties';
+import {SearchFields} from '../utils/properties/searchFields';
+import {ErrorCodes} from '../utils/properties/openaireProperties';
+import {RouterHelper} from '../utils/routerHelper.class';
+import {NumberUtils} from '../utils/number-utils.class';
+import {RefineFieldResultsService} from '../services/refineFieldResults.service';
+import {PiwikService} from '../utils/piwik/piwik.service';
+
+@Component({
+    selector: 'home',
+    template: `
+
+
+<div class="image-front-topbar  uk-section-secondary uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+   <div style="" class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: ! +">
+      <div class="uk-position-cover"></div>
+      <div class="uk-width-1-1">
+         <div class="uk-position-relative">
+            <div class="uk-container uk-margin-medium">
+               <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
+               <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
+                  <div class="uk-width-1-1@m uk-first-column">
+                     <div data-id="page#4">
+                     <search-form   placeholderText="Search in OpenAIRE information space" link=true></search-form>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <div class="uk-container uk-container-large uk-margin-medium">
+               <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
+                  <div class="uk-width-1-1@m uk-first-column">
+                     <div class="search_box_bg uk-margin-large uk-margin-remove-bottom uk-text-center uk-grid-match uk-child-width-1-2 uk-child-width-1-2@s uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-4@xl uk-grid-collapse uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" uk-grid="" data-id="page#7" style="">
+                        <div  *ngIf="publicationsSize"  class="uk-first-column">
+                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                              <h2 class="el-title uk-margin uk-h2">
+                                 <span>{{publicationsSize.number}} {{publicationsSize.size}} publications</span>
+                              </h2>
+                           </div>
+                        </div>
+                        <div  *ngIf="datasetsSize">
+                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                              <h2 class="el-title uk-margin uk-h2">
+                                 <span>{{datasetsSize.number}} {{datasetsSize.size}} research data</span>
+                              </h2>
+                           </div>
+                        </div>
+                        <div  *ngIf="datasourcesSize"  >
+                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                              <h2 class="el-title uk-margin uk-h2">
+                                 <span>{{datasourcesSize.number}} {{datasourcesSize.size}} data sources</span>
+                              </h2>
+                           </div>
+                        </div>
+                        <div  *ngIf="fundersSize">
+                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                              <h2 class="el-title uk-margin uk-h2">
+                                 <span>{{fundersSize.number}} {{fundersSize.size}} funders</span>
+                              </h2>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-meta uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" data-id="page#8" style="">
+                      <span style="color:#fff!important; font-size:30pt!important">all linked together</span>
+                     </div>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
+
+<div class="tm-main uk-container" style="min-height:200px">
+</div>
+
+     `
+})
+export class HomeComponent {
+  public piwiksub: any;
+  public subfunders: any;
+
+  public pageTitle = "OpenAIRE"
+  public keyword:string = "";
+
+  public searchFields:SearchFields = new SearchFields();
+  public errorCodes:ErrorCodes = new ErrorCodes();
+  public routerHelper:RouterHelper = new RouterHelper();
+
+  public publicationsSize:any = null;
+  public datasetsSize:any = null;
+  public fundersSize:any = null;
+  public projectsSize:any = null;
+  public datasourcesSize:any = null;
+
+public subPub;public subData;public subProjects;public subOrg; public subDataPr;
+
+  constructor (
+    private route: ActivatedRoute,
+      private _router: Router,
+      private _searchPublicationsService: SearchPublicationsService,
+      private _searchDataprovidersService: SearchDataprovidersService,
+      private _searchProjectsService: SearchProjectsService,
+      private _searchDatasetsService: SearchDatasetsService,
+      private _searchOrganizationsService: SearchOrganizationsService,
+      private _refineFieldResultsService:RefineFieldResultsService,
+      private location: Location, private _meta: Meta,private _piwikService:PiwikService
+    ) {
+
+          var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
+
+          var title = "OpenAIRE";
+
+          var url = OpenaireProperties.getBaseLink()+this._router.url;
+          this._meta.setTitle(title);
+          this._meta.updateMeta("description", description);
+          this._meta.updateProperty("og:description", description);
+          this._meta.updateProperty("og:title", title);
+          this._meta.updateProperty("og:url", url);
+          this.getNumbers();
+          console.log("after get numbers")
+          if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
+            console.log("before piwik")
+            this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
+            console.log("after piwik")
+          }
+          console.log("after piwik if")
+
+  }
+
+  public ngOnInit() {
+    console.log("init!")
+
+
+  }
+  public ngOnDestroy() {
+    console.log("destroy!")
+    if(this.piwiksub){
+      this.piwiksub.unsubscribe();
+    }
+    if(this.subfunders){
+      this.subfunders.unsubscribe();
+    }
+        if(this.subPub){
+          this.subPub.unsubscribe();
+        }
+        if(this.subData){
+          this.subData.unsubscribe();
+        }
+    //     if(this.subProjects){
+    //       this.subProjects.unsubscribe();
+    //     }
+    //     if(this.subOrg){
+    //       this.subOrg.unsubscribe();
+    //     }
+        if(this.subDataPr){
+          this.subDataPr.unsubscribe();
+        }
+        console.log("destroy!!!")
+
+  }
+
+   private getNumbers() {
+      this.subPub = this._searchPublicationsService.numOfSearchPublications("").subscribe(
+             data => {
+                console.log("Count results: "+data);
+                if(data && data != null && data > 0 ){
+                    this.publicationsSize = NumberUtils.roundNumber(data);
+                    console.log("After round");
+
+                }
+             },
+             err => {
+       		    console.log(err);
+        		 }
+      );
+
+       this.subData = this._searchDatasetsService.numOfSearchDatasets("").subscribe(
+             data => {
+               if(data && data != null && data > 0 ){
+                   this.datasetsSize = NumberUtils.roundNumber(data);
+               }
+             },
+             err => {
+                 console.log(err);
+               }
+       );
+
+
+       this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project").subscribe(
+           data => {
+
+                console.info("Funders: "+data[1][0].title+ " values "+data[1][0].values.length+"]");
+                console.info("Projects: "+data[0]);
+
+                if(data[0] && data[0] > 0 ){
+                  this.projectsSize = NumberUtils.roundNumber(data[0]);
+                }
+                if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
+                  this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
+                }
+
+           },
+           err => {
+               console.log(err);
+      });
+
+       this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("").subscribe(
+           data => {
+             if(data && data != null && data > 0 ){
+                 this.datasourcesSize = NumberUtils.roundNumber(data);
+             }
+
+           },
+           err => {
+               console.log(err);
+
+           }
+       );
+
+
+
+   }
+}

portal-2/src/app/home/home.module.ts

@@ -0,0 +1,43 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+import{HomeRoutingModule} from './home-routing.module';
+import{HomeComponent} from './home.component';
+
+
+import {DataProvidersServiceModule} from '../services/dataProvidersService.module';
+import {DatasetsServiceModule} from '../services/datasetsService.module';
+import {ProjectsServiceModule} from '../services/projectsService.module';
+import {PublicationsServiceModule} from '../services/publicationsService.module';
+import {OrganizationsServiceModule} from '../services/organizationsService.module';
+import {SearchFormModule} from  '../searchPages/searchUtils/searchForm.module';
+import {FreeGuard} from'../login/freeGuard.guard';
+import {PiwikServiceModule} from '../utils/piwik/piwikService.module';
+import {PreviousRouteRecorder} from '../utils/piwik/previousRouteRecorder.guard';
+import {RefineFieldResultsServiceModule} from '../services/refineFieldResultsService.module';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule, RouterModule,
+     RefineFieldResultsServiceModule,
+    DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
+     PublicationsServiceModule,
+    OrganizationsServiceModule,
+     SearchFormModule,
+      PiwikServiceModule,
+      HomeRoutingModule
+
+  ],
+  declarations: [
+    HomeComponent
+   ],
+  providers:[
+    FreeGuard, PreviousRouteRecorder
+    ],
+  exports: [
+    HomeComponent
+     ]
+})
+export class HomeModule { }

portal-2/src/app/landingPages/dataProvider/dataProvider.component.html

@@ -71,12 +71,6 @@
                         <a
                             (click)="search(tab.content, 1, 10); activeTab=tab.name">
                                 {{tab.name}}
-                                <!--i *ngIf="tab.content == 'metricsTab'" class="icon-line-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 36 36"  style="fill:currentColor;">
-<path d="M4.415 31.713h31.704v4.529h-36.233v-36.233h4.529zM10.077 29.447c-1.877 0-3.396-1.521-3.396-3.396s1.521-3.396 3.396-3.396c0.101 0 0.199 0.006 0.297 0.014l3.652-6.086c-0.348-0.534-0.551-1.171-0.551-1.855 0-1.877 1.521-3.396 3.396-3.396s3.396 1.521 3.396 3.396c0 0.685-0.203 1.321-0.551 1.855l3.652 6.086c0.098-0.009 0.196-0.014 0.297-0.014 0.076 0 0.151 0.004 0.225 0.009l6.028-10.549c-0.373-0.546-0.592-1.204-0.592-1.916 0-1.877 1.521-3.396 3.396-3.396s3.396 1.521 3.396 3.396c0 1.877-1.521 3.396-3.396 3.396-0.076 0-0.151-0.004-0.225-0.009l-6.028 10.549c0.373 0.546 0.592 1.204 0.592 1.916 0 1.877-1.521 3.396-3.396 3.396s-3.396-1.521-3.396-3.396c0-0.684 0.203-1.321 0.551-1.855l-3.652-6.086c-0.098 0.009-0.196 0.014-0.297 0.014s-0.199-0.006-0.297-0.014l-3.652 6.086c0.348 0.534 0.551 1.171 0.551 1.855 0 1.877-1.521 3.396-3.396 3.396z"></path>
-  </svg></i-->
-                                <i *ngIf="tab.content == 'statisticsTab'" class="icon-pie-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 32"  style="fill:currentColor;">
-<path d="M14.026 18.028v-14.016c-7.741 0-14.016 6.275-14.016 14.016s6.275 14.016 14.016 14.016 14.016-6.275 14.016-14.016c0-2.253-0.533-4.383-1.478-6.269l-12.539 6.269zM28.567 7.755c-2.301-4.593-7.051-7.747-12.539-7.747v14.016l12.538-6.269z"></path>
-</svg></i>
 
                                 <span class="uk-badge uk-badge-notification" *ngIf="tab.content=='publicationsTab'">
                                     {{fetchPublications.searchUtils.totalResults}}
@@ -107,12 +101,6 @@
                         <a
                             (click)="search(tab.content, 1, 10); activeTab=tab.name">
                                 {{tab.name}}
-                                <!--i *ngIf="tab.content == 'metricsTab'" class="icon-line-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 36 36"  style="fill:currentColor;">
-<path d="M4.415 31.713h31.704v4.529h-36.233v-36.233h4.529zM10.077 29.447c-1.877 0-3.396-1.521-3.396-3.396s1.521-3.396 3.396-3.396c0.101 0 0.199 0.006 0.297 0.014l3.652-6.086c-0.348-0.534-0.551-1.171-0.551-1.855 0-1.877 1.521-3.396 3.396-3.396s3.396 1.521 3.396 3.396c0 0.685-0.203 1.321-0.551 1.855l3.652 6.086c0.098-0.009 0.196-0.014 0.297-0.014 0.076 0 0.151 0.004 0.225 0.009l6.028-10.549c-0.373-0.546-0.592-1.204-0.592-1.916 0-1.877 1.521-3.396 3.396-3.396s3.396 1.521 3.396 3.396c0 1.877-1.521 3.396-3.396 3.396-0.076 0-0.151-0.004-0.225-0.009l-6.028 10.549c0.373 0.546 0.592 1.204 0.592 1.916 0 1.877-1.521 3.396-3.396 3.396s-3.396-1.521-3.396-3.396c0-0.684 0.203-1.321 0.551-1.855l-3.652-6.086c-0.098 0.009-0.196 0.014-0.297 0.014s-0.199-0.006-0.297-0.014l-3.652 6.086c0.348 0.534 0.551 1.171 0.551 1.855 0 1.877-1.521 3.396-3.396 3.396z"></path>
-  </svg></i-->
-                                <i *ngIf="tab.content == 'statisticsTab'" class="icon-pie-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 32"  style="fill:currentColor;">
-<path d="M14.026 18.028v-14.016c-7.741 0-14.016 6.275-14.016 14.016s6.275 14.016 14.016 14.016 14.016-6.275 14.016-14.016c0-2.253-0.533-4.383-1.478-6.269l-12.539 6.269zM28.567 7.755c-2.301-4.593-7.051-7.747-12.539-7.747v14.016l12.538-6.269z"></path>
-</svg></i>
 
                                 <span class="uk-badge uk-badge-notification" *ngIf="tab.content=='publicationsTab'">
                                     {{fetchPublications.searchUtils.totalResults}}
@@ -185,20 +173,22 @@
 
 
                           <div *ngIf="(fetchPublications.searchUtils.totalResults != 0 || fetchDatasets.searchUtils.totalResults != 0)">
-                            <p class="uk-text-bold">Latest Documents Timeline</p>
+                            <p class="uk-text-bold">Latest Research Result Timeline</p>
                             <i-frame  [url]=docsTimelineUrl width="800" height="350"></i-frame>
-                            <p class="uk-text-bold">Documents Types</p>
+                            <p class="uk-text-bold">Research Result Types</p>
                             <i-frame [url]=docsTypesUrl width="800" height="350"></i-frame>
                           </div>
 
 
-                          <div *ngIf="(fetchPublications.searchUtils.totalResults > 0)">
+                            <div *ngIf="fetchPublications.searchUtils.totalResults > 0 || (fetchDatasets.searchUtils.totalResults > 0)">
-                              <div>
+
-                                <p class="uk-text-bold">Funders in content providers Publications</p>
+                                  <p class="uk-text-bold">Funders in Research Results of content provider</p>
-                                <i-frame  [url]=pubsFunderUrl width="800" height="350"></i-frame>
+                                  <i-frame  [url]=docsFunderUrl width="800" height="350"></i-frame>
+
+                            </div>
+                            <div *ngIf="fetchPublications.searchUtils.totalResults > 0 ">
                                 <p class="uk-text-bold">Projects with most Publications</p>
                                 <i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>
-
                             </div>
                             <div *ngIf="(fetchDatasets.searchUtils.totalResults > 0)">
                                   <div>
@@ -226,6 +216,7 @@
                 </div>
 
         </div>
+      </div>
       </div>
         <div class="uk-width-1-4@l uk-width-1-4@xl uk-width-1-4@m uk-width-1-1@s">
           <div>
@@ -233,7 +224,7 @@
           </div>
         </div>
 
-    </div>
+
 </div>
 </div>
 </div>

portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts

@@ -65,7 +65,7 @@ export class DataProviderComponent {
   public statsClicked: boolean = false;
   private  docsTimelineUrl: string;
   private  docsTypesUrl:string;
-  private  pubsFunderUrl:string;
+  private  docsFunderUrl:string;
   private  dataProjectsUrl:string ;
   private  pubsProjectsUrl:string;
 
@@ -244,9 +244,9 @@ export class DataProviderComponent {
                this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
                */
 
-               this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
+               this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
-               this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+               this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-               this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+               this.docsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
                this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Data"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
                this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
 

portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts

@@ -17,7 +17,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
         <div *ngIf="fetchDatasets.searchUtils.totalResults > 0">
             <div class = "uk-text-right" *ngIf = "fetchDatasets.searchUtils.totalResults > 10" >
                 <a  [queryParams]="paramsForSearchLink"
-                    routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets">
+                    routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets" class="uk-button uk-button-text">
                     View all {{fetchDatasets.searchUtils.totalResults}} results
                 </a>
             </div>

portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts

@@ -18,7 +18,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
         <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
             <div class = "uk-text-right" *ngIf = "fetchDataproviders.searchUtils.totalResults > 10">
                 <a  [queryParams]="paramsForSearchLink"
-                    routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders">
+                    routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders" class="uk-button uk-button-text">
                     View all {{fetchDataproviders.searchUtils.totalResults}} results
                 </a>
             </div>

portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts

@@ -19,7 +19,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
         <div *ngIf="fetchProjects.searchUtils.totalResults > 0">
             <div class = "uk-text-right" *ngIf = "fetchProjects.searchUtils.totalResults > 10">
                 <a  [queryParams]="paramsForSearchLink"
-                    routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects">
+                    routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects" class="uk-button uk-button-text">
                     View all {{fetchProjects.searchUtils.totalResults}} results
                 </a>
             </div>

portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts

@@ -21,7 +21,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
                     View all {{fetchPublications.searchUtils.totalResults}} results
                 </a-->
                 <a  [queryParams]="paramsForSearchLink"
-                    routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications">
+                    routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
                     View all {{fetchPublications.searchUtils.totalResults}} results
                 </a>
             </div>

portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts

@@ -30,7 +30,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
       <div *ngIf="(searchPublicationsComponent.searchUtils.totalResults > 0)">
           <div>
             <p class="uk-text-bold">Funders in content providers Publications</p>
-            <i-frame  [url]=pubsFunderUrl width="800" height="350"></i-frame>
+            <i-frame  [url]=docsFunderUrl width="800" height="350"></i-frame>
             <p class="uk-text-bold">Projects with most Publications</p>
             <i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>
 
@@ -57,7 +57,7 @@ export class StatisticsTabComponent {
 
     private  docsTimelineUrl: string;
     private  docsTypesUrl:string;
-    private  pubsFunderUrl:string;
+    private  docsFunderUrl:string;
     private  dataProjectsUrl:string ;
     private  pubsProjectsUrl:string;
     public errorCodes:ErrorCodes = new ErrorCodes();
@@ -68,7 +68,7 @@ export class StatisticsTabComponent {
 
       this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.id+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
       this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-      this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+      this.docsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
       this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
       this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
     }

portal-2/src/app/landingPages/dataProvider/tabs.component.ts

@@ -24,12 +24,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
                 <a
                     (click)="search(tab.content, 1, 10)">
                         {{tab.name}}
-                        <!--i *ngIf="tab.content == 'metricsTab'" class="icon-line-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 36 36"  style="fill:currentColor;">
+                       
-<path d="M4.415 31.713h31.704v4.529h-36.233v-36.233h4.529zM10.077 29.447c-1.877 0-3.396-1.521-3.396-3.396s1.521-3.396 3.396-3.396c0.101 0 0.199 0.006 0.297 0.014l3.652-6.086c-0.348-0.534-0.551-1.171-0.551-1.855 0-1.877 1.521-3.396 3.396-3.396s3.396 1.521 3.396 3.396c0 0.685-0.203 1.321-0.551 1.855l3.652 6.086c0.098-0.009 0.196-0.014 0.297-0.014 0.076 0 0.151 0.004 0.225 0.009l6.028-10.549c-0.373-0.546-0.592-1.204-0.592-1.916 0-1.877 1.521-3.396 3.396-3.396s3.396 1.521 3.396 3.396c0 1.877-1.521 3.396-3.396 3.396-0.076 0-0.151-0.004-0.225-0.009l-6.028 10.549c0.373 0.546 0.592 1.204 0.592 1.916 0 1.877-1.521 3.396-3.396 3.396s-3.396-1.521-3.396-3.396c0-0.684 0.203-1.321 0.551-1.855l-3.652-6.086c-0.098 0.009-0.196 0.014-0.297 0.014s-0.199-0.006-0.297-0.014l-3.652 6.086c0.348 0.534 0.551 1.171 0.551 1.855 0 1.877-1.521 3.396-3.396 3.396z"></path>
-  </svg></i-->
-                        <i *ngIf="tab.content == 'statisticsTab'" class="icon-pie-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 32"  style="fill:currentColor;">
-<path d="M14.026 18.028v-14.016c-7.741 0-14.016 6.275-14.016 14.016s6.275 14.016 14.016 14.016 14.016-6.275 14.016-14.016c0-2.253-0.533-4.383-1.478-6.269l-12.539 6.269zM28.567 7.755c-2.301-4.593-7.051-7.747-12.539-7.747v14.016l12.538-6.269z"></path>
-</svg></i>
 
                         <span class="uk-badge uk-badge-notification" *ngIf="tab.content=='publicationsTab'">
                             {{fetchPublications.searchUtils.totalResults}}
@@ -94,7 +89,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
                   <div *ngIf="(fetchPublications.searchUtils.totalResults > 0)">
                       <div>
                         <p class="uk-text-bold">Funders in content providers Publications</p>
-                        <i-frame  [url]=pubsFunderUrl width="800" height="350"></i-frame>
+                        <i-frame  [url]=docsFunderUrl width="800" height="350"></i-frame>
                         <p class="uk-text-bold">Projects with most Publications</p>
                         <i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>
 
@@ -158,7 +153,7 @@ export class TabsComponent {
     public statsClicked: boolean = false;
     private  docsTimelineUrl: string;
     private  docsTypesUrl:string;
-    private  pubsFunderUrl:string;
+    private  docsFunderUrl:string;
     private  dataProjectsUrl:string ;
     private  pubsProjectsUrl:string;
 
@@ -213,7 +208,7 @@ export class TabsComponent {
 
                 this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.id+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
                 this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-                this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+                this.docsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
                 this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
                 this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
 
@@ -275,7 +270,7 @@ export class TabsComponent {
     //
     //         this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.id+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
     //         this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-    //         this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+    //         this.docsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
     //         this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
     //         this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
     //     }

portal-2/src/app/landingPages/organization/organization.component.html

@@ -93,7 +93,7 @@
                     <div *ngIf="fetchPublications.searchUtils.totalResults > 0">
                         <div class = "uk-text-right" *ngIf = "fetchPublications.searchUtils.totalResults > 10">
                             <a  [queryParams]="routerHelper.createQueryParams(['organization', 'or'], [organizationId, 'and'])"
-                                routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications">
+                                routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
                                 View all {{fetchPublications.searchUtils.totalResults}} results
                             </a>
                         </div>
@@ -125,7 +125,7 @@
                                 View all {{fetchDataproviders.searchUtils.totalResults}} results
                             </a-->
                             <a  [queryParams]="routerHelper.createQueryParams(['organization', 'or'], [organizationId, 'and'])"
-                                routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders">
+                                routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders" class="uk-button uk-button-text">
                                 View all {{fetchDataproviders.searchUtils.totalResults}} results
                             </a>
                         </div>

portal-2/src/app/landingPages/project/project.component.html

@@ -80,9 +80,7 @@
                     [class]="activeTab == 'Statistics'?'uk-active':''">
                     <a>
                         Statistics
-                        <i class="icon-pie-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 32"  style="fill:currentColor;">
+
-<path d="M14.026 18.028v-14.016c-7.741 0-14.016 6.275-14.016 14.016s6.275 14.016 14.016 14.016 14.016-6.275 14.016-14.016c0-2.253-0.533-4.383-1.478-6.269l-12.539 6.269zM28.567 7.755c-2.301-4.593-7.051-7.747-12.539-7.747v14.016l12.538-6.269z"></path>
-</svg></i>
                     </a>
                 </li>
                 <li (click)="activeTab='Metrics'; metricsClicked=true"
@@ -122,9 +120,6 @@
                   [class]="activeTab == 'Statistics'?'uk-active':''">
                   <a>
                       Statistics
-                      <i class="icon-pie-chart"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 32"  style="fill:currentColor;">
-<path d="M14.026 18.028v-14.016c-7.741 0-14.016 6.275-14.016 14.016s6.275 14.016 14.016 14.016 14.016-6.275 14.016-14.016c0-2.253-0.533-4.383-1.478-6.269l-12.539 6.269zM28.567 7.755c-2.301-4.593-7.051-7.747-12.539-7.747v14.016l12.538-6.269z"></path>
-</svg></i>
                   </a>
               </li>
               <li (click)="metricsClicked=true; activeTab='Metrics'"
@@ -154,7 +149,7 @@
                     <div *ngIf="fetchPublications.searchUtils.totalResults > 0">
                         <div class = "uk-text-right" *ngIf = "fetchPublications.searchUtils.totalResults > 10" >
                             <a  [queryParams]="routerHelper.createQueryParams(['projectId', 'pr'], [projectId, 'and'])"
-                                routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications">
+                                routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
                                 View all {{fetchPublications.searchUtils.totalResults}} results
                             </a>
                         </div>
@@ -179,7 +174,7 @@
 
                         <div class = "uk-text-right" *ngIf = "fetchDatasets.searchUtils.totalResults > 10">
                             <a [queryParams]="routerHelper.createQueryParams(['projectId', 'pr'], [projectId, 'and'])"
-                                routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets">
+                                routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets" class="uk-button uk-button-text">
                                 View all {{fetchDatasets.searchUtils.totalResults}} results
                             </a>
                         </div>
@@ -205,11 +200,11 @@
                   <div *ngIf="statsClicked && (fetchPublications.searchUtils.totalResults != 0 || fetchDatasets.searchUtils.totalResults != 0)">
 
                       <div>
-                        <p class="uk-text-bold">Scientific Results</p>
+                        <p class="uk-text-bold">Research Results</p>
                         <i-frame  [url]=chartScientificResultsUrl width="800" height="350"></i-frame>
-                        <p class="uk-text-bold">Access Mode</p>
+                        <p class="uk-text-bold">Access Mode of Research Results</p>
                         <i-frame [url]=chartAccessModeUrl width="800" height="350"></i-frame>
-                        <p class="uk-text-bold">By Datasource</p>
+                        <p class="uk-text-bold">By Datasource of Research Results</p>
                         <i-frame  [url]=chartDatasourcesUrl width="800" height="350"></i-frame>
                       </div>
                   </div>
@@ -277,7 +272,7 @@
                        <li>
                          <a  routerLinkActive="router-link-active" routerLink="/participate/deposit-publications">
                              <span class="uk-icon">
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><polyline fill="none" stroke="#000" points="5 8 9.5 3.5 14 8 "></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="15" x2="9.5" y2="4"></line></svg>
 </span> Deposit
                            </a>
                        </li>
@@ -310,7 +305,7 @@
                     <li>
                          <a  routerLinkActive="router-link-active" routerLink="/participate/deposit-datasets">
                               <span class="uk-icon">
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                              <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><polyline fill="none" stroke="#000" points="5 8 9.5 3.5 14 8 "></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="15" x2="9.5" y2="4"></line></svg>
                               </span> Deposit
                          </a>
                     </li>

portal-2/src/app/landingPages/project/project.component.ts

@@ -206,9 +206,9 @@ console.info(this.projectInfo.title);
           */
 
           //stats tab charts
-          this.chartScientificResultsUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+          this.chartScientificResultsUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-          this.chartAccessModeUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+          this.chartAccessModeUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-          this.chartDatasourcesUrl= 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+          this.chartDatasourcesUrl= 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
 
           this.showLoading = false;
       },

portal-2/src/app/landingPages/publication/publication.component.html

@@ -66,35 +66,39 @@
                 <div class="uk-text-justify descriptionText">{{publicationInfo.description}}</div>
             </div>
 
-            <!--div class="uk-clearfix uk-margin-top uk-margin-bottom">
+
-              <a  class="uk-float-right uk-button  uk-button-default" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
+           <div class="uk-clearfix"><div class="uk-button-group uk-float-right">
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
+               <button class="uk-button uk-button-default">
-</span> Links to research Results</a>
+                 <span class=""  uk-tooltip="pos:right; delay:5"
-            </div-->
-            <!--div class="uk-clearfix">
-            <div class="uk-card uk-card-primary uk-padding-small uk-width-2-3 uk-align-right uk-card-body">
-              <div class="uk-card-title">
-                <span class="uk-badge"  uk-tooltip="pos:right; delay:5"
                         title='<div id="linkinginfo"  class= "uk-margin uk-padding-small">
                           <p>Do you think that information is missing about a project, a community or other research results related to this publication?</p>
                           <p>You are able to enhance it! Please follow the links and create the missing relations.</p>
                         </div>'>
                         <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
-                Link this publication to</div>
+                 Link this publication to
-              <div>
+               </button>
+               <div class="uk-inline">
+                   <button class="uk-button uk-button-default" type="button">
+                     <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-down" ratio="1"><polygon points="5 7 15 7 10 12"></polygon></svg></span>
+                   </button>
+                   <div uk-dropdown="mode: click; boundary: ! .uk-button-group; boundary-align: true;">
+                       <ul class="uk-nav uk-dropdown-nav uk-margin-top uk-margin-bottom uk-margin-right uk-margin-left" >
+                           <li><a class="uk-button-text  uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                              Projects</a></li>
+                           <li><a  class=" uk-button-text  uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                              Communities</a></li>
+                           <li><a   class=" uk-button-text uk-width-1-1"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                             Other research results</a></li>
+                       </ul>
+                   </div>
+               </div>
+           </div></div>
+
+
+
+
 
-                    <div class="uk-clearfix">
 
-                      <a class="uk-button-text  uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
-            </span> Projects</a>
-                       <a  class=" uk-button-text  uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
-            </span> Communities</a>
-                      <a   class=" uk-button-text uk-width-1-1"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-            Other research results</a>
-                    </div>
-               </div>
-            </div>
-          </div-->
             <ul class="uk-tab uk-visible@l" uk-tab="connect: #tab-content">
                 <li *ngIf="publicationInfo.references" (click)="activeTab='References'"
                     [class]="activeTab == 'References'?'uk-active':''">
@@ -240,7 +244,7 @@
 
                         <!--tabPaging [showAll]="showAllReferences" [length]="publicationInfo.references.length" (changeShowAll)="showChange($event)"></tabPaging-->
                         <div *ngIf="publicationInfo.references && publicationInfo.references.length > pageSize" class="uk-margin-bottom">
-                          <span class="uk-text-bold">{{publicationInfo.references.length}} references, page {{referencesPage}} of {{totalPages(publicationInfo.references.length)}}</span>
+                          <span class="uk-h6">{{publicationInfo.references.length}} references, page {{referencesPage}} of {{totalPages(publicationInfo.references.length)}}</span>
                           <paging-no-load class="uk-float-right" [currentPage]="referencesPage" [totalResults]="publicationInfo.references.length" [size]="pageSize" (pageChange)="updateReferencesPage($event)"></paging-no-load>
                         </div>
 
@@ -251,7 +255,7 @@
                                     {{item['name']}}
                                 </a>
                             </p>
-                            <p *ngIf="!item['url']">
+                            <p  *ngIf="!item['url']" class="pseudo-external custom-icon">
                                 {{item['name']}}
                             </p>
                         </div>

portal-2/src/app/landingPages/publication/publication.service.ts

@@ -1,3 +1,4 @@
+
 import {Injectable} from '@angular/core';
 import {Http, Response} from '@angular/http';
 import {Observable}     from 'rxjs/Observable';

portal-2/src/app/landingPages/searchingProjectsInTab.component.ts

@@ -22,7 +22,7 @@ import {RouterHelper} from '../utils/routerHelper.class';
         <div *ngIf="fetchProjects.searchUtils.totalResults > 0">
             <div class = "uk-text-right" *ngIf = "fetchProjects.searchUtils.totalResultsNoFilters > 10">
                 <a  [queryParams]="routerHelper.createQueryParams(['organization', 'or'], [organizationId, 'and'])"
-                    routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects">
+                    routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects" class="uk-button uk-button-text">
                     View all {{fetchProjects.searchUtils.totalResultsNoFilters}} results
                 </a>
 			      </div>
@@ -32,7 +32,7 @@ import {RouterHelper} from '../utils/routerHelper.class';
                   <paging-no-load [currentPage]="page" [totalResults]="fetchProjects.searchUtils.totalResults" [term]="keyword" [size]="size"  (pageChange)="pageChange($event)"> </paging-no-load>
                 </div>
               </div>
-              <ul  *ngIf = "fetchProjects.funders.length > 1" class="uk-list uk-list-divider">
+              <ul  *ngIf = "fetchProjects.funders.length > 1" class="uk-list uk-list-divider uk-margin-remove">
                 <li  *ngFor="let filter of fetchProjects.filters "  >
                     <!--div class="text-bold">Filter by {{filter.title}}:</div-->
                     <span *ngFor = "let value of filter.values"  class = "uk-animation-fade">

portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts

@@ -15,8 +15,8 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
     selector: 'search-entity-registries',
     template: `
 
-    <search-page pageTitle="Entity Registries"
+    <search-page pageTitle="Registries/ Databases"
-                formPlaceholderText = "Search for Entity Registries"
+                formPlaceholderText = "Search for Registries/ Databases"
                  type="content providers" entityType="dataprovider" [(filters)] = "filters"
                  [(results)] = "results" [(searchUtils)] = "searchUtils"
                  [baseUrl] = "baseUrl" [showResultCount]=false

portal-2/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts

@@ -15,14 +15,14 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
     selector: 'search-entity-registries-table',
     template: `
 
-    <search-page-table pageTitle="Entity Registries"
+    <search-page-table pageTitle="Registries/ Databases"
                        type="content providers" entityType="dataprovider" [(filters)] = "filters"
                        [(results)] = "results" [(searchUtils)] = "searchUtils"
                        [showResultCount]=false
                        [disableForms]="disableForms"
                        [searchViewLink]="'/search/entity-registries'"
                        searchFormClass="entityRegistriesTableSearchForm"
-                       formPlaceholderText="Search for Entity Registries">
+                       formPlaceholderText="Search for Registries/ Databases">
     </search-page-table>
 
     `

portal-2/src/app/searchPages/find/search.component.ts

@@ -21,7 +21,6 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
 import {SearchFields} from '../../utils/properties/searchFields';
 import {ErrorCodes} from '../../utils/properties/openaireProperties';
 import {RouterHelper} from '../../utils/routerHelper.class';
-import {NumberUtils} from '../../utils/number-utils.class';
 import {RefineFieldResultsService} from '../../services/refineFieldResults.service';
 import {PiwikService} from '../../utils/piwik/piwik.service';
 
@@ -31,82 +30,21 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
     selector: 'search-find',
     template: `
 
-
-<div class="image-front-topbar  uk-section-secondary uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
-   <div style="" class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: ! +">
-      <div class="uk-position-cover" style="background-color: rgba(70, 68, 68, 0.65);"></div>
-      <div class="uk-width-1-1">
-         <div class="uk-position-relative">
-            <div class="uk-container uk-margin-medium">
-               <div class="tm-header-placeholder uk-margin-remove-adjacent" style="height: 84px;"></div>
-               <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
-                  <div class="uk-width-1-1@m uk-first-column">
-                     <div data-id="page#4">
-
-                      <search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)" placeholderText="Search in OpenAIRE information space"></search-form>
-                        <!--div class="search_box_bg" style="text-align:center"><input aria-describedby="sizing-addon2" class="uk-input uk-width-1-2 ng-pristine ng-valid ng-touched" name="keyword" placeholder="Type keywords..." type="text"> <button class=" uk-button uk-button-default" type="submit">Search</button></div-->
-                     </div>
-                  </div>
-               </div>
-            </div>
-            <div class="uk-container uk-container-large uk-margin-medium">
-               <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
-                  <div class="uk-width-1-1@m uk-first-column">
-                     <div class="search_box_bg uk-margin-large uk-margin-remove-bottom uk-text-center uk-grid-match uk-child-width-1-2 uk-child-width-1-2@s uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-4@xl uk-grid-collapse uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" uk-grid="" data-id="page#7" style="">
-                        <div class="uk-first-column">
-                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                              <h2 class="el-title uk-margin uk-h2">
-                                 <span *ngIf="publicationsSize" class="uk-text-background">{{publicationsSize.number}} {{publicationsSize.size}} publications</span>
-                              </h2>
-                           </div>
-                        </div>
-                        <div>
-                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                              <h2 class="el-title uk-margin uk-h2">
-                                 <span *ngIf="datasetsSize"  class="uk-text-background">{{datasetsSize.number}} {{datasetsSize.size}} research data</span>
-                              </h2>
-                           </div>
-                        </div>
-                        <div>
-                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                              <h2 class="el-title uk-margin uk-h2">
-                                 <span *ngIf="datasourcesSize" class="uk-text-background">{{datasourcesSize.number}} {{datasourcesSize.size}} data sources</span>
-                              </h2>
-                           </div>
-                        </div>
-                        <div>
-                           <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                              <h2 class="el-title uk-margin uk-h2">
-                                 <span *ngIf="fundersSize" class="uk-text-background">{{fundersSize.number}} {{fundersSize.size}} funders</span>
-                              </h2>
-                           </div>
-                        </div>
-                     </div>
-                     <div class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-meta uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" data-id="page#8" style="">
-                        <span style="color:#fff!important; font-size:30pt!important">all linked together</span>
-                     </div>
-                  </div>
-               </div>
-            </div>
-         </div>
-      </div>
-   </div>
-</div>
-
 <div id="tm-main" class=" uk-section  uk-margin-small-top tm-middle"   >
   <div uk-grid uk-grid>
    <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
     <div  class="">
 
-        <!--div class="uk-width-1-1  ">
+        <div class="uk-width-1-1  ">
-          <div   class="uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle" style="background-image: url('./assets/formImageLight.jpg'); box-sizing: border-box; height: 250px">
+          <div    class="uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle generalSearchForm">
            <div   class="uk-width-1-1">
               <search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)" placeholderText="Search for research results, projects, content providers, organizations in OpenAIRE information space"></search-form>
             </div>
           </div>
-        </div-->
+        </div>
         <div  class=" uk-margin-small-top uk-container">
-            <ul class=" uk-tab uk-visible@m" uk-tab="animation: uk-animation-fade">
+          <div class="uk-grid uk-margin-top">
+            <ul class=" uk-tab uk-tab-left uk-width-1-5 uk-visible@m" uk-tab="animation: uk-animation-fade">
                     <li (click)="searchPublications()" [class]="activeTab == 'publications'?'uk-active':''">
                        <a>
                            Publications
@@ -142,7 +80,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                        </a>
                    </li>
                 </ul>
-
+                <div class="uk-hidden@m uk-clearfix uk-width-1-1 uk-margin-bottom">
                 <button class="uk-button uk-button-default uk-hidden@m " type="button">
                   <span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
                 </button>
@@ -185,19 +123,18 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                    </li>
 
                 </ul>
+                </div>
 
                 <!--ul id="searchtabs" class="uk-switcher  uk-width-1-1 uk-margin-top custom-tab-content-large">
                      <li-->
-                <div  class="uk-width-1-1 uk-margin-top custom-tab-content-large">
+                <div  class="uk-width-expand  custom-tab-content-large">
                   <div *ngIf = "activeTab=='publications'">
                       <div *ngIf = "keyword.length > 0  && activeTab=='publications'" class ="uk-animation-fade">
                         <div class = "uk-text-right" *ngIf = "fetchPublications.searchUtils.totalResults> 10">
               							<!--a [href] = "linkToSearchPublications"-->
                 							<a  [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
-                                                routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications">
+                                                routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
-                								View all {{fetchPublications.searchUtils.totalResults}} results <span class="uk-icon">
+                								View all {{fetchPublications.searchUtils.totalResults}} results
-                                <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-                                </span>
                 							</a>
                 						</div>
                         <search-result  [(results)]="fetchPublications.results"
@@ -216,10 +153,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                         <div class = "uk-text-right" *ngIf = "fetchDatasets.searchUtils.totalResults> 10">
             							<!--a [href] = "linkToSearchDatasets"-->
             							<a  [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
-                                            routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets">
+                                            routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets" class="uk-button uk-button-text">
-            								View all {{fetchDatasets.searchUtils.totalResults}} results <span class="uk-icon">
+            								View all {{fetchDatasets.searchUtils.totalResults}} results
-                            <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-                            </span>
             							</a>
             						</div>
                         <search-result  [(results)]="fetchDatasets.results"
@@ -238,10 +173,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                         <div class = "uk-text-right" *ngIf = "fetchProjects.searchUtils.totalResults> 10">
             							<!--a [href] = "linkToSearchProjects"-->
             							<a  [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
-                                            routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects">
+                                            routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects" class="uk-button uk-button-text">
-            								View all {{fetchProjects.searchUtils.totalResults}} results <span class="uk-icon">
+            								View all {{fetchProjects.searchUtils.totalResults}} results
-                            <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-                            </span>
             							</a>
             						</div>
                         <search-result  [(results)]="fetchProjects.results"
@@ -260,10 +193,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                         <div class = "uk-text-right" *ngIf = "fetchDataproviders.searchUtils.totalResults> 10">
             							<!--a [href] = "linkToSearchDataproviders"-->
             							<a  [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
-                                            routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders">
+                                            routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders" class="uk-button uk-button-text">
-            								View all {{fetchDataproviders.searchUtils.totalResults}} results <span class="uk-icon">
+            								View all {{fetchDataproviders.searchUtils.totalResults}} results
-                            <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-                            </span>
             							</a>
             						</div>
                         <search-result  [(results)]="fetchDataproviders.results"
@@ -282,10 +213,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                         <div class = "uk-text-right" *ngIf = "fetchOrganizations.searchUtils.totalResults> 10">
 							<!--a [href] = "linkToSearchOrganizations"-->
                             <a  [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
-                                routerLinkActive="router-link-active" [routerLink]="linkToSearchOrganizations">
+                                routerLinkActive="router-link-active" [routerLink]="linkToSearchOrganizations" class="uk-button uk-button-text">
-                  								View all {{fetchOrganizations.searchUtils.totalResults}} results <span class="uk-icon">
+                  								View all {{fetchOrganizations.searchUtils.totalResults}} results
-                            <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-                            </span>
           							</a>
 						           </div>
                         <search-result  [(results)]="fetchOrganizations.results"
@@ -298,6 +227,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                       </div>
 
                   </div>
+                </div>
             </div>
                     <!--/li>
 
@@ -376,7 +306,6 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
           this._meta.updateProperty("og:description", description);
           this._meta.updateProperty("og:title", title);
           this._meta.updateProperty("og:url", url);
-          this.getNumbers();
           if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
             this.piwiksub = this._piwikService.trackView("OpenAIRE |Search publications, research data, projects...").subscribe();
 
@@ -588,64 +517,6 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
        this.reloadOrganizations = true;
    }
 
-   private getNumbers() {
-      this.subPub = this._searchPublicationsService.numOfSearchPublications("").subscribe(
-             data => {
-                console.log("Count results: "+data);
-                if(data && data != null && data > 0 ){
-                    this.publicationsSize = NumberUtils.roundNumber(data);
-                }
-             },
-             err => {
-       		    console.log(err);
-        		 }
-      );
-
-       this.subData = this._searchDatasetsService.numOfSearchDatasets("").subscribe(
-             data => {
-               if(data && data != null && data > 0 ){
-                   this.datasetsSize = NumberUtils.roundNumber(data);
-               }
-             },
-             err => {
-                 console.log(err);
-               }
-       );
-
-
-       this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project").subscribe(
-           data => {
-
-                console.info("Funders: "+data[1][0].title+ " values "+data[1][0].values.length+"]");
-                console.info("Projects: "+data[0]);
-
-                if(data[0] && data[0] > 0 ){
-                  this.projectsSize = NumberUtils.roundNumber(data[0]);
-                }
-                if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
-                  this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
-                }
-
-           },
-           err => {
-               console.log(err);
-      });
-
-       this._searchDataprovidersService.numOfSearchDataproviders("").subscribe(
-           data => {
-             if(data && data != null && data > 0 ){
-                 this.datasourcesSize = NumberUtils.roundNumber(data);
-             }
-
-           },
-           err => {
-               console.log(err);
-
-           }
-       );
-
 
 
-   }
-
 }

portal-2/src/app/searchPages/searchUtils/browseEntities.component.ts

@@ -20,7 +20,7 @@ import {SearchUtilsClass} from '../searchUtils/searchUtils.class';
   <div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
 
   <div class ="uk-grid">
-    <div *ngFor= "let filter of filters" class = "uk-margin-top uk-width-1-4@l uk-width-1-3@m  uk-width-1-2@s">
+    <div *ngFor= "let filter of filters" class = "uk-margin-bottom uk-width-1-4@l uk-width-1-3@m  uk-width-1-2@s">
       <browse-statistic   [baseUrl]=baseUrl [filter]=filter ></browse-statistic>
     </div>
   </div>

portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts

@@ -15,7 +15,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
     template: `
 
 
-      <h4 class="tm-article-subtitle">{{filter.title}}</h4>
+     <span class="uk-h6">{{filter.title}}</span>
       <div *ngIf="filter.values.length == 0" class="uk-alert uk-alert-primary" role="alert">No {{filter.title}} statistics found</div>
       <ul *ngIf="filter.values.length > 0 && !viewAll" class="uk-list browseFilters">
 

portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts

@@ -9,7 +9,7 @@ import {ModalLoading} from '../../utils/modal/loading.component';
     selector: 'search-download',
     template: `
     <div class= "searchDownload" *ngIf="totalResults > 0">
-        <p class="uk-text-right" *ngIf="totalResults <= 10000">
+        <p class="uk-margin-large-right" *ngIf="totalResults <= 10000">
             <!--a (click)="download()" href="{{downloadURLAPI}}{{type}}?format=csv&page=0&size={{totalResults}}{{csvParams}}" -->
             <span class="clickable" (click)="downloadfile(downloadURLAPI+type+'?format=csv&page=0&size='+totalResults+csvParams,type+'-report-'+totalResults)">
                 <span aria-hidden="true" class="glyphicon glyphicon-download"></span>

portal-2/src/app/searchPages/searchUtils/searchForm.component.ts

@@ -1,5 +1,6 @@
 import {Component, Input, Output, EventEmitter} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
+import {RouterHelper} from '../../utils/routerHelper.class';
 
 @Component({
     selector: 'search-form',
@@ -7,9 +8,18 @@ import {Observable}       from 'rxjs/Observable';
 
         <form [class]="(isDisabled)?'uk-margin uk-text-center uk-margin-top uk-disabled':'uk-margin uk-text-center uk-margin-top'">
                  <input type="text" class="uk-input  uk-width-1-2" [placeholder]="placeholderText" aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
-                    <button (click)="keywordChanged()"  type="submit" class=" uk-button uk-button-default"><span class="uk-icon">
+                    <button *ngIf="!link" (click)="keywordChanged()"  type="submit" class=" uk-button uk-button-default">
+                    <span class="uk-icon">
                     <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
-</span>Search</button>
+                    </span>Search
+                  </button>
+                  <a *ngIf="link"  class=" uk-button uk-button-default" [queryParams]="routerHelper.createQueryParam('keyword',keyword)" routerLinkActive="router-link-active" routerLink="/search/find">
+                    <span class="uk-icon">
+                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                    </span>Search
+                  </a>
+
+
         </form>
 
 
@@ -21,6 +31,8 @@ export class SearchFormComponent {
     @Input() keyword: string = '';
     @Input() generalSearch: boolean = false;
     @Input() placeholderText: string = "Type keywords";
+    @Input() link: boolean = false;
+    public routerHelper:RouterHelper = new RouterHelper();
 
     @Output() keywordChange  = new EventEmitter();
 

portal-2/src/app/searchPages/searchUtils/searchForm.module.ts

@@ -1,12 +1,13 @@
 import { NgModule}            from '@angular/core';
 import { CommonModule }        from '@angular/common';
 import { FormsModule }         from '@angular/forms';
+import { RouterModule } from '@angular/router';
 
 import{SearchFormComponent} from './searchForm.component';
 
 @NgModule({
   imports: [
-    CommonModule, FormsModule
+    CommonModule, FormsModule, RouterModule
   ],
   declarations: [
     SearchFormComponent

portal-2/src/app/searchPages/searchUtils/searchPage.component.ts

@@ -33,9 +33,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                 <div   class="uk-width-1-1">
                   <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
                 </div>
-                <div   class="uk-width-1-1  uk-light">
+                <div   class="uk-width-1-1  ">
                 <!--link to advanced search -->
-                <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="(disableForms)?'uk-float-right  uk-light uk-disabled uk-link-muted':'uk-float-right  uk-light'" [routerLink]=advancedSearchLink >More search options <span class="uk-icon">
+                <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="(disableForms)?'uk-float-right   uk-disabled uk-link-muted':'uk-float-right  '" [routerLink]=advancedSearchLink >More search options <span class="uk-icon">
                     <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
                     </span>
                 </a>
@@ -58,7 +58,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
                    Clear All
                   </a>
                 </div>
-                <div *ngIf= "showUnknownFilters"  class = " uk-text-center  uk-light">
+                <div *ngIf= "showUnknownFilters"  class = " uk-text-center ">
                 <a (click) = "clearFilters() " >Try new Query</a>
                 </div>
                 </div>
@@ -66,7 +66,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
             </div>
       </div>
     <div  class="uk-container">
-      <div  [class]="(showRefine)?'uk-width-3-4@m  uk-width-3-4@l  uk-width-1-1@s uk-float-right':'uk-width-1-1'">
+      <div  [class]="(showRefine)?'uk-width-3-5@m  uk-width-3-5@l  uk-width-1-1@s uk-align-center uk-margin-remove-bottom':'uk-width-1-1'">
           <div  *ngIf="showRefine" class="uk-offcanvas-content uk-hidden@m">
 
                 <a href="#offcanvas-usage" uk-toggle><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="6" y="4" width="12" height="1"></rect><rect x="6" y="9" width="12" height="1"></rect><rect x="6" y="14" width="12" height="1"></rect><rect x="2" y="4" width="2" height="1"></rect><rect x="2" y="9" width="2" height="1"></rect><rect x="2" y="14" width="2" height="1"></rect></svg></a>
@@ -82,21 +82,15 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
         </div>
 
         <search-paging [type]="type" [(searchUtils)] = "searchUtils"  [(results)] = "results"  [(baseUrl)] = "baseUrl" [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues" ></search-paging>
-        <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" (downloadClick)="downloadClicked($event)"></search-download>
 
-        <p *ngIf="tableViewLink" class="uk-text-right">
-                    <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
-                      <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
-                      Show results in table view
-                    </a>
-        </p>
         </div>
         <div  class="uk-grid uk-width-1-1 uk-margin">
-            <div  *ngIf="showRefine" class=" search-filters uk-width-1-4@l  uk-width-1-4@m  uk-width-1-1@s uk-visible@m">
+            <div  *ngIf="showRefine" class=" search-filters uk-width-1-5@l  uk-width-1-5@m  uk-width-1-1@s uk-visible@m">
                <search-filter  *ngFor="let filter of filters " [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (change)="filterChanged($event)" (toggleModal)="toggleModal($event)"></search-filter>
             </div>
 
-            <div [class]="(showRefine)?'uk-width-3-4@m  uk-width-3-4@l  uk-width-1-1@s uk-first-column':''" >
+            <!--div [class]="(showRefine)?'uk-width-3-5@m  uk-width-3-5@l  uk-width-1-1@s uk-first-column':''" -->
+            <div [class]="(showRefine)?'uk-width-3-5@m  uk-width-3-5@l  uk-width-1-1@s uk-first-column':''" >
 
               <search-result    *ngIf="!tableView"
                                 [results]="results"
@@ -107,6 +101,18 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
 
             </div>
 
+            <div  *ngIf="tableViewLink || searchUtils.totalResults <=10000"  class=" search-filters uk-width-1-5@l  uk-width-1-5@m  uk-width-1-1@s uk-visible@m">
+              <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" (downloadClick)="downloadClicked($event)"></search-download>
+
+              <p *ngIf="tableViewLink" class="uk-text-right">
+                          <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
+                            <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
+                            Show results in table view
+                          </a>
+              </p>
+            </div>
+
+
 
           </div>
         </div>

portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts

@@ -84,7 +84,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
 
                     <thead *ngIf="searchUtils.totalResults > 0">
                       <tr><td colspan="5" class="uk-padding-remove-bottom uk-padding-remove-right">
-                        <span>
+                        <span class="uk-h6">
                           {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}}
                         </span>
                         <paging-no-load class="uk-float-right" [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [size]="rowsOnPage" (pageChange)="goTo($event.value, false)"></paging-no-load>

portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts

@@ -5,10 +5,10 @@ import {Observable}       from 'rxjs/Observable';
     selector: 'search-paging',
     template: `
     <div class= "searchPaging uk-panel uk-margin-top">
-      <div class="uk-float-right" *ngIf="results  && searchUtils.totalResults > searchUtils.size">
+      <div class="uk-float-right uk-margin-large-right" *ngIf="results  && searchUtils.totalResults > searchUtils.size">
             <paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults"  [baseUrl]="baseUrl" [size]="searchUtils.size"  [parameterNames] = "parameterNames" [parameterValues] = "parameterValues" > </paging>
       </div>
-      <div class="" *ngIf="results  && searchUtils.totalResults > 0">
+      <div class="uk-h6 uk-margin-remove" *ngIf="results  && searchUtils.totalResults > 0">
             {{searchUtils.totalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages())}}
       </div>
     </div>

portal-2/src/app/sharedComponents/bottom.component.ts

@@ -33,7 +33,7 @@ import 'rxjs/Rx';
 
              </div>
              <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-left">
-                <img src="assets/dl119_files/ec_logo_inv_small.png" class="el-image" alt="European Commission">
+                <img src="assets/common/ec_logo_inv_small.png" class="el-image" alt="European Commission">
              </div>
           </div>
           <div class="uk-width-expand@m uk-light">
@@ -68,10 +68,10 @@ import 'rxjs/Rx';
        <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
           <div class="uk-width-1-1@m uk-first-column">
              <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-center">
-                <img src="assets/dl119_files/Logo_Horizontal_white_small.png" class="el-image" alt="OpenAIRE">
+                <img src="assets/common/Logo_Horizontal_white_small.png" class="el-image" alt="OpenAIRE">
              </div>
              <div class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
-                <div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license"><img src="assets/dl119_files/80x15.png" alt="Creative" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div>
+                <div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license"><img src="assets/common/80x15.png" alt="Creative" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div>
                 <div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/">D-NET</a>.</div>
              </div>
              <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right">

portal-2/src/app/sharedComponents/navigationBar.component.ts

@@ -18,7 +18,7 @@ import {Session} from '../login/utils/helper.class';
            </a>
         </div>
         <div class="uk-navbar-center">
-           <a class="uk-navbar-item uk-logo"  routerLinkActive="uk-link" routerLink="/search/find" >
+           <a class="uk-navbar-item uk-logo"  routerLinkActive="uk-link" routerLink="/" >
            <img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height">        </a>
         </div>
         <div class="uk-navbar-right">
@@ -33,7 +33,7 @@ import {Session} from '../login/utils/helper.class';
                  <div  *ngIf= "isClient" class="uk-panel" id="module-0">
                     <ul class="uk-nav uk-nav-default">
                        <li class="uk-nav-header uk-parent">
-                          Search
+                          <a routerLinkActive="uk-link" routerLink="/search/find"  class="uk-offcanvas-close custom-offcanvas-close">Search</a>
                           <ul class="uk-nav-sub">
                              <li><a routerLinkActive="uk-link" routerLink="/search/find/publications"  class="uk-offcanvas-close custom-offcanvas-close">Publications</a></li>
                              <li><a routerLinkActive="uk-link" routerLink="/search/find/datasets"  class="uk-offcanvas-close custom-offcanvas-close">Research Data</a></li>
@@ -46,7 +46,7 @@ import {Session} from '../login/utils/helper.class';
                          Content Providers
                          <ul class="uk-nav-sub">
                            <li><a routerLinkActive="uk-link" routerLink="/search/content-providers"  class="uk-offcanvas-close custom-offcanvas-close" >OpenAIRE Content Providers</a></li>
-                           <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries"  class="uk-offcanvas-close custom-offcanvas-close" >Entity Registries</a></li>
+                           <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries"  class="uk-offcanvas-close custom-offcanvas-close" >Registries/ Databases</a></li>
                            <li><a routerLinkActive="uk-link" routerLink="/search/journals"  class="uk-offcanvas-close custom-offcanvas-close" >Journals</a></li>
                         </ul>
                        </li>
@@ -96,8 +96,8 @@ import {Session} from '../login/utils/helper.class';
               <div class="uk-first-column">
                  <div class="uk-panel inner" id="module-119">
                     <ul class="uk-subnav uk-subnav-line">
-                       <li class="uk-active"><a href="https://beta.openaire.eu"><img class="uk-responsive-height" src="assets/dl119_files/Home-icon.png" alt="home"></a></li>
+                       <li class="uk-active"><a href="https://beta.openaire.eu"><img class="uk-responsive-height" src="assets/common/Home-icon.png" alt="home"></a></li>
-                       <li class="custom-discover-li"><a  routerLinkActive="uk-link" routerLink="/search/find" >Discover</a></li>
+                       <li class="custom-discover-li"><a  routerLinkActive="uk-link" routerLink="/" >Discover</a></li>
                        <li><a >Join</a></li>
                        <li><a >Connect</a></li>
                        <li><a >Monitor</a></li>
@@ -114,11 +114,11 @@ import {Session} from '../login/utils/helper.class';
         <div class="uk-container uk-container-expand">
            <nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}">
               <div class="uk-navbar-left  uk-visible@l  ">
-                 <a  routerLinkActive="uk-link" routerLink="/search/find"  class="uk-logo uk-navbar-item">
+                 <a  routerLinkActive="uk-link" routerLink="/"  class="uk-logo uk-navbar-item">
                  <img src="assets/OA DISCOVER_B.png" alt="OpenAIRE" class="uk-responsive-height"></a>
               </div>
               <div class="uk-navbar-left  uk-visible@m uk-hidden@l">
-                 <a  routerLinkActive="uk-link" routerLink="/search/find"  class="uk-logo uk-navbar-item">
+                 <a  routerLinkActive="uk-link" routerLink="/"  class="uk-logo uk-navbar-item">
                  <img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"></a>
               </div>
               <div class="uk-navbar-center">
@@ -146,7 +146,7 @@ import {Session} from '../login/utils/helper.class';
                              <div class="uk-first-column">
                                 <ul class="uk-nav uk-navbar-dropdown-nav">
                                    <li><a routerLinkActive="uk-link" routerLink="/search/content-providers">OpenAIRE Content Providers</a></li>
-                                   <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Entity Registries</a></li>
+                                   <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Registries/ Databases</a></li>
                                    <li><a routerLinkActive="uk-link" routerLink="/search/journals">Journals</a></li>
                                 </ul>
                              </div>

portal-2/src/assets/discover-custom.css

@@ -24,7 +24,7 @@
    left:0;
 }
 .custom-external {
-    background: rgba(0, 0, 0, 0) url("/assets/external-link.svg") no-repeat scroll left center;
+    background: rgba(0, 0, 0, 0) url("/assets/external-link.svg") no-repeat scroll left 10%;
     min-height: 15px;
     background-size: 15px 15px;
     padding-left: 16px;
@@ -33,7 +33,14 @@ h2 .custom-external {
      min-height: 20px;
     background-size: 20px 20px;
     padding-left: 21px;
+    background: rgba(0, 0, 0, 0) url("/assets/external-link.svg") no-repeat scroll left center;
+
 }
+
+.pseudo-external{
+  padding-left: 16px;
+}
+
 .custom-navbar-toggle-icon, .custom-user-mini-panel{
   color:#444 !important
 }
@@ -83,16 +90,21 @@ h2 .custom-external {
 }
 .OPEN {
     background: rgba(0, 0, 0, 0) url("/assets/unlock.svg") no-repeat scroll right top;
-    padding-right: 20px;
+    padding-right: 25px;
     min-height: 20px;
     background-size: 20px 20px;
+    font-weight: 400;
+    text-transform: none;
 }
 
+
 .EMBARGO, .CLOSED, .RESTRICTED {
     background: rgba(0, 0, 0, 0) url("/assets/lock.svg") no-repeat scroll right top;
-    padding-right: 20px;
+    padding-right: 25px;
     min-height: 20px;
     background-size: 20px 20px;
+    font-weight: 400;
+    text-transform: none;
 }
 
 .sc39 {
@@ -303,12 +315,33 @@ color: #414141}
     border-bottom: 1px solid #e5e5e5;
 }
 .mainPageSearchForm{
-  background-image: url("./home.jpeg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
+  background-image: url("./home2.jpeg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
 }
-.searchForm, .publicationsSearchForm, .projectsSearchForm, .organizationsSearchForm, .datasetsSearchForm, .datasourcesSearchForm, .journalsSearchForm,
+
-.entityRegistriesSearchForm, .compatibleDatasourcesSearchForm,
+.searchForm, .generalSearchForm{
-.journalsTableSearchForm, .compatibleDatasourcesTableSearchForm, .entityRegistriesTableSearchForm{
+  background-image: url('./search_general_3.jpg'); box-sizing: border-box; height: 250px;
-  background-image: url('./formImage.jpg'); box-sizing: border-box; height: 250px;
+}
+.publicationsSearchForm{
+  background-image: url('./search_pubs_2.jpg'); box-sizing: border-box; height: 250px;
+}
+.projectsSearchForm{
+  background-image: url('./projects_search.jpg'); box-sizing: border-box; height: 250px;
+}
+.organizationsSearchForm{
+  background-image: url('./search_organizations.jpg'); box-sizing: border-box; height: 250px;
+}
+.datasetsSearchForm{
+  background-image: url('./search_data.jpg'); box-sizing: border-box; height: 250px;
+}
+.datasourcesSearchForm,  .compatibleDatasourcesSearchForm,
+ .compatibleDatasourcesTableSearchForm {
+  background-image: url('./providers_search.jpg'); box-sizing: border-box; height: 250px;
+}
+ .journalsSearchForm, .journalsTableSearchForm{
+  background-image: url('./search_journals.jpg'); box-sizing: border-box; height: 250px;
+}
+.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {
+  background-image: url('./search_registries.jpg'); box-sizing: border-box; height: 250px;
 }
  
 .divider-table tbody td, .uk-table th {
@@ -321,18 +354,20 @@ color: #414141}
   	top: calc(50% - 47px);
   	right: 0;
     z-index: 10000;
+    display: block;
 
   }
 
   #feedback a {
-  	background: #F25F30;
+  	background: #666;
   	border-radius: 5px 0 0 5px;
-  	box-shadow: 0 0 3px rgba(0, 0, 0, .3);
+  	box-shadow:none;
-  	border: 3px solid #fff;
+  	border: none!important;
-  	border-right: 0;
   	display: block;
   	padding: 20px 12px;
   	transition: all .2s ease-in-out;
+    opacity:0.5;
+
   }
 
   #feedback a:hover {
@@ -361,3 +396,45 @@ li span {
   overflow: hidden;
   text-overflow: ellipsis;
 }*/
+
+.custom-offcanvas-bar{
+  background: grey !important;
+  width:100% !important;
+
+}
+.custom-offcanvas-bar .filtersModal{
+  color:grey !important;
+
+}
+.list-horizontal{
+  display: flex;
+  }
+.list-horizontal span{
+  margin-right:5px;
+  padding-left: 0px !important;
+
+}
+.list-horizontal-line span {
+  margin-right: 5px;
+  border-right: 1px solid #f1f1f1;
+  padding-right: 5px;
+
+}
+
+.list-horizontal-line > span:last-child {
+  border-right:none;
+}
+body {
+  font-family: Raleway, Arial, sans-serif !important;
+}
+html {
+  color: #444 !important;
+}
+
+h2{
+    font-weight: 400;
+    text-transform: none;
+}
+.linkdropdown{
+  min-width:250px;
+}

portal-2/src/server.routes.ts

@@ -10,7 +10,7 @@
  * ];
  **/
 export const routes: string[] = [
-  'search/find',
+  'search/find', 'home',
   'search/person','search/publication','search/project','search/dataset','search/dataprovider','search/organization',
   'search/find/people','search/find/publications','search/find/projects','search/find/datasets','search/find/dataproviders','search/find/organizations',
   'search/advanced/people','search/advanced/publications','search/advanced/projects','search/advanced/datasets','search/advanced/dataproviders','search/advanced/organizations',