add [Beta] indication for FOS/SDGs

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "explore/src/assets/common-assets"]
 	path = explore/src/assets/common-assets
 	url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git
-[submodule "explore/src/assets/openaire-theme"]
-	path = explore/src/assets/openaire-theme
-	url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git

explore/angular.json

@@ -57,8 +57,9 @@
               "src/material.scss"
             ],
             "scripts": [
-              "src/assets/openaire-theme/js/uikit.min.js",
+              "src/assets/common-assets/common/jquery.js",
-              "src/assets/openaire-theme/js/uikit-icons.min.js",
+              "src/assets/common-assets/common/uikit.min.js",
+              "src/assets/common-assets/common/uikit-icons.min.js",
               "node_modules/jquery/dist/jquery.js"
             ]
           },

explore/src/app/app-routing.module.ts

@@ -9,8 +9,6 @@ const routes: Routes = [
   //{ path: 'home', loadChildren: './home/home.module#HomeModule'},
   {path: 'home', redirectTo: '', pathMatch: 'full'},
   {path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)},
-	{path: 'sdg', loadChildren: () => import('./sdg/sdg.module').then(m => m.SdgModule)},
-	{path: 'fos', loadChildren: () => import('./fos/fos.module').then(m => m.FosModule)},
   // ORCID Pages
   {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)},
   {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)},

explore/src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 0c5483ac9b0c0f7d1902ab4dbec51d14495e956a
+Subproject commit ad6029204947e1091dc89adc1589461e7df75c10

explore/src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 77d3480a05f35055d0447844c184b680b3a1a502
+Subproject commit 04d799f089c93ae28c9d2ca8436f283ebc0be3ae

explore/src/assets/explore-custom.css

@@ -1,283 +1,263 @@
 :root {
-  /*buttons*/
+    --portal-main-color: #D95F2D;
-  --button-primary-background: var(--explore-color);
+    --portal-main-contrast: white;
-  --button-primary-background-image: linear-gradient(104deg, var(--explore-dark-color) 50%, var(--explore-light-color) 100%);
+    --portal-dark-color: #a0462c;
+    --openaire-main-color: #313179;
 
-  /*backgrounds*/
+    --explore-portal-color: #D95F2D;
-  --background-primary:var(--explore-color);
+    --provide-portal-color: #37C7E9;
-  --background-primary-image:none;
+    --monitor-portal-color: #9ABB55;
-  --background-secondary: var(--grey-color);
+    --connect-portal-color: #EBB13E;
-  --background-secondary-image:none;
+    --develop-portal-color: #DA65AB;
 
-  /*fonts*/
+    --explore-portal-lower-tone: #a0462c;
-  --text-primary-color: var(--explore-color);
+    --provide-portal-lower-tone: #3A8FA3;
-  --text-gradient-color: linear-gradient(110deg, var(--explore-dark-color) 0%, var(--explore-light-color) 100%);
+    --monitor-portal-lower-tone: #7c9144;
-
+    --connect-portal-lower-tone: #b48536;
-  /*slider*/
+    --develop-portal-lower-tone: #9f4e7e;
-  --slider-dot-background: rgba(var(--explore-color-rgb), 0.5);
-  --slider-dot-active-background: var(--explore-color);
 }
 
-/*:root {*/
-/*    --portal-main-color: #D95F2D;*/
-/*    --portal-main-contrast: white;*/
-/*    --portal-dark-color: #a0462c;*/
-/*    --openaire-main-color: #313179;*/
 
-/*    --explore-portal-color: #D95F2D;*/
+.tm-toolbar .uk-subnav-line .custom-explore-li {
-/*    --provide-portal-color: #37C7E9;*/
+   background:var(--portal-main-color) !important;
-/*    --monitor-portal-color: #9ABB55;*/
+}
-/*    --connect-portal-color: #EBB13E;*/
+/* .custom-explore-toolbar   ul.uk-subnav.uk-subnav-line{
-/*    --develop-portal-color: #DA65AB;*/
+  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: var(--portal-main-color) !important;
+  }
 
