diff --git a/src/app/domain/countries-lat-lon.ts b/src/app/domain/countries-lat-lon.ts index c11674554..a809bda44 100644 --- a/src/app/domain/countries-lat-lon.ts +++ b/src/app/domain/countries-lat-lon.ts @@ -185,7 +185,8 @@ export const latlong = new Map() .set('RE', {latitude: -21.1, longitude: 55.6}) .set('RO', {latitude: 46, longitude: 25}) .set('RS', {latitude: 44, longitude: 21}) - .set('RU', {latitude: 60, longitude: 100}) + // .set('RU', {latitude: 60, longitude: 100}) + .set('RU', {latitude: 55, longitude: 40}) .set('RW', {latitude: -2, longitude: 30}) .set('SA', {latitude: 25, longitude: 45}) .set('SB', {latitude: -8, longitude: 159}) diff --git a/src/app/pages/continentoverview/continent-overview.component.html b/src/app/pages/continentoverview/continent-overview.component.html index b6a7dff77..60471fd1e 100644 --- a/src/app/pages/continentoverview/continent-overview.component.html +++ b/src/app/pages/continentoverview/continent-overview.component.html @@ -135,8 +135,8 @@
- {{europeOverviewData.publications?.oa | number}} OA
- {{europeOverviewData.publications?.total | number}} total + OA: {{europeOverviewData.publications?.oa | number}}
+ Total: {{europeOverviewData.publications?.total | number}}
@@ -144,8 +144,8 @@
- {{europeOverviewData.datasets?.oa | number}} OA
- {{europeOverviewData.datasets?.total | number}} total + OA: {{europeOverviewData.datasets?.oa | number}}
+ Total: {{europeOverviewData.datasets?.total | number}}
@@ -153,8 +153,8 @@
- {{europeOverviewData.software?.oa | number}} OA
- {{europeOverviewData.software?.total | number}} total + OA: {{europeOverviewData.software?.oa | number}}
+ Total: {{europeOverviewData.software?.total | number}}
@@ -162,8 +162,8 @@
- {{europeOverviewData.other?.oa | number}} OA
- {{europeOverviewData.other?.total | number}} total + OA: {{europeOverviewData.other?.oa | number}}
+ Total: {{europeOverviewData.other?.total | number}}
diff --git a/src/app/pages/countrypage/country-page.component.html b/src/app/pages/countrypage/country-page.component.html index 134f284f4..42e5a4e6d 100644 --- a/src/app/pages/countrypage/country-page.component.html +++ b/src/app/pages/countrypage/country-page.component.html @@ -27,11 +27,12 @@ -
- Embed - - Download PDF -
+ // TODO uncomment when implemented + + + + + diff --git a/src/app/pages/home/countries-table.component.html b/src/app/pages/home/countries-table.component.html index 13e38014a..9a1c83497 100644 --- a/src/app/pages/home/countries-table.component.html +++ b/src/app/pages/home/countries-table.component.html @@ -136,13 +136,13 @@ Licence - + Gold - + @@ -167,14 +167,14 @@ {{countryOverview.licence.oa | number}} - + -- {{countryOverview.gold.percentage | number :'1.0-1'}}% {{countryOverview.gold.oa | number}} - + -- {{countryOverview.green.percentage | number :'1.0-1'}}% diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 5e2e92141..4a87e0fd4 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -2,7 +2,7 @@
-
+
diff --git a/src/app/shared/topmenu/top-menu.component.html b/src/app/shared/topmenu/top-menu.component.html index 2f127d84b..732735ae4 100644 --- a/src/app/shared/topmenu/top-menu.component.html +++ b/src/app/shared/topmenu/top-menu.component.html @@ -6,6 +6,9 @@
+
+ BETA +