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 @@ - -
-
+
+
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-

- Search for more than - {{publicationsSize.number|number}} - {{publicationsSize.size}} publications{{((showDatasets||showSoftware||showOrp)?",":"")}} - {{datasetsSize.number|number}} - {{datasetsSize.size}} research data{{((showSoftware ||showOrp)?",":"")}} - {{softwareSize.number|number}} - {{softwareSize.size}} software{{(showOrp?",":"")}} - {{otherSize.number|number}} - {{otherSize.size}} other research products -
- from {{organizationsSize.number |number}} - {{organizationsSize.size}} organizations - - from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers - {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders - -

-
- - -
-
-
- -
-
-
- - - - - - +
+
+
+
+
+ +
+ Search for more than + + + {{publicationsSize.number|number}}{{publicationsSize.size}} + {{((showDatasets || showSoftware || showOrp) ? " publications, " + : " publications ")}} + + + {{datasetsSize.number|number}}{{datasetsSize.size}} + {{((showSoftware || showOrp) ? " research data, " : " research data ")}} + + + {{otherSize.number|number}}{{otherSize.size}} + {{((showSoftware) ? " other research products, " : " other research products ")}} + + + {{softwareSize.number|number}}{{softwareSize.size}} + software + + +
+ + from + {{organizationsSize.number|number}}{{organizationsSize.size}} + organizations + + + {{((showOrganizations && showOrganizations) ? " and " : " from ")}} + {{datasourcesSize.number|number}}{{datasourcesSize.size}} + content providers + + + {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} + {{fundersSize.number|number}}{{fundersSize.size}} + funders + + + linked together for an integrated research search + +
+
+ + +
+
+
+ +
+ + + + + + + +