-/*    --explore-portal-lower-tone: #a0462c;*/
+  .custom-explore-toolbar{
-/*    --provide-portal-lower-tone: #3A8FA3;*/
+    border-top-color:var(--portal-main-color) !important;
-/*    --monitor-portal-lower-tone: #7c9144;*/
+  } */
-/*    --connect-portal-lower-tone: #b48536;*/
+.mainPageSearchForm{
-/*    --develop-portal-lower-tone: #9f4e7e;*/
+  /*background-image: !*linear-gradient(rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)),*! url('home.jpg');*/
-/*}*/
+    background: transparent linear-gradient(180deg, #FAFAFA 0%, #FFFFFF 100%);
-
+}
-
+.firstPageNumbers{
-/*.tm-toolbar .uk-subnav-line .custom-explore-li {*/
+  /* font-weight: 600 !important; */
-/*   background:var(--portal-main-color) !important;*/
+  /* 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   ul.uk-subnav.uk-subnav-line{*/
-/*  background-color: var(--portal-main-color) !important;*/
-/*}*/
-/*  .custom-explore-toolbar .inner {*/
-/*       background-color: var(--portal-main-color) !important;*/
-/*  }*/
-
-/*  .custom-explore-toolbar{*/
-/*    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');*!*/
-/*    background: transparent linear-gradient(180deg, #FAFAFA 0%, #FFFFFF 100%);*/
-/*}*/
-/*.firstPageNumbers{*/
-/*  !* font-weight: 600 !important; *!*/
-/*  !* color: var(--portal-main-color) !important; *!*/
-/*}*/
 
 
 
-/*.explore-numbers  {*/
+.explore-numbers  {
-/* }*/
+ }
 
-/*.mainPageBottomInfo{*/
+.mainPageBottomInfo{
-/*  background: linear-gradient( rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)), url('home.jpg');*/
+  background: linear-gradient( rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)), url('home.jpg');
-/*  background-attachment: scroll, scroll;*/
+  background-attachment: scroll, scroll;
-/*  background-size: auto auto, auto auto;*/
+  background-size: auto auto, auto auto;
-/*  background-size: cover;*/
+  background-size: cover;
-/*  background-attachment: fixed;*/
+  background-attachment: fixed;
-/*  box-sizing: border-box;*/
+  box-sizing: border-box;
-/*  min-height: calc(100vh - 412.767px);*/
+  min-height: calc(100vh - 412.767px);
-/*}*/
+}
-/*.box-links .uk-card-header:hover {*/
+.box-links .uk-card-header:hover {
-/*  text-decoration: underline;*/
+  text-decoration: underline;
-/*  text-decoration-color: currentcolor;*/
+  text-decoration-color: currentcolor;
-/*  text-decoration-color: #90929D;*/
+  text-decoration-color: #90929D;
-/*}*/
+}
 
-/*.searchForm, .generalSearchForm,*/
+.searchForm, .generalSearchForm,
-/*.publicationsSearchForm,*/
+.publicationsSearchForm,
-/*.projectsSearchForm, .projectsTableSearchForm,*/
+.projectsSearchForm, .projectsTableSearchForm,
-/*.organizationsSearchForm,*/
+.organizationsSearchForm,
-/*.datasetsSearchForm,*/
+.datasetsSearchForm,
-/*.softwareSearchForm,*/
+.softwareSearchForm,
-/*.orpsSearchForm,*/
+.orpsSearchForm,
-/*.datasourcesSearchForm,  .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,*/
+.datasourcesSearchForm,  .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,
-/* .journalsSearchForm, .journalsTableSearchForm,*/
+ .journalsSearchForm, .journalsTableSearchForm,
-/*.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {*/
+.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {
 
-/*    background: url('./Εxplore-sub.jpg') right !important;*/
+    background: url('./Εxplore-sub.jpg') right !important;
 
-/*}*/
+}
 
-/*.ask-explore.uk-grid-divider > :not(.uk-first-column)::before {*/
+.ask-explore.uk-grid-divider > :not(.uk-first-column)::before {
-/*  border-left: 1px solid var(--portal-main-color) ;*/
+  border-left: 1px solid var(--portal-main-color) ;
-/*}*/
+}
 
-/*.questions .tm-child-list-divider > ul > li:nth-child(n+2), .questions .uk-list-divider > li:nth-child(n+2) {*/
+.questions .tm-child-list-divider > ul > li:nth-child(n+2), .questions .uk-list-divider > li:nth-child(n+2) {
-/*  border-top: 1px solid #c5c5c5;*/
+  border-top: 1px solid #c5c5c5;
-/*}*/
+}
 
-/*.questions {*/
+.questions {
-/*  font-size: 15px;*/
+  font-size: 15px;
-/*  font-weight: bold;*/
+  font-weight: bold;
-/*  color: #4687E6;*/
+  color: #4687E6;
-/*}*/
+}
 
-/*.uk-card-explore {*/
+.uk-card-explore {
-/*  background-color: var(--portal-main-color);*/
+  background-color: var(--portal-main-color);
-/*  color: #fff !important;*/
+  color: #fff !important;
-/*}*/
+}
 
-/*.uk-card-explore .uk-h3 {*/
+.uk-card-explore .uk-h3 {
-/*  color: #fff !important;*/
+  color: #fff !important;
-/*}*/
+}
 
-/*.uk-card-explore .uk-h6 a {*/
+.uk-card-explore .uk-h6 a {
-/*  color: #fff !important;*/
+  color: #fff !important;
-/*  text-decoration: underline;*/
+  text-decoration: underline;
-/*}*/
+}
 
-/*.uk-card-explore .uk-h5 {*/
+.uk-card-explore .uk-h5 {
-/*  color: #fff !important;*/
+  color: #fff !important;
-/*  text-transform: uppercase;*/
+  text-transform: uppercase;
-/*  font-size: 15px;*/
+  font-size: 15px;
-/*  font-weight: bolder;*/
+  font-weight: bolder;
-/*}*/
+}
 
-/*.emphasis {*/
+.emphasis {
-/*  color: #000;*/
+  color: #000;
-/*  font-size: 17px;*/
+  font-size: 17px;
-/*  font-weight: bold;*/
+  font-weight: bold;
-/*}*/
+}
 
-/*.portal-color.emphasis {*/
+.portal-color.emphasis {
-/*  color: #37C7E9;*/
+  color: #37C7E9;
-/*  font-size: 40px;*/
+  font-size: 40px;
-/*  font-weight: bold;*/
+  font-weight: bold;
-/*}*/
+}
 
-/*.numbers-background {*/
+.numbers-background {
-/*    background: transparent url('explore-assets/numbers_background_pattern.svg') repeat-x center bottom;*/
+    background: transparent url('explore-assets/numbers_background_pattern.svg') repeat-x center bottom;
-/*}*/
+}
 
-/*.number {*/
+.number {
-/*  color: #1d1d1d;*/
+  color: #1d1d1d;
-/*}*/
+}
 
 
-/*.home-logo img{*/
+.home-logo img{
-/*    -webkit-filter: grayscale(1); !* Safari 6.0 - 9.0 *!*/
+    -webkit-filter: grayscale(1); /* Safari 6.0 - 9.0 */
-/*    filter: grayscale(1);*/
+    filter: grayscale(1);
-/*    transition-duration:0.3s;*/
+    transition-duration:0.3s;
-/*}*/
+}
 
-/*.home-logo:hover img{*/
+.home-logo:hover img{
-/*    -webkit-filter: grayscale(0); !* Safari 6.0 - 9.0 *!*/
+    -webkit-filter: grayscale(0); /* Safari 6.0 - 9.0 */
-/*    filter: grayscale(0);*/
+    filter: grayscale(0);
-/*    transition-duration:0.3s;*/
+    transition-duration:0.3s;
-/*}*/
+}
 
-/*.graph-background {*/
+.graph-background {
-/*  background: #F4F4F4 0 0 no-repeat padding-box;*/
+  background: #F4F4F4 0 0 no-repeat padding-box;
-/*}*/
+}
 
-/*.graph-background-bottom {*/
+.graph-background-bottom {
-/*  background-image: url("curved-bottom.svg");*/
+  background-image: url("curved-bottom.svg");
-/*  background-color: #FAFAFA;*/
+  background-color: #FAFAFA;
-/*  height: 170px;*/
+  height: 170px;
-/*}*/
+}
 
-/*.trello-image {*/
+.trello-image {
-/*    margin-top: -3px;*/
+    margin-top: -3px;
-/*}*/
+}
 
-/*.trello-button {*/
+.trello-button {
-/*  border: #0079BF 1px solid;*/
+  border: #0079BF 1px solid;
-/*  text-transform: none !important;*/
+  text-transform: none !important;
-/*  font-size: 16px;*/
+  font-size: 16px;
-/*  padding: 0 16px;*/
+  padding: 0 16px;
-/*}*/
+}
 
-/*.trello-button-white {*/
+.trello-button-white {
-/*    background-color: white;*/
+    background-color: white;
-/*    color: #0079BF;*/
+    color: #0079BF;
-/*}*/
+}
 
-/*.trello-button-blue {*/
+.trello-button-blue {
-/*    background-color: #0076BA;*/
+    background-color: #0076BA;
-/*    color: white;*/
+    color: white;
-/*}*/
+}
 
-/*.trello-button-white:hover {*/
+.trello-button-white:hover {
-/*    background-color: #E9EEF5;*/
+    background-color: #E9EEF5;
-/*    color: #0079BF;*/
+    color: #0079BF;
-/*}*/
+}
 
-/*.trello-button-blue:hover {*/
+.trello-button-blue:hover {
-/*    background-color: #0084B1;*/
+    background-color: #0084B1;
-/*    color: white;*/
+    color: white;
-/*}*/
+}
 
-/*.explorePanelBackground {*/
+.explorePanelBackground {
-/*    background: transparent linear-gradient(133deg, #F5F5F5 0%, #D8D8D8 100%) 0% 0% no-repeat padding-box;*/
+    background: transparent linear-gradient(133deg, #F5F5F5 0%, #D8D8D8 100%) 0% 0% no-repeat padding-box;
-/*}*/
+}
 
-/*.explorePanelBackground .uk-grid-divider > :not(.uk-first-column)::before {*/
+.explorePanelBackground .uk-grid-divider > :not(.uk-first-column)::before {
-/*    border-left: 1px solid rgba(0, 0, 0, .2);*/
+    border-left: 1px solid rgba(0, 0, 0, .2);
-/*}*/
+}
 
-/*.explorePanelBackground .uk-breadcrumb > :nth-child(n+2):not(.uk-first-column)::before {*/
+.explorePanelBackground .uk-breadcrumb > :nth-child(n+2):not(.uk-first-column)::before {
-/*    color: #bfbfbf;*/
+    color: #bfbfbf;
-/*}*/
+}
 
-/*.exploreBorder {*/
+.exploreBorder {
-/*    border-color: #d8d8d8;*/
+    border-color: #d8d8d8;
-/*    border-style: solid;*/
+    border-style: solid;
-/*    border-width: 2px;*/
+    border-width: 2px;
-/*    border-radius: 6px;*/
+    border-radius: 6px;
-/*}*/
+}
 
-/*.flex-column {*/
+.flex-column {
-/*	display: flex;*/
+	display: flex;
-/*	flex-direction: column;*/
+	flex-direction: column;
-/*}*/
+}
 
-/*.min-width-30 {*/
+.min-width-30 {
-/*	min-width: 30%;*/
+	min-width: 30%;
-/*}*/
+}
 
-/*.verticalLine {*/
+.verticalLine {
-/*	height: 100%;*/
+	height: 100%;
-/*	width: 2px;*/
+	width: 2px;
-/*	background-color: #DEDEDE;*/
+	background-color: #DEDEDE;
-/*	opacity: 0.7;*/
+	opacity: 0.7;
-/*}*/
+}
 
-/*.flex-gap {*/
+.flex-gap {
-/*	grid-gap: 40px;*/
+	grid-gap: 40px;
-/*}*/
+}
 
-/*.padding-left {*/
+.padding-left {
-/*	padding-left: 30px;*/
+	padding-left: 30px;
-/*}*/
+}
 
-/*.gateway-link-logo {*/
+.gateway-link-logo {
-/*	max-height: 50px;*/
+	max-height: 50px;
-/*	width: auto;*/
+	width: auto;
-/*	margin-bottom: 10px;*/
+	margin-bottom: 10px;
-/*}*/
+}
 
-/*.custom-height-130 {*/
+.custom-height-130 {
-/*	max-height: 130px;*/
+	max-height: 130px;
-/*}*/
+}
 
-/*.custom-list {*/
+.custom-list {
-/*	list-style: none;*/
+	list-style: none;
-/*	padding-left: 15px;*/
+	padding-left: 15px;
-/*	margin: 10px 0;*/
+	margin: 10px 0;
-/*}*/
+}
 
-/*.custom-list li {*/
+.custom-list li {
-/*	-webkit-column-break-inside: avoid;*/
+	-webkit-column-break-inside: avoid;
-/*  page-break-inside: avoid;*/
+  page-break-inside: avoid;
-/*  break-inside: avoid;*/
+  break-inside: avoid;
-/*	margin-bottom: 4px;*/
+	margin-bottom: 4px;
-/*}*/
+}
 
-/*.connect-image {*/
+.connect-image {
-/*	max-height:100%;*/
+	max-height:100%;
-/*	border-radius: 0 4px 4px 0;*/
+	border-radius: 0 4px 4px 0;
-/*}*/
+}
 
-/*.border-top {*/
+.border-top {
-/*	border-top: 1px solid rgba(0,0,0,0.09);*/
+	border-top: 1px solid rgba(0,0,0,0.09);
-/*}*/
+}

explore/src/assets/openaire-theme

@@ -1 +0,0 @@
-Subproject commit e552bc1f3041ff03719538a7abf08aa04d2a4182

explore/src/assets/vocabulary/sdg.json

@@ -3,54 +3,54 @@
     {
       "code": "1",
       "id": "1. No poverty",
-      "label": "No poverty"
+      "label": "1. No poverty"
     },
     {
       "code": "2",
       "id": "2. Zero hunger",
-      "label": "Zero hunger"
+      "label": "2. Zero hunger"
     },{
       "code": "3",
       "id": "3. Good health",
-      "label": "Good health"
+      "label": "3. Good health"
     },
     {
       "code": "4",
       "id": "4. Education",
-      "label": "Education"
+      "label": "4. Education"
     },
     {
       "code": "5",
       "id": "5. Gender equality",
-      "label": "Gender equality"
+      "label": "5. Gender equality"
     },{
       "code": "6",
       "id": "6. Clean water",
-      "label": "Clean water"
+      "label": "6. Clean water"
     },
     {
       "code": "7",
       "id": "7. Clean energy",
-      "label": "Clean energy"
+      "label": "7. Clean energy"
     },
     {
       "code": "8",
       "id": "8. Economic growth",
-      "label": "Economic growth"
+      "label": "8. Economic growth"
     },{
       "code": "9",
       "id": "9. Industry and infrastructure",
-      "label": "Industry and infrastructure"
+      "label": "9. Industry and infrastructure"
     },
     {
       "code": "10",
       "id": "10. No inequality",
-      "label": "No inequality"
+      "label": "10. No inequality"
     },
     {
       "code": "11",
       "id": "11. Sustainability",
-      "label": "Sustainability"
+      "label": "11. Sustainability"
     },{
       "code": "12",
       "id": "12. Responsible consumption",
@@ -59,26 +59,28 @@
     {
       "code": "13",
       "id": "13. Climate action",
-      "label": "Climate action"
+      "label": "13. Climate action"
     },
     {
       "code": "14",
       "id": "14. Life underwater",
-      "label": "Life underwater"
+      "label": "14. Life underwater"
     },{
       "code": "15",
       "id": "15. Life on land",
-      "label": "Life on land"
+      "label": "15. Life on land"
     },
     {
       "code": "16",
       "id": "16. Peace & justice",
-      "label": "Peace & justice"
+      "label": "16. Peace & justice"
     },
     {
       "code": "17",
       "id": "17. Partnership",
-      "label": "Partnership"
+      "label": "17. Partnership"
     }
+
   ]
+
 }

explore/src/environments/environment.beta.ts

@@ -115,7 +115,6 @@ export let properties: EnvProperties = {
   depositSearchPage: "/participate/deposit/search",
   altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-  b2noteAPIURL: 'https://b2note.eudat.eu/',
   adminPortalURL: "https://beta.admin.connect.openaire.eu",
 
   myOrcidLinksPage: "/my-orcid-links",

explore/src/environments/environment.prod.ts

@@ -120,7 +120,6 @@ export let properties: EnvProperties = {
   depositSearchPage: "/participate/deposit/search",
   altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-  b2noteAPIURL: 'https://b2note.eudat.eu/',
   adminPortalURL: "https://admin.explore.openaire.eu",
 
   myOrcidLinksPage: "/my-orcid-links",

explore/src/environments/environment.test.ts

@@ -119,7 +119,6 @@ export let properties: EnvProperties = {
   depositSearchPage: "/participate/deposit/search",
   altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-  b2noteAPIURL: 'https://b2note.eudat.eu/',
   adminPortalURL: "https://beta.admin.connect.openaire.eu",
 
   myOrcidLinksPage: "/my-orcid-links",

explore/src/environments/environment.ts

@@ -121,7 +121,6 @@ export let properties: EnvProperties = {
   depositSearchPage: "/participate/deposit/search",
   altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu",
-  b2noteAPIURL: 'https://b2note.eudat.eu/',
   impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
   adminPortalURL: "https://beta.admin.connect.openaire.eu",
 

explore/src/styles.css

@@ -1,4 +1,5 @@
 /* You can add global styles to this file, and also import other style files */
-@import "assets/openaire-theme/css/import.css";
+@import "assets/common-assets/common/theme.css";
+@import "assets/common-assets/common/custom.css";
 @import "assets/common-assets/library.css";
 @import "assets/explore-custom.css";