From c30611f3a7502748caa7d0fb2bfe2d9aa1751cfd Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 14 Jun 2019 13:14:22 +0000
Subject: [PATCH] [Aggregator|Trunk]

Add more numbers in home page

Add pages for projects and content providers
Remove checks for admin tool community Id
Set community in properties as null


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@56093 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.component.ts                      |  16 +-
 src/app/app.module.ts                         |   2 +-
 src/app/home/home.component.html              | 530 ++++++++++--------
 src/app/home/home.component.ts                |   8 +-
 .../dataProvider-routing.module.ts            |   2 +-
 .../dataset/dataset-routing.module.ts         |   2 +-
 .../organization-routing.module.ts            |   2 +-
 .../landingPages/orp/orp-routing.module.ts    |   2 +-
 .../project/project-routing.module.ts         |   2 +-
 .../publication/publication-routing.module.ts |   2 +-
 ...ancedSearchDataProviders-routing.module.ts |   2 +-
 .../advancedSearchDataProviders.component.ts  |  29 +-
 .../advancedSearchDatasets-routing.module.ts  |   2 +-
 ...ancedSearchOrganizations-routing.module.ts |   2 +-
 .../advancedSearchOrps-routing.module.ts      |   2 +-
 .../advancedSearchProjects-routing.module.ts  |   2 +-
 .../advancedSearchProjects.component.ts       |  17 +-
 ...vancedSearchPublications-routing.module.ts |   2 +-
 .../advancedSearchSoftware-routing.module.ts  |   1 -
 .../searchDataProviders-routing.module.ts     |   2 +-
 .../simple/searchDataproviders.component.ts   |  23 +-
 .../simple/searchDatasets-routing.module.ts   |   2 +-
 .../searchOrganizations-routing.module.ts     |   2 +-
 .../simple/searchOrps-routing.module.ts       |   2 +-
 .../simple/searchProjects-routing.module.ts   |   2 +-
 .../simple/searchProjects.component.ts        |  17 +-
 .../searchPublications-routing.module.ts      |   2 +-
 src/app/utils/aggregatorNavBar.component.ts   | 126 ++---
 src/assets/env-properties.json                |   4 +-
 29 files changed, 456 insertions(+), 353 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b9cf9f5..97e5eee 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -43,14 +43,14 @@ export class AppComponent {
   menuItems: RootMenuItem [] = [
     {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
     {
-      rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
-      items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
-        new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
-        new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
-        new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
-        // new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
-        // new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
-        new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
+      rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], [], {}),
+      items: [new MenuItem("", "Publications", "", "/search/find/publications", false, [], [], {}),
+        new MenuItem("", "Research Data", "", "/search/find/datasets", false, [], [], {}),
+        new MenuItem("", "Software", "", "/search/find/software", false, [], [], {}),
+        new MenuItem("", "Other Research Products", "", "/search/find/other", false, [], [], {}),
+        new MenuItem("", "Projects", "", "/search/find/projects/", false, [], [], {}),
+        new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, [], [], {}),
+        new MenuItem("", "Organizations", "", "/search/find/organizations/", false, [], [], {})
       ]
     }
   ];
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a4b6108..033bd18 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -17,7 +17,7 @@ import {ErrorModule} from './openaireLibrary/error/error.module';
 
 import {OpenaireErrorPageComponent} from './error/errorPage.component';
 import {AppRoutingModule} from './app-routing.module';
