MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

[master]: Add home page. Fix some mobile related issues in browse and search pages

This commit is contained in:
Konstantinos Triantafyllou 2024-02-08 17:48:53 +02:00
parent 6d5e7fa16c
commit 2510d68598
28 changed files with 453 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app-routing.module.ts
View File

@ -75,9 +75,13 @@ const routes: Routes = [
{path: 'user-policy', loadChildren: () => import('./user-policy/user-policy.module').then(m => m.UserPolicyModule)}, {path: 'user-policy', loadChildren: () => import('./user-policy/user-policy.module').then(m => m.UserPolicyModule)},
{path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule), canActivate: [HasConsentGuard]}, {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule), canActivate: [HasConsentGuard]},
{ {
path: '', path: 'national',
loadChildren: () => import('./national/national.module').then(m => m.NationalModule) loadChildren: () => import('./national/national.module').then(m => m.NationalModule)
}, },
{
path: '',
loadChildren: () => import('./home/home.module').then(m => m.HomeModule)
},
{path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule), canActivate: [HasConsentGuard]}, {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule), canActivate: [HasConsentGuard]},
{path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule), canActivate: [HasConsentGuard]}, {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule), canActivate: [HasConsentGuard]},
{path: 'orcid-discover-links', loadChildren: () => import('./orcid/discover-links/discover-links.module').then(m => m.DiscoverLinksModule), canActivate: [HasConsentGuard]}, {path: 'orcid-discover-links', loadChildren: () => import('./orcid/discover-links/discover-links.module').then(m => m.DiscoverLinksModule), canActivate: [HasConsentGuard]},

3
src/app/app.component.ts
View File

