From 53eda3a026ba42c0502f984af15064ff9d72ba28 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Mon, 18 Apr 2022 14:25:32 +0300
Subject: [PATCH] tweaks on fos/sdg pages

---
 explore/src/app/fos/fos.component.html | 40 ++++++++++++++------------
 explore/src/app/sdg/sdg.component.html |  7 ++---
 explore/src/assets/openaire-theme      |  2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/explore/src/app/fos/fos.component.html b/explore/src/app/fos/fos.component.html
index 63899aeb..4e7030ad 100644
--- a/explore/src/app/fos/fos.component.html
+++ b/explore/src/app/fos/fos.component.html
@@ -11,14 +11,15 @@
 			<div uk-scrollspy-class>
 				Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
 			</div>
-			<div>
-				<a class="uk-display-inline-block uk-text-uppercase uk-button-text uk-margin-top" uk-scrollspy-class
+			<!-- TODO: We need a page for the button link -->
+			<!-- <div>
+				<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text uk-margin-top" uk-scrollspy-class
 						routerLinkActive="router-link-active" routerLink="/">
 					<span class="uk-flex uk-flex-middle">
 						<span>Learn More</span>
 					</span>
 				</a>
-			</div>
+			</div> -->
 		</div>
 		<div class="uk-width-2-5@m uk-width-1-1@s uk-text-center" uk-scrollspy-class>
 			<img src="../../assets/explore-assets/fos-hero-img.svg" loading="lazy">
@@ -34,12 +35,15 @@
 	</div>
 	<ng-container *ngIf="keyword && keyword.length">
 		<div class="uk-padding-small">
-			<div class="uk-margin-small-bottom">Search results for '{{keyword}}'</div>
+			<div class="uk-margin-small-bottom">Search results for:</div>
 			<span class="uk-display-inline-block">
 				<a [attr.uk-tooltip]="'Remove'" (click)="clearKeyword()" class="uk-link-reset">
-					<span class="uk-label uk-flex uk-flex-middle">
+					<span class="uk-label uk-label-primary uk-flex uk-flex-middle">
 						<span class="uk-margin-small-right uk-width-expand">{{keyword}}</span>
-						<icon class="uk-text-muted" name="close" flex="true" ratio="0.7"></icon>
+						<!-- <icon class="uk-text-muted" name="close" flex="true" ratio="0.7"></icon> -->
+						<button class="uk-close uk-icon">
+							<icon name="close" flex="true" ratio="0.7"></icon>
+						</button>
 					</span>
 				</a>
 			</span>
@@ -61,8 +65,8 @@
 				<div *ngIf="fos[index]" class="uk-width-3-4">
 					<div class="uk-text-capitalize">
 						<h2 class="uk-h4 uk-margin-remove">
-							<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: fos[index].id}" target="_blank"
-								class="uk-link-reset">
+							<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: fos[index].id}"
+								class="uk-link-text">
 								{{fos[index].id}}
 							</a>
 						</h2>
@@ -71,14 +75,14 @@
 						<div *ngFor="let child of fos[index].children">
 							<div class="whole-child uk-text-capitalize">
 								<h3 class="uk-h6 uk-margin-small-bottom">
-									<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: child.id}" target="_blank"
-										class="uk-link-reset">
+									<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: child.id}"
+										class="uk-link-text">
 										{{child.id}}
 									</a>
 								</h3>
 								<div *ngFor="let subChild of child.children" style="margin-bottom: 5px;">
-									<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subChild.id}" target="_blank"
-										class="uk-link-reset">
+									<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subChild.id}"
+										class="uk-link-text">
 										{{subChild.id}}
 									</a>
 								</div>
@@ -95,20 +99,20 @@
 				<div
 					class="uk-margin-large-bottom uk-padding uk-padding-remove-top uk-padding-remove-horizontal uk-text-capitalize custom-bottom-border">
 					<h2 class="uk-h4 uk-margin-remove">
-						<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: item.id}" target="_blank"
-							class="uk-link-reset" [innerHTML]="highlightKeyword(item.id)">
+						<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: item.id}"
+							class="uk-link-text" [innerHTML]="highlightKeyword(item.id)">
 						</a>
 					</h2>
 					<div class="uk-grid uk-child-width-1-3 uk-margin-large-top uk-margin-medium-bottom" uk-grid="masonry: false">
 						<div *ngFor="let subItem of item.children">
 							<h3 class="uk-h6 uk-margin-small-bottom">
