diff --git a/portal-4cli-lib/explore-production-properties.json b/portal-4cli-lib/explore-production-properties.json index 2078966e..c7b0e7cc 100644 --- a/portal-4cli-lib/explore-production-properties.json +++ b/portal-4cli-lib/explore-production-properties.json @@ -70,6 +70,7 @@ "searchLinkToProjects" : "/search/find/projects", "searchLinkToDatasets" : "/search/find/datasets", "searchLinkToSoftware" : "/search/find/software", + "searchLinkToOrps" : "/search/find/other", "searchLinkToOrganizations" : "/search/find/organizations", "searchLinkToCompatibleDataProviders" : "/search/content-providers", "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", @@ -82,7 +83,10 @@ "searchLinkToAdvancedProjects" : "/search/advanced/projects", "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", "searchLinkToAdvancedSoftware" : "/search/advanced/software", + "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedPeople" : "/search/advanced/people" + + } diff --git a/portal-4cli-lib/src/app/app.component.ts b/portal-4cli-lib/src/app/app.component.ts index aeffa9d7..2c61f758 100644 --- a/portal-4cli-lib/src/app/app.component.ts +++ b/portal-4cli-lib/src/app/app.component.ts @@ -41,8 +41,8 @@ export class AppComponent { clientLoad = 0; userMenuItems:MenuItem[] = [ new MenuItem("","My profile","","",false,[],[],{}), - new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}), - new MenuItem("","Manage all claims","","/claims",true,[],["/claims"],{})] + new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],{}), + new MenuItem("","Manage all links","","/claims",true,[],["/claims"],{})] menuItems:RootMenuItem [] = [ @@ -90,7 +90,7 @@ bottomMenuItems =[ try{ this.isClient = true; if(Session.isPortalAdministrator()){ - this.userMenuItems.push(new MenuItem("","Administration","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) + this.userMenuItems.push(new MenuItem("","Manage helptexts","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) } }catch (e) { } diff --git a/portal-4cli-lib/src/app/home/home.component.html b/portal-4cli-lib/src/app/home/home.component.html index e9db3a27..5cd484e3 100644 --- a/portal-4cli-lib/src/app/home/home.component.html +++ b/portal-4cli-lib/src/app/home/home.component.html @@ -11,7 +11,7 @@
- +
@@ -19,15 +19,18 @@
-

- {{publicationsSize.number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} - {{datasetsSize.number}} {{datasetsSize.size}} research data - from {{datasourcesSize.number}} {{datasourcesSize.size}} content providers - {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number}} {{fundersSize.size}} funders -

-

- ... linked together for an integrated research search -

+
+

+ {{publicationsSize.number|number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} + {{datasetsSize.number|number}} {{datasetsSize.size}} research data +
+ 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 + +

+
@@ -38,151 +41,68 @@
-
+
-
-
-
- Learn more on OpenAIRE discovery and sharing services -
-
-
+
-
-
- -
+
+
+ + Explore + +

Explore

+
Discover linked open research
+
+ +
Search for + publications, datasets, software and other research products. See how these + are linked together and how they are linked to funding and + organizations. +
+ View statistics on projects and institutions. +
+
-
-
- Explore -
-
-

Explore

-

Discover linked open research

-
-
-
- -
-

Search for - publications-data-software and other research artefacts. See how these - are linked together and how they are linked to funding and - organizations.

-

View statistics on projects and institutions.

-
-
-
- -
-
- -
- -
-
- Share -
-
-

Share

-

Deposit in a repository of your choice

-
-
-
- -
-

Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.

-

Use ZENODO, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)

+
+
+ + Share + +

Share

+
Deposit in a repository of your choice
-
-
- + -
-
- -
- -
-
- Link -
-
-

Link

-

Connect all your research

-
-
-
- -
-

If you can't find your research results in OpenAIRE, don't worry!

-

Use our LINK OUT service, that reaches out to many external sources via APIs, to connect your research results and claim them to your project.

+
+
+ + Link + +

Link

+
Connect all your research
-
-
-
diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index c95aa475..39a9368c 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -1,15 +1,15 @@ { "enablePiwikTrack" : false, "enableHelper" : true, - "useCache" : true, + "useCache" : false, "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "claimsAPIURL" : "http://duffy.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", + "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", - "csvAPIURL" : "http://vatopedi.di.uoa.gr:8080/shadowSearch/rest/v2/api/reports", + "csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports", "searchCrossrefAPIURL" : "https://api.crossref.org/works", "searchDataciteAPIURL" : "https://api.datacite.org/works", @@ -34,7 +34,7 @@ "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "piwikSiteId" : "6", - "loginUrl" :"http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", + "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", diff --git a/portal-4cli-lib/src/assets/explore-custom.css b/portal-4cli-lib/src/assets/explore-custom.css index a584c9e4..65cf0045 100644 --- a/portal-4cli-lib/src/assets/explore-custom.css +++ b/portal-4cli-lib/src/assets/explore-custom.css @@ -1,28 +1,41 @@ +:root { + --portal-main-color: #f25f30; + --portal-main-contrast: white; + --portal-dark-color: #D03C0D; + + --openaire-main-color: #26257F; + + --explore-portal-color: #f25f30; + --provide-portal-color: #28beff; + --monitor-portal-color: #8bcc00; + --connect-portal-color: #ffc800; + --develop-portal-color: #d13f96; +} + .tm-toolbar .uk-subnav-line .custom-explore-li { - display: block; - background:#D03C0D !important; - color:#fff !important; - + background:var(--portal-main-color) !important; } -.custom-explore-toolbar ul.uk-subnav.uk-subnav-line{ - background-color: #f25f30 !important; +/* .custom-explore-toolbar ul.uk-subnav.uk-subnav-line{ + background-color: var(--portal-main-color) !important; } - +.custom-explore-toolbar ul.uk-subnav.uk-subnav-line{ + background-color: var(--portal-main-color) !important; +} .custom-explore-toolbar .inner { - background-color: #f25f30 !important; + background-color: var(--portal-main-color) !important; } .custom-explore-toolbar{ - border-top-color:#f25f30 !important; - } + border-top-color:var(--portal-main-color) !important; + } */ .mainPageSearchForm{ background-image: linear-gradient(rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)), url('home.jpg'); } .firstPageNumbers{ - font-weight: 600 !important; - color: #D03C0D !important; + /* font-weight: 600 !important; */ + /* color: var(--portal-main-color) !important; */ } .explore-numbers h2, .explore-numbers div { @@ -34,28 +47,7 @@ .explore-numbers h2 { font-size: 22px !important; } -.developlink{ - text-transform: none !important; - color: #fff !important; - background: #d13f96 !important; - font-weight: 600; -} -.providelink{ - text-transform: none !important; - color: #fff !important; - background: #28beff !important; - font-weight: 600; -} -.connectlink{ - background-color: #ffc800 !important; - font-weight: 600; - color: #fff !important; -} -.monitorlink{ - background-color: #8bcc00 !important; - font-weight: 600; - color: #fff !important; -} + .mainPageBottomInfo{ background: linear-gradient( rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)), url('home.jpg'); background-attachment: scroll, scroll; diff --git a/portal-4cli-lib/src/assets/explore.svg b/portal-4cli-lib/src/assets/explore.svg index 41e03961..32df7470 100644 --- a/portal-4cli-lib/src/assets/explore.svg +++ b/portal-4cli-lib/src/assets/explore.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/portal-4cli-lib/src/assets/link.svg b/portal-4cli-lib/src/assets/link.svg index b1e8ad17..b88f9df2 100644 --- a/portal-4cli-lib/src/assets/link.svg +++ b/portal-4cli-lib/src/assets/link.svg @@ -1,14 +1 @@ - - - - background - - - - Layer 1 - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/portal-4cli-lib/src/assets/share.svg b/portal-4cli-lib/src/assets/share.svg index 9311bc73..3e22c5a2 100644 --- a/portal-4cli-lib/src/assets/share.svg +++ b/portal-4cli-lib/src/assets/share.svg @@ -1,11 +1 @@ - - - - background - - - - Layer 1 - - - \ No newline at end of file + \ No newline at end of file diff --git a/portal-4cli-lib/src/index.html b/portal-4cli-lib/src/index.html index a44e35f0..cd8c19b7 100644 --- a/portal-4cli-lib/src/index.html +++ b/portal-4cli-lib/src/index.html @@ -59,6 +59,10 @@ + + + + - - - - +