-import {AggregatorNavBarComponent} from "./utils/aggregatorNavBar.component";
+// import {AggregatorNavBarComponent} from "./utils/aggregatorNavBar.component";
 
 @NgModule({
 
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 005e995..a57509d 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -1,250 +1,300 @@
-
 <!--<aggNavbar></aggNavbar>-->
 
- <div class="image-front-topbar  uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color" 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" tm-header-transparent-placeholder="">
-    <div style=" min-height: calc(7.89999px + 60vh);"
-     class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom" >
+<div class="image-front-topbar  uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color"
+     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" tm-header-transparent-placeholder="">
+  <div style=" min-height: calc(7.89999px + 60vh);"
+       class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom">
     <!-- uk-height-viewport="offset-top: true;offset-bottom: 20"> -->
-       <div class="uk-position-cover" style="/*background-color: rgba(70, 68, 68, 0.24);*/"></div>
-       <div class="uk-position-relative uk-panel">
-             <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 for scholarly works" link="/search/find"></search-form>
-                     </div>
-                  </div>
-               </div>
-            </div>
-            <div class="uk-container uk-container-large uk-margin-medium explore-numbers">
-               <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
-                  <div class="uk-width-1-1@m uk-first-column">
-                    <div id="page#7" class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto  uk-animation-fade" uk-scrollspy-class="" style="">
-                      <h2>
-                        Search for more than
-                      <span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number|number}}
-                        {{publicationsSize.size}} publications{{((showDatasets||showSoftware||showOrp)?",":"")}} </span>
-                       <span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}}
-                         {{datasetsSize.size}} research data{{((showSoftware ||showOrp)?",":"")}}  </span>
-                        <span *ngIf="showSoftware && softwareSize">{{softwareSize.number|number}}
-                          {{softwareSize.size}} software{{(showOrp?",":"")}}   </span>
-                        <span *ngIf="showOrp && otherSize">{{otherSize.number|number}}
-                          {{otherSize.size}} other research products </span>
-                       <br>
-                        <span *ngIf="showOrganizations && organizationsSize" > from {{organizationsSize.number |number}}
-                          {{organizationsSize.size}} organizations</span>
-
-                        <span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
-                       <span  *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</span>
-
-                     </h2>
-                    </div>
-
-
-                  </div>
-               </div>
-            </div>
-
-       </div>
-    </div>
- </div>
-<schema2jsonld    [URL]="properties.baseLink" [logoURL] =
-  "properties.baseLink+'/assets/common-assets/logo-small-aggregator.png'" type="home"
-                  name="OpenAIRE Explore"></schema2jsonld>
-
-
- <!--<div class=" uk-section uk-section-small">
-    <div class="uk-container uk-container-small">
-       <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
+    <div class="uk-position-cover" style="/*background-color: rgba(70, 68, 68, 0.24);*/"></div>
+    <div class="uk-position-relative uk-panel">
+      <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 id="page#8" class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-3@m uk-child-width-1-3@l uk-grid-large uk-grid" uk-grid="">
-                <div class="uk-first-column">
-                   <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
-                      <a routerLinkActive="uk-link" routerLink="/search/find" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
-                      <img class=""  width="80" height="80" src="assets/explore.svg"   alt="Explore">
-                      <h3 class="el-title uk-margin uk-h3">
-                         Explore
-                      </h3>
-                      <div class="el-content uk-margin uk-text-lead">Discover linked open research</div>
-                      <div class="  uk-margin-small-top">Search for
-                        publications, datasets, software and other research products. See how these
-                        are linked together and how they are linked to funding and
-                        organizations.
-                        <br>
-                        View statistics on projects and institutions.
-                      </div>
-                   </div>
-                </div>
-
-                <div class="">
-                   <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
-                      <a  routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
-                        <img class=""  width="70" height="70" src="assets/share.svg"   alt="Share">
-
-                      <h3 class="el-title uk-margin uk-h3">
-                         Share
-                      </h3>
-                      <div class="el-content uk-margin uk-text-lead">Deposit in a repository of your choice </div>
-                      <div class="  uk-margin-small-top">
-                        Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.
-                        <br>
-                        Use <a href="http://www.zenodo.org/" target="_blank" rel="noopener">ZENODO</a>,
-                         a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)
-                      </div>
-                   </div>
-                </div>
-
-
-
-                <div class="">
-                   <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
-                      <img class=""  width="60" height="70" src="assets/link.svg"   alt="Link">
-                      <a routerLinkActive="uk-link" routerLink="/participate/claim" routerLink="/participate/claim"  class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
-
-                      <h3 class="el-title uk-margin uk-h3">
-                         Link
-                      </h3>
-                      <div class="el-content uk-margin uk-text-lead">Connect all your research</div>
-                      <div class="  uk-margin-small-top">
-                        If you can't find your research results in OpenAIRE, don't worry!
-                        <br>
-                        Use our <strong>LINK OUT service</strong>,
-                        that reaches out to many external sources via APIs, to connect your research results and <em>claim</em> them to your project.
-                      </div>
-                   </div>
-                </div>
-
-             </div>
-          </div>
-       </div>
-    </div>
- </div>-->
-
- <!--<div class="uk-section-muted uk-section uk-section-small">
-     <div class="uk-container uk-container-large">
-       <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-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m
-             uk-child-width-1-2@l uk-grid-large uk-grid uk-grid-divider ask-explore" uk-grid="">
-             <div class="uk-first-column uk-text-center">
-               <div class="el-item uk-card uk-card-small uk-card-body">
-                 <img src="assets/ask-explore.svg" class="el-image" alt="" uk-svg="" hidden="true">
-                 <h3 class="el-title uk-margin uk-h3">Have more questions?</h3>
-               </div>
-             </div>
-             <div class="questions">
-               <div class="el-item uk-card uk-card-small uk-card-body">
-                 <ul class="uk-list uk-list-divider">
-                   <li><a href="https://www.openaire.eu/os-primers">Learn about open science policies and how to align</a></li>
-                   <li><a href="https://www.openaire.eu/rdm-handbook">Learn more on how to manage your data in the open science era</a></li>
-                   <li><a href="https://www.openaire.eu/guides/">Find out how to use OpenAIRE to best serve your needs</a></li>
-                   <li><a href="https://www.openaire.eu/webinars/">View our training material on a variety of related topics</a></li>
-                   <li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>
-                 </ul>
-               </div>
-             </div>
-           </div>
-         </div>
-       </div>
-     </div>
-   </div>
-
-    <div class="uk-section-default uk-section">
-        <div class="uk-container">
-          <div class="uk-grid-medium uk-margin-medium uk-grid" uk-grid="">
-            <div class="uk-width-2-3@m uk-first-column">
-              <div class="uk-margin-medium-top uk-panel">
-                <h3 class="el-title uk-margin uk-h3">
-                  Our community
-                </h3>
-                <hr class="uk-divider-small uk-text-left provide">
-
-                <div class="uk-grid uk-margin-medium-top">
-
-                  <div class="uk-width-expand@m">
-                    &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m"> &ndash;&gt;
-                      <p *ngIf="showPublications && publicationsSize">
-                        <span class="emphasis portal-color">{{publicationsSize.count|number}} </span><span class="uk-text-uppercase"> publications</span>
-                      </p>
-                      <p  *ngIf="showDatasets && datasetsSize">
-                        <span class="emphasis portal-color">{{datasetsSize.count|number}} </span><span class="uk-text-uppercase"> research data</span>
-                      </p>
-                    &lt;!&ndash; </div> &ndash;&gt;
-
-
-
-                  </div>
-
-
-                </div>
-
-                <div class="uk-margin-top">
-                  <div class="uk-grid uk-child-width-1-3@m">
-                    <p *ngIf="showDataProviders && datasourcesSize" class="uk-margin-medium-bottom">
-                      <span class="  emphasis "> {{datasourcesSize.number |number}} {{datasourcesSize.size}}</span><br>
-                      <span class="uk-text-uppercase">content providers</span>
-                    </p>
-                    <p *ngIf="showProjects && fundersSize">
-                      <span class="  emphasis ">{{fundersSize.number|number}} {{fundersSize.size}}</span><br>
-                      <span class="uk-text-uppercase">Funders</span>
-                    </p>
-                    <p *ngIf="showProjects && projectsSize">
-                      <span class=" emphasis ">{{projectsSize.count|number}} </span><br>
-                      <span class="uk-text-uppercase">Projects</span>
-                    </p>
-                  </div>
-                  &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m uk-margin-small-top">
-
-                    <p *ngIf="showProjects && projectsSize">
-                      <span class=" emphasis ">{{projectsSize.count|number}} </span><br>
-                      <span class="uk-text-uppercase">Projects</span>
-                    </p>
-                  </div> &ndash;&gt;
-
-
-
-
-                </div>
-              </div>
-            </div>
-            <div class="uk-width-expand@m">
-
-              <div class="uk-card uk-card-body uk-card-explore">
-
-                <h3 class="uk-margin-remove-top uk-h3">
-                  <span class="">Our data policies</span>
-                </h3>
-                <hr class="uk-divider-small uk-text-left">
-
-                <ul class="uk-margin-small uk-list uk-list-large uk-margin-medium-bottom">
-                  <li class="el-item uk-margin-medium-bottom">
-                    <h5 class="el-title uk-h5">Data acquisition</h5>
-                    <div class="el-content">
-                      <span>How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</span>
-                    </div>
-                  </li>
-                  <li class="el-item">
-                    <h5 class="el-title uk-h5">Data usage</h5>
-                    <div class="el-content">
-                      <span>Who is able to retrieve our data, what are the licences, what about specific SLAs.</span>
-                    </div>
-                  </li>
-                </ul>
-                <div class="uk-margin uk-margin-remove-bottom uk-text-left">
-                  <h6 class="uk-h6">
-                    <a class="el-content uk-link-text" href="https://www.openaire.eu/data-aquisition-policy" target="_blank">
-                      Learn more
-                    </a>
-                  </h6>
-                </div>
-              </div>
-
-
+            <div data-id="page#4">
+              <search-form placeholderText="Search for scholarly works" link="/search/find"></search-form>
             </div>
           </div>
         </div>