-								<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subItem.id}" target="_blank"
-									class="uk-link-reset" [innerHTML]="highlightKeyword(subItem.id)">
+								<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subItem.id}"
+									class="uk-link-text" [innerHTML]="highlightKeyword(subItem.id)">
 								</a>
 							</h3>
 							<div *ngFor="let subSubItem of subItem.children" style="margin-bottom: 5px;">
-								<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subSubItem.id}" target="_blank"
-									class="uk-link-reset" [innerHTML]="highlightKeyword(subSubItem.id)">
+								<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subSubItem.id}"
+									class="uk-link-text" [innerHTML]="highlightKeyword(subSubItem.id)">
 								</a>
 							</div>
 						</div>
diff --git a/explore/src/app/sdg/sdg.component.html b/explore/src/app/sdg/sdg.component.html
index 285dc97a..b0b3cc54 100644
--- a/explore/src/app/sdg/sdg.component.html
+++ b/explore/src/app/sdg/sdg.component.html
@@ -7,18 +7,16 @@
 <div class="uk-container uk-container-large uk-section"  uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
 	<div class="uk-grid uk-grid-large uk-grid-stack uk-padding-small" uk-grid>
 		<div class="uk-width-3-5@m uk-width-1-1@s uk-flex uk-flex-column uk-flex-center">
-			<!-- TODO: add svg sdg img to the end of the title -->
 			<h1 uk-scrollspy-class>Science for UN Sustainable <br> Development Goals<span class="custom-sdg-dot"></span></h1>
 			<h2 uk-scrollspy-class class="uk-h5 uk-margin-remove-top">
 				Laying the foundation for new approaches and solutions.
 			</h2>
 			<div uk-scrollspy-class>
-				<!-- We have implemented the UN Sustainable Development Goals ( SDGs) as a <br> classification scheme covering areas of research associated with one or more SDGs <br> (the majority of the SDGs are interrelated). The scheme uses automated allocation <br> of the 17 SDGs and their associated targets and indicators to all fitting documents in <br> Dimensions thereby addressing research areas aligned to the goals. -->
 				We have developed a classification scheme for UN Sustainable Development Goals, <br> to view contributions of research towards complex challenges for humanity <br> such as climate change, biodiversity loss, pollution and poverty reduction.
 			</div>
 			<div>
 				<!-- TODO: need a page for the description of the algorithm - to get us there from the learn more btn -->
-				<!-- <a class="uk-display-inline-block uk-text-uppercase uk-button-text uk-margin-top" uk-scrollspy-class
+				<!-- <a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text uk-margin-top" uk-scrollspy-class
 						routerLinkActive="router-link-active" routerLink="/">
 					<span class="uk-flex uk-flex-middle">
 						<span>Learn More</span>
@@ -41,7 +39,7 @@
 	<div *ngIf="!loading">
 		<div *ngIf="displayedSdgs && displayedSdgs.length" class="uk-padding-small uk-margin-auto@m uk-grid uk-child-width-1-4@xl uk-child-width-1-4@l uk-child-width-1-3@m uk-child-width-1-2@s" uk-grid>
 			<div *ngFor="let sdg of displayedSdgs">
-				<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'sdg', fv0: sdg.id}" target="_blank"
+				<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'sdg', fv0: sdg.id}"
 					class="uk-link-reset">
 					<div class="uk-card uk-card-default uk-padding-small" [class]="'sdg-card sdg-' + sdg.code">
 						<div class="uk-height-1-1 uk-flex uk-flex-column uk-flex-between">
@@ -51,7 +49,6 @@
 								</div>
 								<div class="uk-text-bold uk-text-uppercase uk-text-small uk-margin-small-left">
 									<span [innerHTML]="sdg.html"></span>
-									<!-- {{sdg.label}} -->
 								</div>
 							</div>
 							<div class="uk-text-center">
diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme
index f7efc69c..c98b39a5 160000
--- a/explore/src/assets/openaire-theme
+++ b/explore/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit f7efc69c9b5b01c3b00ba52da8cac7b9f1b85c4d
+Subproject commit c98b39a5a5d45e3f9676be11d38b78d881f9f8d5