@ -190,7 +190,8 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
initialize() { initialize() {
this.menuItems = [ this.menuItems = [
new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/", false, [], null, {}, null, null, null), new MenuItem("home", "Home", "", "/", false, [], null, {}, null, null, null),
new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/national", false, [], null, {}, null, null, null),
new MenuItem("rpo", this.stakeholderUtils.entities.organization + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rpo", false, [], null, {}, null, null, null, "/rpo"), new MenuItem("rpo", this.stakeholderUtils.entities.organization + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rpo", false, [], null, {}, null, null, null, "/rpo"),
new MenuItem("rfo", this.stakeholderUtils.entities.funder + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rfo", false, [], null, {}, null, null, null, "/rfo"), new MenuItem("rfo", this.stakeholderUtils.entities.funder + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rfo", false, [], null, {}, null, null, null, "/rfo"),
new MenuItem("researcher", "Researcher Monitors", "", "/researcher", false, [], null, {}, null, null, null, "/researcher"), new MenuItem("researcher", "Researcher Monitors", "", "/researcher", false, [], null, {}, null, null, null, "/researcher"),

2
src/app/contact/contact.component.ts
View File

@ -17,7 +17,6 @@ import {FullScreenModalComponent} from "../openaireLibrary/utils/modal/full-scre
export class ContactComponent extends BaseComponent implements OnInit { export class ContactComponent extends BaseComponent implements OnInit {
@Input() @Input()
public page: boolean = true; public page: boolean = true;
public url: string = null;
public sending = false; public sending = false;
public contactForm: UntypedFormGroup; public contactForm: UntypedFormGroup;
@ViewChild('modal') modal; @ViewChild('modal') modal;
@ -38,7 +37,6 @@ export class ContactComponent extends BaseComponent implements OnInit {
if(this.page) { if(this.page) {
this.title = 'Contact us'; this.title = 'Contact us';
this.description = 'Contact us'; this.description = 'Contact us';
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
this.setMetadata(); this.setMetadata();
} }
this.reset(); this.reset();

199
src/app/home/home.component.html Normal file
View File

@ -0,0 +1,199 @@
<div class="uk-tile-default">
<div class="uk-section uk-container hero">
<div class="uk-grid uk-flex-middle" uk-grid>
<h1 class="title uk-h2">
Empowering 100% Open Access in Irish Scholarly Research
</h1>
<div class="uk-text-large uk-width-1-1 uk-width-medium@m uk-flex-last@m">
<div>
Enhance your approach to Open Science. Explore insights thoughtfully designed to support your
strategy and contribute to the future of Irish Open Science. Our current pilot phase, aimed at
enhancing data integrity and broadening functionality, continues until June 2024.
</div>
<a routerLink="/national" class="uk-button uk-button-secondary uk-margin-top">Take a look</a>
</div>
<h1 class="national-monitor uk-width-expand uk-visible@m">
<img src="assets/irish-assets/home/dashboard.png">
</h1>
<img class="uk-hidden@m" src="assets/irish-assets/home/dashboard-mobile.png">
</div>
</div>
</div>
<div class="uk-section">
<div class="uk-container">
<div class="uk-grid uk-child-width-1-1 uk-child-width-1-2@s uk-child-width-1-4@m" uk-grid>
<div>
<h6>Tailored Monitoring</h6>
<div>
Explore role-specific insights through our diverse dashboard types, driving priorities with
precision and efficiency.
</div>
</div>
<div>
<h6>Benchmarking & Evaluation</h6>
<div>
Effectively measure your progress against community standards and assess the impact of your Open
Science initiatives.
</div>
</div>
<div>
<h6>Evidence-based decision</h6>
<div>
Leverage a wealth of information to make informed choices that advance your objectives.
</div>
</div>
<div>
<h6>Collaboration Catalyst</h6>
<div>
Transform complex data into valuable insights, fostering collaborations and partnerships.
</div>
</div>
</div>
</div>
</div>
<div class="uk-section uk-background-secondary dark">
<div class="uk-container">
<h2 class="uk-text-center uk-light">All in one platform</h2>
<div class="uk-margin-large-top uk-grid uk-grid-small uk-child-width-1-1 uk-child-width-1-2@m" uk-height-match=".column" uk-grid>
<div>
<div class="uk-card uk-card-default uk-card-body column uk-flex uk-flex-column">
<div class="uk-text-primary uk-text-large">National Monitor</div>
<h3 class="uk-margin-remove-top uk-width-large">Explore Ireland’s Research Overview</h3>
<div class="uk-width-large uk-width-expand uk-margin-medium-bottom uk-text-large">
Dive into the National Dashboard for a comprehensive view of Ireland’s Open Access landscape or explore our other four types of tailor-made dashboards. </div>
<div class="uk-flex uk-flex-right">
<a routerLink="/national" class="uk-link-reset uk-text-large uk-text-bolder uk-flex uk-flex-middle">
<span>National Monitor</span>
<button class="uk-icon-button uk-button-primary uk-margin-left" [class.uk-icon-button-small]="isMobile">
<icon name="north_east" [flex]="true" [ratio]="isMobile?1:1.5"></icon>
</button>
</a>
</div>
</div>
</div>
<div>
<div class="uk-grid column uk-grid-small uk-child-width-1-1 uk-child-width-1-2@s" uk-grid>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small uk-height-1-1">
<h6 class="uk-margin-remove-top uk-width-expand">Research Performing Organisations Monitors</h6>
<div class="uk-flex uk-flex-right uk-margin-top organization">
<a routerLink="/rpo" class="uk-icon-button uk-icon-button-small uk-button-primary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</a>
</div>
</div>
</div>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small uk-height-1-1">
<h6 class="uk-margin-remove-top uk-width-expand">Researchers monitors</h6>
<div class="uk-flex uk-flex-right researcher">
<a routerLink="/researcher" class="uk-icon-button uk-icon-button-small uk-button-primary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</a>
</div>
</div>
</div>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small uk-height-1-1">
<h6 class="uk-margin-remove-top uk-width-expand">Research Funding Organisations Monitors</h6>
<div class="uk-flex uk-flex-right funder">
<a routerLink="/rfo" class="uk-icon-button uk-icon-button-small uk-button-primary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</a>
</div>
</div>
</div>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small uk-height-1-1">
<h6 class="uk-margin-remove-top uk-width-expand">Repositories Monitors</h6>
<div class="uk-flex uk-flex-right datasource">
<a routerLink="/repository" class="uk-icon-button uk-icon-button-small uk-button-primary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
<hr class="uk-margin-large">
<div class="uk-grid uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
<div>
<h3 class="uk-light">
Enhancing data quality through user engagement
</h3>
<div class="uk-light uk-margin-medium-bottom">
We encourage active participation from our users to refine and improve the data quality on our platform. Collaborate with us, utilize the tools provided, and contribute to shaping a robust Open Access environment.
</div>
<a class="uk-button uk-button-secondary" routerLink="/how-it-works/user-actions">Learn More</a>
</div>
<div class="uk-grid uk-grid-small uk-child-width-1-1 uk-child-width-1-2@s" uk-height-match="target: .uk-card; row: false" uk-grid>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small">
<h6>Add to ORCID</h6>
<div class="uk-text-small uk-width-expand uk-padding-xsmall uk-padding-remove-horizontal uk-margin-medium-bottom">
Sync and enhanced your ORCID record.
</div>
<div class="uk-flex uk-flex-right">
<a routerLink="/my-orcid-links" class="uk-link-reset uk-text-bolder uk-flex uk-flex-middle">
<span>Add to ORCID</span>
<button class="uk-icon-button uk-icon-button-small uk-button-secondary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</button>
</a>
</div>
</div>
</div>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small">
<h6>Link your research</h6>
<div class="uk-text-small uk-width-expand uk-padding-xsmall uk-padding-remove-horizontal uk-margin-medium-bottom">
Connect research results with projects, research communities, or other research outcomes.
</div>
<div class="uk-flex uk-flex-right">
<a routerLink="/participate/claim" class="uk-link-reset uk-text-bolder uk-flex uk-flex-middle">
<span>Link</span>
<button class="uk-icon-button uk-icon-button-small uk-button-secondary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</button>
</a>
</div>
</div>
</div>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small">
<h6>Upload DOIs</h6>
<div class="uk-text-small uk-width-expand uk-padding-xsmall uk-padding-remove-horizontal uk-margin-medium-bottom">
Obtain detailed information about your publications.
</div>
<div class="uk-flex uk-flex-right">
<a routerLink="/upload-dois" class="uk-link-reset uk-text-bolder uk-flex uk-flex-middle">
<span>Upload DOIs</span>
<button class="uk-icon-button uk-icon-button-small uk-button-secondary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
</button>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="uk-section uk-container uk-container-small">
<div class="uk-grid uk-flex-middle" uk-grid>
<div class="uk-width-1-1 uk-flex uk-flex-middle curators">
<img class="uk-margin-medium-right" src="assets/irish-assets/curators/3.jpg">
<img class="uk-margin-medium-right" src="assets/irish-assets/curators/4.jpg">
<img src="assets/irish-assets/curators/1.jpg">
</div>
<div class="uk-width-1-1 uk-width-2-3@s">
<h3>We Value Your Feedback.</h3>
<div class="uk-width-large">Your insights and feedback are crucial. Reach out with questions, comments, or to collaborate on data quality.</div>
</div>
<div class="uk-width-1-1 uk-width-expand@s uk-flex uk-flex-center">
<a routerLink="/contact-us" class="uk-button uk-button-secondary">Contact us</a>
</div>
</div>
</div>
<schema2jsonld *ngIf="url" [URL]="url" [name]="title" type="other" [description]="description"></schema2jsonld>

96
src/app/home/home.component.less Normal file
View File

@ -0,0 +1,96 @@
@import (reference) "~src/assets/extend-theme/less/_import-variables";
.hero {
background-image: url("~/src/assets/irish-assets/home/logo-shadow.png");
background-position: center -100%;
background-repeat: no-repeat;
}
@media (max-width: @breakpoint-small-max) {
.hero {
background-position: center bottom;
}
}
.national-monitor {
position: relative;
img {
position: relative;
}
&::before {
content: 'National OA Monitor';
position: absolute;
top: 10px;
left: 50%;
transform: translate(-50%, -50%);
white-space: nowrap;
mix-blend-mode: overlay;
}
}
.title {
width: 350px;
&::after {
content: '';
background-image: url("~/src/assets/irish-assets/home/dot.svg");
background-size: contain;
width: 45px;
height: 45px;
display: inline-flex;
transform: translateY(50%);
}
}
.uk-card {
border-radius: 14px;
}
.country:not(:hover) .uk-button-primary {
background-color: @country-color;
color: @global-inverse-color;
}
.funder:not(:hover) .uk-button-primary {
background: @funder-color;
color: @global-inverse-color;
}
.organization:not(:hover) .uk-button-primary {
background-color: @organization-color;
color: @global-inverse-color;
}
.researcher:not(:hover) .uk-button-primary {
background-color: @researcher-color;
color: @global-inverse-color;
}
.datasource:not(:hover) .uk-button-primary {
background-color: @datasource-color;
color: @global-inverse-color;
}
@curator-image-size: 80px;
.curators {
img {
width: @curator-image-size;
height: @curator-image-size;
object-fit: cover;
border-radius: 18px;
&:nth-child(2) {
transform: rotate(-10deg);
object-position: left;
}
&:last-child {
transform: rotate(10deg);
}
}
}

39
src/app/home/home.component.ts Normal file
View File

@ -0,0 +1,39 @@
import {ChangeDetectorRef, Component, OnInit} from "@angular/core";
import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component";
import {ActivatedRoute, Router} from "@angular/router";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {Meta, Title} from "@angular/platform-browser";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
@Component({
selector: 'home',
templateUrl: 'home.component.html',
styleUrls: ['home.component.less']
})
export class HomeComponent extends BaseComponent implements OnInit {
title: string = 'OA Monitor Ireland';
description: string = 'OA Monitor Ireland';
isMobile: boolean = false;
constructor(
protected _route: ActivatedRoute,
protected _piwikService: PiwikService,
protected _meta: Meta,
protected seoService: SEOService,
protected _title: Title,
protected _router: Router,
private layoutService: LayoutService,
private cdr: ChangeDetectorRef
) {
super();
}
ngOnInit() {
this.setMetadata();
this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
this.isMobile = isMobile;
this.cdr.detectChanges();
}));
}
}

17
src/app/home/home.module.ts Normal file
View File

@ -0,0 +1,17 @@
import {NgModule} from "@angular/core";
import {CommonModule} from "@angular/common";
import {RouterModule} from "@angular/router";
import {HomeComponent} from "./home.component";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
@NgModule({
imports: [CommonModule, RouterModule.forChild([
{path: '', component: HomeComponent}
]), IconsModule, Schema2jsonldModule],
declarations: [HomeComponent],
exports: [HomeComponent]
})
export class HomeModule {
}

4
src/app/national/national.component.ts
View File

@ -35,10 +35,10 @@ import {ConfigurationService} from "../openaireLibrary/utils/configuration/confi
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<ul class="uk-banner-tab uk-padding-small uk-padding-remove-vertical"> <ul class="uk-banner-tab uk-padding-small uk-padding-remove-vertical">
<li [class.uk-active]="!isSearch"> <li [class.uk-active]="!isSearch">
<a [routerLink]="'/'">{{entities.stakeholder}}</a> <a [routerLink]="'/national'">{{entities.stakeholder}}</a>
</li> </li>
<li [class.uk-active]="isSearch"> <li [class.uk-active]="isSearch">
<a [routerLink]="'/search/find/research-outcomes'" [queryParams]="routerHelper.createQueryParams(['type','peerreviewed'], [quote('publications'), quote('true')])"> <a [routerLink]="'/national/search/find/research-outcomes'" [queryParams]="routerHelper.createQueryParams(['type','peerreviewed'], [quote('publications'), quote('true')])">
Browse {{openaireEntities.RESULTS}}</a> Browse {{openaireEntities.RESULTS}}</a>
</li> </li>
</ul> </ul>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 75ecd0da5e85a144ccdd7df8831c862c7705e044 Subproject commit d2aa28225a816fd2773f7a502b0f38272285ccc7

32
src/app/resources/how-it-works/the-five-monitors.component.html
View File

@ -11,21 +11,31 @@
</div> </div>
</div> </div>
<div class="uk-container uk-container-large uk-position-relative"> <div class="uk-container uk-container-large uk-position-relative">
<div class="uk-flex uk-flex-middle uk-flex-center uk-child-width-1-5 uk-text-center five-boxes"> <div class="uk-grid uk-flex-middle uk-flex-center uk-child-width-1-5 uk-text-center five-boxes" uk-grid>
<div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle country uk-height-small"> <div>
{{entities.country}} {{entities.stakeholder}} <div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle country uk-height-small">
{{entities.country}} {{entities.stakeholder}}
</div>
</div> </div>
<div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle organization uk-height-small"> <div>
Research Performing Organisation ({{entities.organization}}) <div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle organization uk-height-small">
Research Performing Organisation ({{entities.organization}})
</div>
</div> </div>
<div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle funder uk-height-small"> <div>
Research Funding Organisation ({{entities.funder}}) <div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle funder uk-height-small">
Research Funding Organisation ({{entities.funder}})
</div>
</div> </div>
<div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle researcher uk-height-small"> <div>
Researcher <div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle researcher uk-height-small">
Researcher
</div>
</div> </div>
<div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle datasource uk-height-small"> <div>
{{entities.datasource}} <div class="uk-card uk-border-rounded uk-card-body uk-flex uk-flex-center uk-flex-middle datasource uk-height-small">
{{entities.datasource}}
</div>
</div> </div>
</div> </div>
</div> </div>

1
src/app/resources/how-it-works/the-five-monitors.component.less
View File

@ -5,7 +5,6 @@
} }
.five-boxes { .five-boxes {
grid-gap: 20px;
transform: translateY(-50%); transform: translateY(-50%);
} }

2
src/app/resources/methodology/methodological-approach.component.ts
View File

@ -108,7 +108,7 @@ import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service
</div> </div>
<div class=" uk-margin-large-top uk-container uk-container-large"> <div class=" uk-margin-large-top uk-container uk-container-large">
<img class="uk-width-1-1" <img class="uk-width-1-1"
src="assets/openaire pipeline.jpg" alt="OpenAIRE pipeline" loading="lazy"> src="assets/irish-assets/openaire-pipeline.png" alt="OpenAIRE pipeline" loading="lazy">
<div class="uk-text-meta uk-text-small uk-text-right uk-margin-top">Figure 1: Seemless Integration <div class="uk-text-meta uk-text-small uk-text-right uk-margin-top">Figure 1: Seemless Integration
with to OpenAIRE & EOSC with to OpenAIRE & EOSC
</div> </div>

6
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -6,13 +6,13 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter.
@Component({ @Component({
selector: 'monitor-search-dataproviders', selector: 'monitor-search-dataproviders',
template: ` template: `
<div class=" uk-flex uk-flex-center "> <div class="uk-flex uk-flex-center">
<div> <div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right"> <div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedDataProviders" [queryParams]="parameters">Advanced search</a> <a [routerLink]="properties.searchLinkToAdvancedDataProviders" [queryParams]="parameters">Advanced search</a>
</div> </div>
<div search-input [(value)]="keyword" [placeholder]="'Search by name, description, subject...'" <div search-input [(value)]="keyword" [placeholder]="'Search by name, description, subject...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div> [searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div> </div>
</div> </div>
<search-dataproviders *ngIf="customFilters" <search-dataproviders *ngIf="customFilters"

4
src/app/search/searchPages/simple/searchOrganizations.component.ts
View File

@ -7,12 +7,12 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter.
selector: 'monitor-search-organizations', selector: 'monitor-search-organizations',
template: ` template: `
<div class=" uk-flex uk-flex-center "> <div class=" uk-flex uk-flex-center ">
<div> <div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right"> <div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedOrganizations" [queryParams]="parameters">Advanced search</a> <a [routerLink]="properties.searchLinkToAdvancedOrganizations" [queryParams]="parameters">Advanced search</a>
</div> </div>
<div search-input [(value)]="keyword" [placeholder]="'Search by organization name...'" <div search-input [(value)]="keyword" [placeholder]="'Search by organization name...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div> [searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div> </div>
</div> </div>
<search-organizations *ngIf="customFilters" [customFilters]="customFilters" <search-organizations *ngIf="customFilters" [customFilters]="customFilters"

4
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -7,12 +7,12 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter.
selector: 'monitor-search-projects', selector: 'monitor-search-projects',
template: ` template: `
<div class=" uk-flex uk-flex-center "> <div class=" uk-flex uk-flex-center ">
<div> <div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right"> <div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedProjects" [queryParams]="parameters">Advanced search</a> <a [routerLink]="properties.searchLinkToAdvancedProjects" [queryParams]="parameters">Advanced search</a>
</div> </div>
<div search-input [(value)]="keyword" [placeholder]="'Search by title, acronym, project code...'" <div search-input [(value)]="keyword" [placeholder]="'Search by title, acronym, project code...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div> [searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div> </div>
</div> </div>
<search-projects *ngIf="customFilters" <search-projects *ngIf="customFilters"

2
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -8,7 +8,7 @@ import {OpenaireEntities} from "../../../openaireLibrary/utils/properties/search
selector: 'monitor-search-results', selector: 'monitor-search-results',
template: ` template: `
<div class=" uk-flex uk-flex-center uk-margin-medium-bottom"> <div class=" uk-flex uk-flex-center uk-margin-medium-bottom">
<div> <div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right"> <div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="parameters" <a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="parameters"
class="uk-margin-xsmall-bottom uk-margin-xsmall-right">Advanced search</a> class="uk-margin-xsmall-bottom uk-margin-xsmall-right">Advanced search</a>

20
src/app/shared/browse-stakeholders/browse-stakeholders.component.html
View File

@ -10,15 +10,17 @@
<div search-input *ngIf="keywordControl" [searchControl]="keywordControl" [searchInputClass]="'flat'" [iconPosition]="'left'" <div search-input *ngIf="keywordControl" [searchControl]="keywordControl" [searchInputClass]="'flat'" [iconPosition]="'left'"
placeholder="Search for {{typeAsLabel}} {{entities.stakeholders}}" [disabled]="stakeholders.length === 0" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"> placeholder="Search for {{typeAsLabel}} {{entities.stakeholders}}" [disabled]="stakeholders.length === 0" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1">
</div> </div>
<div [class.uk-disabled]="stakeholders.length === 0" class="uk-flex uk-flex-middle uk-flex-right uk-width-small"> <div *ngIf="!isMobile">
<button (click)="gridView = true" [class.uk-button-primary]="gridView" [disabled]="stakeholders.length === 0" <div [class.uk-disabled]="stakeholders.length === 0" class="uk-flex uk-flex-middle uk-flex-right uk-width-small">
class="uk-icon-button uk-button-default uk-border-rounded uk-icon-button-small"> <button (click)="gridView = true" [class.uk-button-primary]="gridView" [disabled]="stakeholders.length === 0"
<icon name="apps" [flex]="true" type="round" [ratio]="1.2"></icon> class="uk-icon-button uk-button-default uk-border-rounded uk-icon-button-small">
</button> <icon name="apps" [flex]="true" type="round" [ratio]="1.2"></icon>
<button (click)="gridView = false" [class.uk-button-primary]="!gridView" [disabled]="stakeholders.length === 0" </button>
class="uk-icon-button uk-button-default uk-border-rounded uk-icon-button-small uk-margin-small-left"> <button (click)="gridView = false" [class.uk-button-primary]="!gridView" [disabled]="stakeholders.length === 0"
<icon name="view_list" [flex]="true" type="round" [ratio]="1.2"></icon> class="uk-icon-button uk-button-default uk-border-rounded uk-icon-button-small uk-margin-small-left">
</button> <icon name="view_list" [flex]="true" type="round" [ratio]="1.2"></icon>
</button>
</div>
</div> </div>
</div> </div>
<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top"> <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top">

1
src/assets/extend-theme/less/background.less
View File

@ -1,2 +1,3 @@
@background-primary-background-gradient: none; @background-primary-background-gradient: none;
@background-secondary-background: @primary-dark-color;
@background-muted-background: @table-color; @background-muted-background: @table-color;

2
src/assets/extend-theme/less/banner.less
View File

@ -49,7 +49,7 @@
} }
} }
a { a:extend(.uk-text-truncate) {
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
} }

1
src/assets/extend-theme/less/color.less
View File

@ -14,3 +14,4 @@
@country-color: @primary-dark-color; @country-color: @primary-dark-color;
@datasource-color: #66264D; @datasource-color: #66264D;
@researcher-color: #0647A6; @researcher-color: #0647A6;

39
src/assets/irish-assets/home/card-bg.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
src/assets/irish-assets/home/dashboard-mobile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 518 KiB

BIN
src/assets/irish-assets/home/dashboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 474 KiB

8
src/assets/irish-assets/home/dot.svg Normal file
View File

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="44.836" height="44.965" viewBox="0 0 44.836 44.965">
<g id="Group_17237" data-name="Group 17237" transform="translate(-213.179 -611.233) rotate(16)">
<path id="Path_119298" data-name="Path 119298" d="M66.193,45.664a6.435,6.435,0,0,0-4.772-6.11,6.17,6.17,0,0,0-6.109-4.773,6.248,6.248,0,0,0-4.451,1.778,5.925,5.925,0,0,0-1.778,4.452v9.332a1.508,1.508,0,0,0,1.551,1.551h9.331a6.248,6.248,0,0,0,4.451-1.778A5.925,5.925,0,0,0,66.193,45.664Z" transform="translate(353.106 491.461)" fill="#009a49"/>
<path id="Path_119299" data-name="Path 119299" d="M51.893,59.962V50.631a1.511,1.511,0,0,0-1.551-1.551h-9.33a6.248,6.248,0,0,0-4.451,1.778,5.925,5.925,0,0,0-1.778,4.452,6.435,6.435,0,0,0,4.772,6.11,6.231,6.231,0,0,0,1.671,2.995,5.741,5.741,0,0,0,4.451,1.778,6.248,6.248,0,0,0,4.451-1.778,5.925,5.925,0,0,0,1.778-4.452Z" transform="translate(348.289 496.286)" fill="#009a49"/>
<path id="Path_119300" data-name="Path 119300" d="M52.013,50.279V40.947a6.559,6.559,0,0,0-6.336-6.337,6.248,6.248,0,0,0-4.451,1.778,5.823,5.823,0,0,0-1.671,2.995,6.23,6.23,0,0,0-2.994,1.671,5.742,5.742,0,0,0-1.778,4.452,6.249,6.249,0,0,0,1.778,4.452,5.924,5.924,0,0,0,4.451,1.778h9.33a1.423,1.423,0,0,0,1.109-.441c.334-.334.561-.561.561-1Z" transform="translate(348.291 491.414)" fill="#009a49"/>
<path id="Path_119301" data-name="Path 119301" d="M64.609,59.769a5.742,5.742,0,0,0,1.778-4.452,6.266,6.266,0,0,0-6.336-6.337h-9.33a1.511,1.511,0,0,0-1.551,1.551v9.332a6.249,6.249,0,0,0,1.778,4.452A6.17,6.17,0,0,0,55.4,66.092a6.248,6.248,0,0,0,4.451-1.778,5.822,5.822,0,0,0,1.671-2.995,5.223,5.223,0,0,0,3.115-1.551Z" transform="translate(353.138 496.25)" fill="#009a49"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/assets/irish-assets/home/logo-shadow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 206 KiB

BIN
src/assets/irish-assets/openaire-pipeline.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 872 KiB

BIN
src/assets/openaire pipeline.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 215 KiB

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9 Subproject commit 419d7e200b60639ebcb9660c0e77b06a02504caa