diff --git a/.gitmodules b/.gitmodules
index 33bcdc7..b14b9aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
[submodule "src/assets/common-assets"]
path = src/assets/common-assets
url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git
-[submodule "src/assets/dashboard-theme"]
- path = src/assets/dashboard-theme
- url = gitea@code-repo.d4science.org:MaDgIK/dashboard-theme.git
[submodule "src/assets/openaire-theme"]
path = src/assets/openaire-theme
url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git
diff --git a/angular.json b/angular.json
index eec8c40..bc18339 100644
--- a/angular.json
+++ b/angular.json
@@ -47,7 +47,6 @@
],
"styles": [
"src/styles.less",
- "src/deprecated.css",
"src/assets/common-assets/library-css/material.scss"
],
"scripts": [
diff --git a/package.json b/package.json
index 5b8f93d..92b1748 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"rxjs": "^6.5.1",
"ts-md5": "^1.2.0",
"tslib": "^2.0.0",
- "uikit": "^3.12.0",
+ "uikit": "3.12.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
diff --git a/src/app/develop/develop.component.css b/src/app/develop/develop.component.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts
index 9908bc0..dd6255d 100644
--- a/src/app/develop/develop.component.ts
+++ b/src/app/develop/develop.component.ts
@@ -113,8 +113,7 @@ import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"
- `,
- styleUrls: ['develop.component.css']
+ `
})
export class DevelopComponent implements OnInit, OnDestroy {
diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.css b/src/app/general/edit-stakeholder/edit-stakeholder.component.less
similarity index 53%
rename from src/app/general/edit-stakeholder/edit-stakeholder.component.css
rename to src/app/general/edit-stakeholder/edit-stakeholder.component.less
index d279cde..e5f71cd 100644
--- a/src/app/general/edit-stakeholder/edit-stakeholder.component.css
+++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.less
@@ -2,9 +2,9 @@
width: 100px;
height: 100px;
position: relative;
-}
-.uk-border-circle > img {
- max-width: 64px;
- max-height: 64px;
+ & > img {
+ max-width: 64px;
+ max-height: 64px;
+ }
}
diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts
index dce7f63..8a99fa7 100644
--- a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts
+++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts
@@ -103,7 +103,7 @@ import {NotificationHandler} from "../../openaireLibrary/utils/notification-hand
`,
- styleUrls: ['edit-stakeholder.component.css']
+ styleUrls: ['edit-stakeholder.component.less']
})
export class EditStakeholderComponent implements OnDestroy {
@Input()
diff --git a/src/app/methodology/methodology.component.css b/src/app/methodology/methodology.component.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/methodology/methodology.component.ts b/src/app/methodology/methodology.component.ts
index 0904342..c328468 100644
--- a/src/app/methodology/methodology.component.ts
+++ b/src/app/methodology/methodology.component.ts
@@ -421,8 +421,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
- `,
- styleUrls: ['methodology.component.css']
+ `
})
export class MethodologyComponent implements OnInit, OnDestroy {
public stakeholder: Stakeholder;
diff --git a/src/app/monitor/monitor.component.css b/src/app/monitor/monitor.component.css
deleted file mode 100644
index 5137474..0000000
--- a/src/app/monitor/monitor.component.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.uk-card {
- min-height: 270px;
-}
-.uk-card.semiFiltered, .uk-card.semiFiltered > * > .highcharts-series-group {
- opacity: 0.5;
-}
-.custom-description-overlay {
- position: absolute;
- top: 0;
- left: 0;
- background: rgba(0,0,0,0.8);
- width: 100%;
- height: 100%;
-}
-.custom-description-overlay .inner {
- background: #fff;
- border-radius: 6px;
- width: 75%;
- max-height: 75%;
- overflow: auto;
-}
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index deedc5b..886bcc0 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -1,5 +1,5 @@
-
+ class="indicator-description uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
@@ -259,14 +257,11 @@
-
-
-
+
+
-
diff --git a/src/app/monitor/monitor.component.less b/src/app/monitor/monitor.component.less
new file mode 100644
index 0000000..b16d3d0
--- /dev/null
+++ b/src/app/monitor/monitor.component.less
@@ -0,0 +1,26 @@
+@import (reference) "~src/assets/openaire-theme/less/_import-variables";
+
+.uk-card {
+ min-height: 270px;
+}
+
+.uk-card.semiFiltered, .uk-card.semiFiltered > * > .highcharts-series-group {
+ opacity: 0.5;
+}
+
+.indicator-description {
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: @global-overlay-background;
+ width: 100%;
+ height: 100%;
+
+ .inner {
+ background: @global-background;
+ border-radius: @global-border-radius;
+ width: 75%;
+ max-height: 75%;
+ overflow: auto;
+ }
+}
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index e152701..d14616f 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -33,12 +33,10 @@ import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service";
import {ClickEvent} from '../openaireLibrary/utils/click/click-outside-or-esc.directive';
-declare var UIkit;
-
@Component({
selector: 'monitor',
templateUrl: 'monitor.component.html',
- styleUrls: ['monitor.component.css']
+ styleUrls: ['monitor.component.less']
})
export class MonitorComponent implements OnInit, OnDestroy {
public user: User;
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index e3f082b..01fd4ac 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit e3f082b8026053bc6095d29f4e2ac2d6922ef775
+Subproject commit 01fd4ac49f2758bb992529478562358bf45e6370
diff --git a/src/app/topic/indicators.component.css b/src/app/topic/indicators.component.css
deleted file mode 100644
index 702e524..0000000
--- a/src/app/topic/indicators.component.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.uk-card {
- min-height: 270px;
-}
-
-.number-preview {
- border: 1px solid var(--muted-color);
- background: transparent;
- border-radius: 6px;
- min-width: 100px;
- min-height: 70px;
-}
-
-.refresh-indicator {
- background-color: rgba(0, 0, 0, 0.50);
- border-radius: 6px;
- position: absolute;
- color: var(--light-color);
- z-index: 1;
-}
-
-.section {
- padding: 60px 45px;
- border-radius: 6px;
- border: 1px solid var(--muted-color);
- position: relative;
- background: var(--light-color);
- border-left: 5px var(--primary-color) solid;
-}
-
-.section .tools {
- position: absolute;
- top: 0;
- left: 50%;
- transform: translate(-50%, -100%);
- width: 50px;
- max-width: 50px;
- padding: 5px 0 5px 10px;
- background-image: var(--dashboard-primary-image);
- color: var(--light-color);
- -webkit-clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%);
- clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%);
- display: none;
-}
-
-.section:hover .tools {
- display: block;
-}
-
-.section:hover .tools a {
- color: currentColor;
-}
-
-.section:hover .tools a:hover {
- text-decoration: none;
-}
diff --git a/src/app/topic/indicators.component.less b/src/app/topic/indicators.component.less
new file mode 100644
index 0000000..774b6f3
--- /dev/null
+++ b/src/app/topic/indicators.component.less
@@ -0,0 +1,58 @@
+@import (reference) "~src/assets/openaire-theme/less/_import-variables";
+
+.uk-card {
+ min-height: 270px;
+}
+
+.number-preview {
+ border: @global-border-width solid @global-border;
+ background: transparent;
+ border-radius: @global-border-radius;
+ min-width: 100px;
+ min-height: 70px;
+}
+
+.refresh-indicator {
+ background-color: @global-overlay-background;
+ border-radius: @global-border-radius;
+ position: absolute;
+ color: @global-inverse-color;
+ z-index: 1;
+}
+
+.section {
+ padding: 60px 45px;
+ border-radius: @global-border-radius;
+ border: @global-border-width solid @global-border;
+ position: relative;
+ background: @global-inverse-color;
+ border-left: 5px @global-primary-background solid;
+
+ .tools {
+ position: absolute;
+ top: 0;
+ left: 50%;
+ transform: translate(-50%, -100%);
+ width: 50px;
+ max-width: 50px;
+ padding: 5px 0 5px 10px;
+ background-image: @global-primary-gradient;
+ color: @global-inverse-color;
+ -webkit-clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%);
+ clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%);
+ display: none;
+ }
+
+ &:hover {
+ .tools {
+ display: block;
+
+ a {
+ color: currentColor;
+ &:hover {
+ text-decoration: none;
+ }
+ }
+ }
+ }
+}
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts
index 04ca1d4..11cf9a3 100644
--- a/src/app/topic/indicators.component.ts
+++ b/src/app/topic/indicators.component.ts
@@ -43,7 +43,7 @@ declare var UIkit;
@Component({
selector: 'indicators',
templateUrl: './indicators.component.html',
- styleUrls: ['indicators.component.css']
+ styleUrls: ['indicators.component.less']
})
export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit {
filesToUpload: Array;
diff --git a/src/assets/common-assets b/src/assets/common-assets
index d577c6d..9a12093 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit d577c6d69a55901e319cf0cf5b93f900f1cdeaab
+Subproject commit 9a1209353f91e08a55b37a5edfb13825fc6d4078
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
deleted file mode 160000
index 6a92074..0000000
--- a/src/assets/dashboard-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a92074076f71ee522120e9941e22a9caf16e6dc
diff --git a/src/assets/monitor-dashboard-custom.less b/src/assets/monitor-dashboard-custom.less
index 2a407e8..00ada3a 100644
--- a/src/assets/monitor-dashboard-custom.less
+++ b/src/assets/monitor-dashboard-custom.less
@@ -1,15 +1,17 @@
.stakeholderPage {
/* Import OpenAIRE theme*/
@import (multiple) "~src/assets/openaire-theme/less/_import";
+ @import (multiple) "~src/assets/common-assets/less/_import";
+ @monitor-dashboard-background: #F3F3F3;
/** Global */
@global-primary-gradient: linear-gradient(110deg, @monitor-light-color 0%, @monitor-dark-color 100%);
- /** Background*/
+ /** Background */
@background-primary-background: @monitor-color;
@background-primary-background-gradient: none;
- /** Buttons */
+ /** Button */
@button-primary-background: @monitor-color;
@button-secondary-border: @monitor-color;
@button-secondary-color: @monitor-color;
@@ -32,11 +34,22 @@
@text-primary-color: @monitor-color;
@text-background-color: @monitor-color;
+ /* General */
+ @general-search-form-background: @monitor-dashboard-background;
+ @general-tab-featured-tab: @monitor-color;
+
+ /* Landing */
+ @landing-portal-color: @monitor-color;
+
+ /* Dashboard */
+ @dashboard-page-content-background: @monitor-dashboard-background;
+ @dashboard-primary-background: @monitor-color;
+
& #filters_icon .start {
stop-color: @monitor-light-color;
}
- & #filters_icon .end {
+ & #filters_icon .end {
stop-color: @monitor-dark-color;
}
}
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index a61c749..3bc96a4 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit a61c749816accd456cf30c9e4983d61282f28a89
+Subproject commit 3bc96a4bdccd2f09dab039759375fa8980e8e59e
diff --git a/src/assets/stakeholders.json b/src/assets/stakeholders.json
deleted file mode 100644
index b318543..0000000
--- a/src/assets/stakeholders.json
+++ /dev/null
@@ -1,717 +0,0 @@
-{
- "stakeholders": [
- {
- "id": "1",
- "type": "funder",
- "index_id": "EC",
- "index_name": "European Comission",
- "index_shortName": "EC",
- "alias": "EC",
- "isDefaultProfile": false,
- "isActive": true,
- "isPublic": true,
- "creationDate": "08-10-2019",
- "updateDate": "08-10-2019",
- "managers": null,
- "topics": [
- {
- "name": "OpenScience",
- "alias": "openScience",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isActive": true,
- "isPublic": true,
- "categories": [
- {
- "name": "Overview",
- "alias": "overview",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": true,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- {
- "id": "1",
- "type": "number",
- "name": "Total",
- "description": "Total number of publications",
- "tags": [
- "publications"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "publications"
- ]
- }
- ]
- },
- {
- "id": "2",
- "type": "number",
- "name": "Open",
- "description": "Total number of open access publications",
- "tags": [
- "publication",
- "open access"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "open_access"
- ]
- }
- ]
- },
- {
- "id": "3",
- "type": "number",
- "name": "Embargo",
- "description": "Total number of embargoed publications",
- "tags": [
- "publication",
- "embargo"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "embargo"
- ]
- }
- ]
- }
- ],
- "charts": [
- {
- "id": "4",
- "type": "charts",
- "name": "Number of publications by project",
- "description": "Number of publications by project",
- "tags": [
- "publication",
- "project"
- ],
- "width": "large",
- "indicatorPaths": [
- {
- "type": "bar graph",
- "url": "https://www.openaire.eu/stats/chart.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22EC%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- },
- {
- "type": "table",
- "url": "https://www.openaire.eu/stats/gtable.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22pie%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22European%20Commission%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- }
- ]
- }
- ]
- },
- {
- "name": "Open",
- "description": "open",
- "alias": "open",
- "isActive": true,
- "isPublic": true,
- "numbers": [
- {
- "id": "1",
- "type": "number",
- "name": "Total",
- "description": "Total number of publications",
- "tags": [
- "publications"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "publications"
- ]
- }
- ]
- },
- {
- "id": "2",
- "type": "number",
- "name": "Open",
- "description": "Total number of open access publications",
- "tags": [
- "publication",
- "open access"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "open_access"
- ]
- }
- ]
- },
- {
- "id": "3",
- "type": "number",
- "name": "Embargo",
- "description": "Total number of embargoed publications",
- "tags": [
- "publication",
- "embargo"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "embargo"
- ]
- }
- ]
- }
- ],
- "charts": [
- {
- "id": "4",
- "type": "charts",
- "name": "Number of publications by project",
- "description": "Number of publications by project",
- "tags": [
- "publication",
- "project"
- ],
- "width": "large",
- "indicatorPaths": [
- {
- "type": "bar graph",
- "url": "https://www.openaire.eu/stats/chart.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22EC%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- },
- {
- "type": "table",
- "url": "https://www.openaire.eu/stats/gtable.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22pie%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22European%20Commission%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- }
- ]
- }
- ]
- }
- ]
- },
- {
- "name": "Publications",
- "alias": "publications",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": false,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- {
- "id": "1",
- "type": "number",
- "name": "Total",
- "description": "Total number of publications",
- "tags": [
- "publications"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "publications"
- ]
- }
- ]
- },
- {
- "id": "2",
- "type": "number",
- "name": "Open",
- "description": "Total number of open access publications",
- "tags": [
- "publication",
- "open access"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "open_access"
- ]
- }
- ]
- },
- {
- "id": "3",
- "type": "number",
- "name": "Embargo",
- "description": "Total number of embargoed publications",
- "tags": [
- "publication",
- "embargo"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "embargo"
- ]
- }
- ]
- }
- ],
- "charts": [
- {
- "id": "4",
- "type": "charts",
- "name": "Number of publications by project",
- "description": "Number of publications by project",
- "tags": [
- "publication",
- "project"
- ],
- "width": "large",
- "indicatorPaths": [
- {
- "type": "bar graph",
- "url": "https://www.openaire.eu/stats/chart.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22EC%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- },
- {
- "type": "table",
- "url": "https://www.openaire.eu/stats/gtable.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22pie%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22European%20Commission%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- }
- ]
- }
- ]
- }
- ]
- },
- {
- "name": "Research data",
- "alias": "researchData",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": false,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- ],
- "charts": [
- ]
- }
- ]
- },
- {
- "name": "Software",
- "alias": "software",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": false,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- ],
- "charts": [
- ]
- }
- ]
- },
- {
- "name": "Other",
- "alias": "other",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": false,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- ],
- "charts": [
- ]
- }
- ]
- }
- ]
- },
- {
- "name": "Collaboration",
- "alias": "collaboration",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isActive": true,
- "isPublic": true,
- "categories": [
- {
- "name": "Overview",
- "alias": "overview",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": true,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- {
- "id": "1",
- "type": "number",
- "name": "Total",
- "description": "Total number of publications",
- "tags": [
- "publications"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "publications"
- ]
- }
- ]
- },
- {
- "id": "2",
- "type": "number",
- "name": "Open",
- "description": "Total number of open access publications",
- "tags": [
- "publication",
- "open access"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "open_access"
- ]
- }
- ]
- },
- {
- "id": "3",
- "type": "number",
- "name": "Embargo",
- "description": "Total number of embargoed publications",
- "tags": [
- "publication",
- "embargo"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "embargo"
- ]
- }
- ]
- }
- ],
- "charts": [
- {
- "id": "4",
- "type": "charts",
- "name": "Number of publications by project",
- "description": "Number of publications by project",
- "tags": [
- "publication",
- "project"
- ],
- "width": "large",
- "indicatorPaths": [
- {
- "type": "bar graph",
- "url": "https://www.openaire.eu/stats/chart.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22EC%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- },
- {
- "type": "table",
- "url": "https://www.openaire.eu/stats/gtable.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22pie%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22European%20Commission%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- },
- {
- "name": "Impact/Correlation",
- "alias": "impact-correlation",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isActive": true,
- "isPublic": true,
- "categories": [
- {
- "name": "Overview",
- "alias": "overview",
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...",
- "isOverview": true,
- "isActive": true,
- "isPublic": true,
- "subCategories": [
- {
- "name": null,
- "description": null,
- "alias": null,
- "isActive": true,
- "isPublic": true,
- "numbers": [
- {
- "id": "1",
- "type": "number",
- "name": "Total",
- "description": "Total number of publications",
- "tags": [
- "publications"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "publications"
- ]
- }
- ]
- },
- {
- "id": "2",
- "type": "number",
- "name": "Open",
- "description": "Total number of open access publications",
- "tags": [
- "publication",
- "open access"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "open_access"
- ]
- }
- ]
- },
- {
- "id": "3",
- "type": "number",
- "name": "Embargo",
- "description": "Total number of embargoed publications",
- "tags": [
- "publication",
- "embargo"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/{index_shortName}",
- "jsonPath": [
- "statistics",
- "embargo"
- ]
- }
- ]
- }
- ],
- "charts": [
- {
- "id": "4",
- "type": "charts",
- "name": "Number of publications by project",
- "description": "Number of publications by project",
- "tags": [
- "publication",
- "project"
- ],
- "width": "large",
- "indicatorPaths": [
- {
- "type": "bar graph",
- "url": "https://www.openaire.eu/stats/chart.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22EC%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- },
- {
- "type": "table",
- "url": "https://www.openaire.eu/stats/gtable.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22pie%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22European%20Commission%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- }
- ],
- "indicators": [
- {
- "id": "1",
- "type": "number",
- "name": "Total",
- "description": "Total number of publications",
- "tags": [
- "publications"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "publications"
- ]
- }
- ]
- },
- {
- "id": "2",
- "type": "number",
- "name": "Open",
- "description": "Total number of open access publications",
- "tags": [
- "publication",
- "open access"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "open_access"
- ]
- }
- ]
- },
- {
- "id": "3",
- "type": "number",
- "name": "Embargo",
- "description": "Total number of embargoed publications",
- "tags": [
- "publication",
- "embargo"
- ],
- "width": "small",
- "indicatorPaths": [
- {
- "type": "",
- "url": "/funders/ec",
- "jsonPath": [
- "statistics",
- "embargo"
- ]
- }
- ]
- },
- {
- "id": "4",
- "type": "charts",
- "name": "Number of publications by project",
- "description": "Number of publications by project",
- "tags": [
- "publication",
- "project"
- ],
- "width": "large",
- "indicatorPaths": [
- {
- "type": "bar graph",
- "url": "https://www.openaire.eu/stats/chart.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22EC%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- },
- {
- "type": "table",
- "url": "https://www.openaire.eu/stats/gtable.php?com=query&data={%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22pie%22,%22yaxis%22:1,%22c%22:false}],%22xaxis%22:{%22name%22:%22result_projects-project-title%22,%22agg%22:%22avg%22},%22group%22:%22%22,%22color%22:%22%22,%22type%22:%22chart%22,%22size%22:%2230%22,%22sort%22:%22count-number%22,%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22publications%22],%22in%22:[],%22filters%22:[{%22name%22:%22result_projects-project-funder%22,%22values%22:[%22European%20Commission%22],%22to%22:%22-1%22},{%22name%22:%22type%22,%22values%22:[%22publication%22],%22to%22:%22-1%22}],%22having%22:[],%22xStyle%22:{%22r%22:-90,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:10,%22wt%22:%22-%22},%22title%22:%22European%20Commission%20Publications%20by%20project%20(top%2030)%22,%22subtitle%22:%22%22,%22xaxistitle%22:%22project%22,%22order%22:%22d%22}",
- "jsonPath": []
- }
- ]
- }
- ]
-}
diff --git a/src/deprecated.css b/src/deprecated.css
deleted file mode 100644
index 20d7457..0000000
--- a/src/deprecated.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@import "assets/openaire-theme/css/structure/variables.css";
-@import "assets/openaire-theme/css/openaire.css";
-@import "assets/common-assets/library.css";
-@import "assets/dashboard-theme/main.css";
-
-.stakeholderPage {
- /* Structure */
- --structure-page-content-background-color: #F3F3F3;
- --structure-page-content-background-color-rgb: 243, 243, 243;
-
- /* Login */
- --login-background-color: var(--light-color);
- --login-background-color-hover: var(--light-color);
- --login-color: var(--primary-color);
- --login-color-hover: var(--secondary-color);
-
- /* Dashboard */
- --dashboard-primary-color: var(--monitor-color);
- --dashboard-primary-color-rgb: var(--monitor-color-rgb);
- --dashboard-primary-image: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%);
- --dashboard-primary-inverse-color: var(--light-color);
-
- /* Search */
- --search-form-background: var(--structure-page-content-background-color);
-}
-
-.stakeholderPage .landing {
- --landing-text-primary-color: var(--monitor-color);
-}
diff --git a/src/styles.less b/src/styles.less
index 8be643c..f8bf836 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -2,5 +2,6 @@
/* Import OpenAIRE theme*/
@import "~src/assets/openaire-theme/less/_import";
+@import "~src/assets/common-assets/less/_import";
@import "assets/monitor-dashboard-custom";
@import "assets/print.css";