-      </div>-->
+      </div>
+      <div class="uk-container uk-container-large uk-margin-medium explore-numbers">
+        <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
+          <div class="uk-width-1-1@m uk-first-column">
+            <div id="page#7"
+                 class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto  uk-animation-fade"
+                 uk-scrollspy-class="" style="">
+              <!--<h2>
+                Search for more than
+                <span *ngIf="showPublications && publicationsSize">{{publicationsSize.number|number}}
+                  {{publicationsSize.size}} publications{{((showDatasets || showSoftware || showOrp) ? "," : "")}} </span>
+                <span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}}
+                  {{datasetsSize.size}} research data{{((showSoftware || showOrp) ? "," : "")}}  </span>
+                <span *ngIf="showSoftware && softwareSize">{{softwareSize.number|number}}
+                  {{softwareSize.size}} software{{(showOrp ? "," : "")}}   </span>
+                <span *ngIf="showOrp && otherSize">{{otherSize.number|number}}
+                  {{otherSize.size}} other research products </span>
+                <br>
+                <span *ngIf="showOrganizations && organizationsSize"> from {{organizationsSize.number |number}}
+                  {{organizationsSize.size}} organizations</span>
+
+                <span
+                  *ngIf="showDataProviders && datasourcesSize"> from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
+                <span
+                  *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</span>
+
+              </h2>-->
+              <div class="uk-margin-bottom">
+                <span class="uk-text-large"> Search for more than </span>
+
+                <span *ngIf="showPublications && publicationsSize">
+                  <span class="uk-h2">{{publicationsSize.number|number}}{{publicationsSize.size}}</span>
+                  <span class="uk-text-large"> {{((showDatasets || showSoftware || showOrp) ? " publications, "
+                      : " publications ")}}</span>
+                </span>
+                <span *ngIf="showDatasets && datasetsSize">
+                  <span class="uk-h2">{{datasetsSize.number|number}}{{datasetsSize.size}}</span>
+                  <span
+                    class="uk-text-large">{{((showSoftware || showOrp) ? "  research data, " : "  research data ")}}</span>
+                </span>
+                <span *ngIf="showOrp && otherSize">
+                  <span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>
+                  <span
+                    class="uk-text-large">  {{((showSoftware) ? " other research products, " : " other research products ")}}</span>
+                </span>
+                <span *ngIf="showSoftware && softwareSize">
+                  <span class="uk-h2">{{softwareSize.number|number}}{{softwareSize.size}}</span>
+                  <span class="uk-text-large">  software </span>
+                </span>
+
+                <br>
+                <span *ngIf="showOrganizations && organizationsSize">
+                  <span class="uk-text-large"> from </span>
+                   <span class="uk-h2">{{organizationsSize.number|number}}{{organizationsSize.size}}</span>
+                   <span class="uk-text-large"> organizations </span>
+                </span>
+                <span *ngIf="showDataProviders && datasourcesSize">
+                   <span class="uk-text-large"> {{((showOrganizations && showOrganizations) ? " and " : " from ")}} </span>
+                   <span class="uk-h2">{{datasourcesSize.number|number}}{{datasourcesSize.size}}</span>
+                   <span class="uk-text-large"> content providers </span>
+                </span>
+                <span *ngIf="showProjects && fundersSize">
+                  <span class="uk-text-large"> {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} </span>
+                   <span class="uk-h2">{{fundersSize.number|number}}{{fundersSize.size}} </span>
+                  <span class="uk-text-large"> funders </span>
+
+                </span>
+                <span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||
+                   showDataProviders"
+                      class="uk-text-large"> linked together for an integrated research search </span>
+
+              </div>
+            </div>
+
+
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</div>
+<schema2jsonld [URL]="properties.baseLink" [logoURL]=
+  "properties.baseLink+'/assets/common-assets/logo-small-aggregator.png'" type="home"
+               name="OpenAIRE Explore"></schema2jsonld>
+
+
+<!--<div class=" uk-section uk-section-small">
+   <div class="uk-container uk-container-small">
+      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
+         <div class="uk-width-1-1@m uk-first-column">
+            <div id="page#8" class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-3@m uk-child-width-1-3@l uk-grid-large uk-grid" uk-grid="">
+               <div class="uk-first-column">
+                  <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
+                     <a routerLinkActive="uk-link" routerLink="/search/find" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
+                     <img class=""  width="80" height="80" src="assets/explore.svg"   alt="Explore">
+                     <h3 class="el-title uk-margin uk-h3">
+                        Explore
+                     </h3>
+                     <div class="el-content uk-margin uk-text-lead">Discover linked open research</div>
+                     <div class="  uk-margin-small-top">Search for
+                       publications, datasets, software and other research products. See how these
+                       are linked together and how they are linked to funding and
+                       organizations.
+                       <br>
+                       View statistics on projects and institutions.
+                     </div>
+                  </div>
+               </div>
+
+               <div class="">
+                  <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
+                     <a  routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
+                       <img class=""  width="70" height="70" src="assets/share.svg"   alt="Share">
+
+                     <h3 class="el-title uk-margin uk-h3">
+                        Share
+                     </h3>
+                     <div class="el-content uk-margin uk-text-lead">Deposit in a repository of your choice </div>
+                     <div class="  uk-margin-small-top">
+                       Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.
+                       <br>
+                       Use <a href="http://www.zenodo.org/" target="_blank" rel="noopener">ZENODO</a>,
+                        a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)
+                     </div>
+                  </div>
+               </div>
+
+
+
+               <div class="">
+                  <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
+                     <img class=""  width="60" height="70" src="assets/link.svg"   alt="Link">
+                     <a routerLinkActive="uk-link" routerLink="/participate/claim" routerLink="/participate/claim"  class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
+
+                     <h3 class="el-title uk-margin uk-h3">
+                        Link
+                     </h3>
+                     <div class="el-content uk-margin uk-text-lead">Connect all your research</div>
+                     <div class="  uk-margin-small-top">
+                       If you can't find your research results in OpenAIRE, don't worry!
+                       <br>
+                       Use our <strong>LINK OUT service</strong>,
+                       that reaches out to many external sources via APIs, to connect your research results and <em>claim</em> them to your project.
+                     </div>
+                  </div>
+               </div>
+
+            </div>
+         </div>
+      </div>
+   </div>
+</div>-->
+
+<!--<div class="uk-section-muted uk-section uk-section-small">
+    <div class="uk-container uk-container-large">
+      <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-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m
+            uk-child-width-1-2@l uk-grid-large uk-grid uk-grid-divider ask-explore" uk-grid="">
+            <div class="uk-first-column uk-text-center">
+              <div class="el-item uk-card uk-card-small uk-card-body">
+                <img src="assets/ask-explore.svg" class="el-image" alt="" uk-svg="" hidden="true">
+                <h3 class="el-title uk-margin uk-h3">Have more questions?</h3>
+              </div>
+            </div>
+            <div class="questions">
+              <div class="el-item uk-card uk-card-small uk-card-body">
+                <ul class="uk-list uk-list-divider">
+                  <li><a href="https://www.openaire.eu/os-primers">Learn about open science policies and how to align</a></li>
+                  <li><a href="https://www.openaire.eu/rdm-handbook">Learn more on how to manage your data in the open science era</a></li>
+                  <li><a href="https://www.openaire.eu/guides/">Find out how to use OpenAIRE to best serve your needs</a></li>
+                  <li><a href="https://www.openaire.eu/webinars/">View our training material on a variety of related topics</a></li>
+                  <li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+   <div class="uk-section-default uk-section">
+       <div class="uk-container">
+         <div class="uk-grid-medium uk-margin-medium uk-grid" uk-grid="">
+           <div class="uk-width-2-3@m uk-first-column">
+             <div class="uk-margin-medium-top uk-panel">
+               <h3 class="el-title uk-margin uk-h3">
+                 Our community
+               </h3>
+               <hr class="uk-divider-small uk-text-left provide">
+
+               <div class="uk-grid uk-margin-medium-top">
+
+                 <div class="uk-width-expand@m">
+                   &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m"> &ndash;&gt;
+                     <p *ngIf="showPublications && publicationsSize">
+                       <span class="emphasis portal-color">{{publicationsSize.count|number}} </span><span class="uk-text-uppercase"> publications</span>
+                     </p>
+                     <p  *ngIf="showDatasets && datasetsSize">
+                       <span class="emphasis portal-color">{{datasetsSize.count|number}} </span><span class="uk-text-uppercase"> research data</span>
+                     </p>
+                   &lt;!&ndash; </div> &ndash;&gt;
+
+
+
+                 </div>
+
+
+               </div>
+
+               <div class="uk-margin-top">
+                 <div class="uk-grid uk-child-width-1-3@m">
+                   <p *ngIf="showDataProviders && datasourcesSize" class="uk-margin-medium-bottom">
+                     <span class="  emphasis "> {{datasourcesSize.number |number}} {{datasourcesSize.size}}</span><br>
+                     <span class="uk-text-uppercase">content providers</span>
+                   </p>
+                   <p *ngIf="showProjects && fundersSize">
+                     <span class="  emphasis ">{{fundersSize.number|number}} {{fundersSize.size}}</span><br>
+                     <span class="uk-text-uppercase">Funders</span>
+                   </p>
+                   <p *ngIf="showProjects && projectsSize">
+                     <span class=" emphasis ">{{projectsSize.count|number}} </span><br>
+                     <span class="uk-text-uppercase">Projects</span>
+                   </p>
+                 </div>
+                 &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m uk-margin-small-top">
+
+                   <p *ngIf="showProjects && projectsSize">
+                     <span class=" emphasis ">{{projectsSize.count|number}} </span><br>
+                     <span class="uk-text-uppercase">Projects</span>
+                   </p>
+                 </div> &ndash;&gt;
+
+
+
+
+               </div>
+             </div>
+           </div>
+           <div class="uk-width-expand@m">
+
+             <div class="uk-card uk-card-body uk-card-explore">
+
+               <h3 class="uk-margin-remove-top uk-h3">
+                 <span class="">Our data policies</span>
+               </h3>
+               <hr class="uk-divider-small uk-text-left">
+
+               <ul class="uk-margin-small uk-list uk-list-large uk-margin-medium-bottom">
+                 <li class="el-item uk-margin-medium-bottom">
+                   <h5 class="el-title uk-h5">Data acquisition</h5>
+                   <div class="el-content">
+                     <span>How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</span>
+                   </div>
+                 </li>
+                 <li class="el-item">
+                   <h5 class="el-title uk-h5">Data usage</h5>
+                   <div class="el-content">
+                     <span>Who is able to retrieve our data, what are the licences, what about specific SLAs.</span>
+                   </div>
+                 </li>
+               </ul>
+               <div class="uk-margin uk-margin-remove-bottom uk-text-left">
+                 <h6 class="uk-h6">
+                   <a class="el-content uk-link-text" href="https://www.openaire.eu/data-aquisition-policy" target="_blank">
+                     Learn more
+                   </a>
+                 </h6>
+               </div>
+             </div>
+
+
+           </div>
+         </div>
+       </div>
+     </div>-->
 
 <!--<div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
     <div class="uk-container uk-container-large">
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 0b2fec9..25931ec 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -114,8 +114,8 @@ export class HomeComponent {
           this.showOrganizations = true;
           this.showDatasets = true;
           this.showSoftware = true;
-          //this.showProjects = false;
-          // this.showDataProviders = true;
+          this.showProjects = true;
+          this.showDataProviders = true;
           this.getNumbers();
 
        /*   this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity).subscribe(data => {
@@ -235,7 +235,7 @@ export class HomeComponent {
       );
     }
     if (this.showProjects) {
-      this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties).subscribe(
+      this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties, refineQuery).subscribe(
         data => {
           if (data[0] && data[0] > 0) {
             this.projectsSize = NumberUtils.roundNumber(data[0]);
@@ -252,7 +252,7 @@ export class HomeComponent {
         });
     }
     if (this.showDataProviders) {
-      this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
+      this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties, refineQuery).subscribe(
         data => {
           if (data && data > 0) {
             this.datasourcesSize = NumberUtils.roundNumber(data);
diff --git a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
index c9e1d33..bf44b5e 100644
--- a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
+++ b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/dataset/dataset-routing.module.ts b/src/app/landingPages/dataset/dataset-routing.module.ts
index e5a53a5..523905e 100644
--- a/src/app/landingPages/dataset/dataset-routing.module.ts
+++ b/src/app/landingPages/dataset/dataset-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/organization/organization-routing.module.ts b/src/app/landingPages/organization/organization-routing.module.ts
index a8d3e70..22ddbae 100644
--- a/src/app/landingPages/organization/organization-routing.module.ts
+++ b/src/app/landingPages/organization/organization-routing.module.ts
@@ -12,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/orp/orp-routing.module.ts b/src/app/landingPages/orp/orp-routing.module.ts
index 8ac82b7..7f27ac5 100644
--- a/src/app/landingPages/orp/orp-routing.module.ts
+++ b/src/app/landingPages/orp/orp-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/project/project-routing.module.ts b/src/app/landingPages/project/project-routing.module.ts
index 23d2efa..7590211 100644
--- a/src/app/landingPages/project/project-routing.module.ts
+++ b/src/app/landingPages/project/project-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
  ]
diff --git a/src/app/landingPages/publication/publication-routing.module.ts b/src/app/landingPages/publication/publication-routing.module.ts
index 629d846..177f1b8 100644
--- a/src/app/landingPages/publication/publication-routing.module.ts
+++ b/src/app/landingPages/publication/publication-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
 ]
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
index febdaa8..b417d3e 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
index f5cc238..30b62dd 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@@ -1,14 +1,29 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 
 
 @Component({
-    selector: 'openaire-advanced-search-dataprovider',
-    template: `
-    <advanced-search-dataprovider>
+  selector: 'openaire-advanced-search-dataprovider',
+  template: `
+    <advanced-search-dataprovider [customFilter]="customFilter">
     </advanced-search-dataprovider>
 
-    `
- })
+  `
+})
 
-export class OpenaireAdvancedSearchDataProvidersComponent { 
+export class OpenaireAdvancedSearchDataProvidersComponent {
+
+  customFilter: SearchCustomFilter = null;
+
+  constructor(private  route: ActivatedRoute) {
+
+  }
+
+  ngOnInit() {
+    let id = this.route.snapshot.paramMap.get('id');
+    let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
+    this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
+  }
 }
diff --git a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
index 9d6ac54..9d6e86f 100644
--- a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
index 13ecad7..b10a478 100644
--- a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         },canDeactivate: [PreviousRouteRecorder]}
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
index d131f70..2541291 100644
--- a/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
index d179612..fead163 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
index 766150f..4a54691 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@@ -1,14 +1,27 @@
 import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 
 @Component({
     selector: 'openaire-advanced-search-projects',
     template: `
-    <advanced-search-projects>
+    <advanced-search-projects [customFilter]="customFilter">
     </advanced-search-projects>
 
     `
  })
 
-export class OpenaireAdvancedSearchProjectsComponent { 
+export class OpenaireAdvancedSearchProjectsComponent {
 
+  customFilter:SearchCustomFilter= null;
+  constructor(private  route: ActivatedRoute) {
+
+  }
+
+  ngOnInit() {
+    let id = this.route.snapshot.paramMap.get('id');
+    let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
+    this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
+  }
 }
diff --git a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
index b755d0a..90b2c55 100644
--- a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
index e352163..738fac8 100644
--- a/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
@@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
 import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 @NgModule({
   imports: [
diff --git a/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/src/app/searchPages/simple/searchDataProviders-routing.module.ts
index 1da0737..916c9f8 100644
--- a/src/app/searchPages/simple/searchDataProviders-routing.module.ts
+++ b/src/app/searchPages/simple/searchDataProviders-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts
index d71593a..8e2bd61 100644
--- a/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/searchPages/simple/searchDataproviders.component.ts
@@ -1,14 +1,27 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 
 @Component({
-    selector: 'openaire-search-dataproviders',
-    template: `
+  selector: 'openaire-search-dataproviders',
+  template: `
 
-    <search-dataproviders>
+    <search-dataproviders [customFilter]="customFilter">
     </search-dataproviders>
 
-    `
+  `
 })
 export class OpenaireSearchDataprovidersComponent {
+  customFilter: SearchCustomFilter = null;
 
+  constructor(private  route: ActivatedRoute) {
+
+  }
+
+  ngOnInit() {
+    let id = this.route.snapshot.paramMap.get('id');
+    let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
+    this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
+  }
 }
diff --git a/src/app/searchPages/simple/searchDatasets-routing.module.ts b/src/app/searchPages/simple/searchDatasets-routing.module.ts
index 8edc0a7..9222baf 100644
--- a/src/app/searchPages/simple/searchDatasets-routing.module.ts
+++ b/src/app/searchPages/simple/searchDatasets-routing.module.ts
@@ -14,7 +14,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver  }},
 
     ])
diff --git a/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/src/app/searchPages/simple/searchOrganizations-routing.module.ts
index 7e3a709..2bbcd87 100644
--- a/src/app/searchPages/simple/searchOrganizations-routing.module.ts
+++ b/src/app/searchPages/simple/searchOrganizations-routing.module.ts
@@ -13,7 +13,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/simple/searchOrps-routing.module.ts b/src/app/searchPages/simple/searchOrps-routing.module.ts
index ff122a5..a3c7f06 100644
--- a/src/app/searchPages/simple/searchOrps-routing.module.ts
+++ b/src/app/searchPages/simple/searchOrps-routing.module.ts
@@ -14,7 +14,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver  }},
 
     ])
diff --git a/src/app/searchPages/simple/searchProjects-routing.module.ts b/src/app/searchPages/simple/searchProjects-routing.module.ts
index 1855ae0..7d3ae07 100644
--- a/src/app/searchPages/simple/searchProjects-routing.module.ts
+++ b/src/app/searchPages/simple/searchProjects-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts
index 3617885..bbedf2e 100644
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@@ -1,14 +1,27 @@
 import {Component, Input, ViewChild} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 
 @Component({
     selector: 'openaire-search-projects',
     template: `
 
-    <search-projects>
+    <search-projects [customFilter]="customFilter">
     </search-projects>
      `
 
 })
 export class OpenaireSearchProjectsComponent {
-   
+    customFilter: SearchCustomFilter = null;
+
+    constructor(private  route: ActivatedRoute) {
+
+    }
+
+    ngOnInit() {
+        let id = this.route.snapshot.paramMap.get('id');
+        let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
+        this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
+    }
 }
diff --git a/src/app/searchPages/simple/searchPublications-routing.module.ts b/src/app/searchPages/simple/searchPublications-routing.module.ts
index 93ee9d1..58ba0db 100644
--- a/src/app/searchPages/simple/searchPublications-routing.module.ts
+++ b/src/app/searchPages/simple/searchPublications-routing.module.ts
@@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/utils/aggregatorNavBar.component.ts b/src/app/utils/aggregatorNavBar.component.ts
index 8bfd88c..fa65315 100644
--- a/src/app/utils/aggregatorNavBar.component.ts
+++ b/src/app/utils/aggregatorNavBar.component.ts
@@ -1,63 +1,63 @@
-import {Component} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import "rxjs/add/observable/zip";
-import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import {FilterInfo, PortalAggregators} from "../utils/aggregators";
-import {MenuItem, RootMenuItem} from "../openaireLibrary/sharedComponents/menu";
-
-@Component({
-  selector: 'aggNavbar',
-  templateUrl: `
-<navbar *ngIf="properties" portal="aggregator" [environment]=properties.environment [onlyTop]=false
-            [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
-            [APIUrl]="properties.adminToolsAPIURL" [logInUrl]="properties.loginUrl"
-            [logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
-`,
-})
-export class AggregatorNavBarComponent {
-
-  properties: EnvProperties;
-  menuItems: RootMenuItem [] = [
-    {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
-    {
-      rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
-      items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
-        new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
-        new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
-        new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
-        // new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
-        // new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
-        new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
-      ]
-    }
-  ];
-  community = {id: "CA", name: "Canada Aggregator", logoUrl:"assets/common-assets/logo-small-aggregator.png"};
-
-
-  constructor(
-    private route: ActivatedRoute,
-
-  ) {
-    let id = this.route.snapshot.paramMap.get('id');
-    console.log(id);
-    let agg:FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
-    // this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
-    // console.log(this.customFilter);
-
-
-
-  }
-
-  public ngOnInit() {
-
-    this.route.data
-      .subscribe((data: { envSpecific: EnvProperties }) => {
-        this.properties = data.envSpecific;
-
-
-
-      });
-
-  }
-
-}
+// import {Component} from '@angular/core';
+// import {ActivatedRoute} from '@angular/router';
+// import "rxjs/add/observable/zip";
+// import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+// import {FilterInfo, PortalAggregators} from "../utils/aggregators";
+// import {MenuItem, RootMenuItem} from "../openaireLibrary/sharedComponents/menu";
+//
+// @Component({
+//   selector: 'aggNavbar',
+//   templateUrl: `
+// <navbar *ngIf="properties" portal="aggregator" [environment]=properties.environment [onlyTop]=false
+//             [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
+//             [APIUrl]="properties.adminToolsAPIURL" [logInUrl]="properties.loginUrl"
+//             [logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
+// `,
+// })
+// export class AggregatorNavBarComponent {
+//
+//   properties: EnvProperties;
+//   menuItems: RootMenuItem [] = [
+//     {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
+//     {
+//       rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
+//       items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
+//         new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
+//         new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
+//         new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
+//         // new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
+//         // new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
+//         new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
+//       ]
+//     }
+//   ];
+//   community = {id: "CA", name: "Canada Aggregator", logoUrl:"assets/common-assets/logo-small-aggregator.png"};
+//
+//
+//   constructor(
+//     private route: ActivatedRoute,
+//
+//   ) {
+//     let id = this.route.snapshot.paramMap.get('id');
+//     console.log(id);
+//     let agg:FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
+//     // this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
+//     // console.log(this.customFilter);
+//
+//
+//
+//   }
+//
+//   public ngOnInit() {
+//
+//     this.route.data
+//       .subscribe((data: { envSpecific: EnvProperties }) => {
+//         this.properties = data.envSpecific;
+//
+//
+//
+//       });
+//
+//   }
+//
+// }
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 8cc4834..bdfd2c9 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -50,9 +50,9 @@
 
   "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
 
-  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
+  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/",
 
-  "adminToolsCommunity" :"openaire",
+  "adminToolsCommunity" :null,
 
   "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
   "contextsAPI":"https://dev-openaire.d4science.org/openaire/context",