MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

more layout changes- natalia's feedback 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48792 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2017-08-01 07:49:17 +00:00
parent 79141b06e1
commit 35b32926c6
56 changed files with 313 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
portal-2/src/app/claims/directLinking/directLinking.component.ts
View File

@ -16,7 +16,7 @@ import { Meta} from '../../../angular2-meta';
<div class="uk-container uk-margin-top"> <div class="uk-container uk-margin-top">
<div class="page-header"> <div class="page-header">
<h2>Linking</h2> <h2>Link</h2>
</div> </div>
<div *ngIf="validInput != null && !validInput" class="uk-alert uk-alert-warning" role="alert">No valid arguments provided in order to start linking openAIRE entities. </div> <div *ngIf="validInput != null && !validInput" class="uk-alert uk-alert-warning" role="alert">No valid arguments provided in order to start linking openAIRE entities. </div>
<div *ngIf="validInput != null && validInput"> <div *ngIf="validInput != null && validInput">

2
portal-2/src/app/claims/linking/linkingGeneric.component.ts
View File

@ -17,7 +17,7 @@ declare var UIkit:any;
<div class="uk-container uk-margin-top"> <div class="uk-container uk-margin-top">
<div class="page-header"> <div class="page-header">
<h1>Linking</h1> <h1>Link</h1>
</div> </div>
<div class="uk-clearfix"> <div class="uk-clearfix">
<a class="uk-float-right" uk-toggle="target: #linkingInfo; animation: uk-animation-fade"><span class="uk-icon"> <a class="uk-float-right" uk-toggle="target: #linkingInfo; animation: uk-animation-fade"><span class="uk-icon">

65
portal-2/src/app/landingPages/dataset/dataset.component.html
View File

@ -51,12 +51,31 @@
{{datasetInfo.description}} {{datasetInfo.description}}
</div> </div>
<!--div class="uk-clearfix uk-margin-top uk-margin-bottom"> <div class="uk-clearfix"><div class="uk-button-group uk-float-right uk-margin-top">
<button class="uk-button uk-button-small uk-button-action">
<span class="uk-icon" >
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Link this research data to
</button>
<div class="uk-inline">
<button class="uk-button uk-button-small uk-button-action" type="button">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-down" ratio="1"><polygon points="5 7 15 7 10 12"></polygon></svg></span>
</button>
<div uk-dropdown="mode: click; boundary: ! .uk-button-group; boundary-align: true;"
class="uk-dropdown uk-dropdown-boundary uk-dropdown-bottom-left" style="top: 40px; left: -236.5px;">
<ul class="uk-nav uk-dropdown-nav uk-padding-small" >
<li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','project'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Projects</a></li>
<li><a class="uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','context'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Communities</a></li>
<li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Other research results</a></li>
</ul>
</div>
</div>
</div></div>
<a class="uk-float-right uk-button uk-button-default" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'publication','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span> Links to research Results</a>
</div-->
<ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content"> <ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
<li (click)="activeTab='Related Research Results'" <li (click)="activeTab='Related Research Results'"
@ -345,7 +364,7 @@
</li> </li>
<li><citeThis [result]="datasetInfo" [id]="datasetId"></citeThis></li> <li><citeThis [result]="datasetInfo" [id]="datasetId" type="research data"></citeThis></li>
<li *ngIf="datasetInfo.collectedFrom && datasetInfo.collectedFrom.length > 0"> <li *ngIf="datasetInfo.collectedFrom && datasetInfo.collectedFrom.length > 0">
<dl class="uk-description-list-line"> <dl class="uk-description-list-line">
<dt>Collected from</dt> <dt>Collected from</dt>
@ -373,7 +392,7 @@
</ul> </ul>
<div class="uk-card uk-card-default uk-padding-small uk-card-body"> <!--div class="uk-card uk-card-default uk-padding-small uk-card-body">
<div class="uk-card-title"> <div class="uk-card-title">
<span class="" uk-tooltip="pos:right; delay:5" <span class="" uk-tooltip="pos:right; delay:5"
title='<div id="linkinginfo" class= "uk-margin uk-padding-small"> title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
@ -394,37 +413,7 @@
Other research results</a></div> Other research results</a></div>
</div> </div>
</div> </div>
</div> </div-->
<!--a class="uk-button uk-button-default" uk-toggle="target: #linkingBox; animation: uk-animation-fade"><span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span>Link this Dataset to</a>
<div id="linkingBox" class="uk-card uk-card-default uk-card- uk-padding-small uk-margin" hidden>
<div class="uk-clearfix">
<a uk-toggle="target: #linkingBox; animation: uk-animation-fade" class="uk-float-right "><span class="uk-icon">
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="1"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
</span></a>
<div class="uk-float-left " uk-tooltip="pos:right; delay:5"
title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
<p>Do you think that information is missing about a project, a community or other research results related to this research data?</p>
<p>You are able to enhance it! Please follow the links and create the missing relations.</p>
</div>'><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="question" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle><circle cx="10.44" cy="14.42" r="1.05"></circle><path fill="none" stroke="#000" stroke-width="1.2" d="M8.17,7.79 C8.17,4.75 12.72,4.73 12.72,7.72 C12.72,8.67 11.81,9.15 11.23,9.75 C10.75,10.24 10.51,10.73 10.45,11.4 C10.44,11.53 10.43,11.64 10.43,11.75"></path></svg></span>
</div>
</div>
<div class="uk-clearfix">
<a class="uk-clearfix uk-button uk-button-default uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','project'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span> Projects</a>
<a class="uk-clearfix uk-button uk-button-default uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','context'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span> Communities</a>
<a class="uk-clearfix uk-button uk-button-default uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Other Research results</a>
</div>
</div-->
</div> </div>
</div> </div>

3
portal-2/src/app/landingPages/landing-utils/citeThis/citeThis.component.ts
View File

@ -9,7 +9,7 @@ import {Citation, CitationData} from './citation.class';
<div class="citationDownloader "> <div class="citationDownloader ">
<dl class="uk-description-list-line"> <dl class="uk-description-list-line">
<dt class="title">Cite this article</dt> <dt class="title">Cite this {{type}}</dt>
<dd class="line" > <dd class="line" >
<select class="select" id="citations" name="citeselect" [(ngModel)]="selectedStyle" (click)="styleChanged()"> <select class="select" id="citations" name="citeselect" [(ngModel)]="selectedStyle" (click)="styleChanged()">
<option *ngFor=" let style of this.citation.templates let i = index" [value]="style">{{style}}</option> <option *ngFor=" let style of this.citation.templates let i = index" [value]="style">{{style}}</option>
@ -28,6 +28,7 @@ export class CiteThisComponent {
public cite: any; public cite: any;
@Input() result: any; @Input() result: any;
@Input() id: string; @Input() id: string;
@Input() type: string="article";
public data;//= '[ { "id": "Q23571040", "type": "apple", "title": "Correlation of the Base Strengths of Amines 1", "DOI": "10.1021/ja01577a030", "author": [ { "given": "H. K.", "family": "Hall" } ], "issued": [ { "date-parts": [ "1957", "1", "1" ] } ], "container-title": "Journal of the American Chemical Society", "volume": "79", "issue": "20", "page": "5441-5444" } ]'; public data;//= '[ { "id": "Q23571040", "type": "apple", "title": "Correlation of the Base Strengths of Amines 1", "DOI": "10.1021/ja01577a030", "author": [ { "given": "H. K.", "family": "Hall" } ], "issued": [ { "date-parts": [ "1957", "1", "1" ] } ], "container-title": "Journal of the American Chemical Society", "volume": "79", "issue": "20", "page": "5441-5444" } ]';

49
portal-2/src/app/landingPages/metrics.component.ts
View File

@ -31,7 +31,8 @@ import { Subscription } from 'rxjs/Subscription';
<div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div> <div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div> <div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
<div *ngIf="metrics != undefined" class="uk-child-width-1-3@m uk-grid-small uk-grid-match uk-grid" uk-grid=""> <div *ngIf="metrics != undefined" class="uk-child-width-1-3@m uk-grid-small uk-grid-match uk-grid" uk-grid="">
<div class="uk-first-column"> <div *ngIf="entityType == 'projects'" class="uk-width-1-1 uk-text-center uk-text-meta uk-margin">Project metrics are derived from aggregating individual research results metrics.</div>
<div class="metrics-openaire uk-first-column">
<div class="uk-tile uk-tile-default uk-padding-small"> <div class="uk-tile uk-tile-default uk-padding-small">
<!--div class="uk-clearfix"> <!--div class="uk-clearfix">
<div class="uk-float-left " uk-tooltip="pos:right; delay:5" <div class="uk-float-left " uk-tooltip="pos:right; delay:5"
@ -42,17 +43,17 @@ import { Subscription } from 'rxjs/Subscription';
</span> </span>
</div> </div>
</div--> </div-->
<div *ngIf="entityType=='results'" class="uk-text-center">Page views</div> <div class="uk-text-center">{{pageViews}}</div>
<div *ngIf="entityType!='results'" class="uk-text-center">Research results page views</div> <div class="uk-text-center">views in OpenAIRE</div>
<div class="uk-text-center">{{pageViews}}</div> <!--div *ngIf="entityType!='results'" class="uk-text-center">Research results views in OpenAIRE</div-->
<div class="uk-margin-top uk-article-meta"> <!--div class="uk-margin-top uk-article-meta">
<div *ngIf="entityType != 'results'">Research results page views in OpenAIRE</div> <div *ngIf="entityType != 'results'">Research results page views in OpenAIRE</div>
<div *ngIf="entityType == 'results'">{{entity}} page views in OpenAIRE</div> <div *ngIf="entityType == 'results'">{{entity}} page views in OpenAIRE</div>
</div> </div-->
</div> </div>
</div> </div>
<div> <div class="metrics-views">
<div class="uk-tile uk-tile-muted uk-padding-small"> <div class="uk-tile uk-tile-muted uk-padding-small">
<!--div class="uk-clearfix"> <!--div class="uk-clearfix">
<div class="uk-float-left " uk-tooltip="pos:right; delay:5" <div class="uk-float-left " uk-tooltip="pos:right; delay:5"
@ -63,16 +64,16 @@ import { Subscription } from 'rxjs/Subscription';
</span> </span>
</div> </div>
</div--> </div-->
<div *ngIf="entityType=='results'" class="uk-text-center">Total views</div> <div class="uk-text-center"> {{metrics.totalViews}}
<div *ngIf="entityType!='results'" class="uk-text-center"> Total research results views</div> <span *ngIf="metrics.totalViews > 0 && metrics.totalOpenaireViews > 0">
( {{metrics.totalOpenaireViews}} from OpenAIRE )
</span></div>
<div class="uk-text-center">views in local repository</div>
<!--div *ngIf="entityType!='results'" class="uk-text-center"> research results views in local repository</div-->
<!--div *ngIf="type!='results'" class="uk-text-center"> Total <span [innerHTML]="name"></span> Research Results Views</div--> <!--div *ngIf="type!='results'" class="uk-text-center"> Total <span [innerHTML]="name"></span> Research Results Views</div-->
<div class="uk-text-center"> {{metrics.totalViews}}
<span *ngIf="metrics.totalViews > 0 && metrics.totalOpenaireViews > 0">
( {{metrics.totalOpenaireViews}} from OpenAIRE )
</span></div>
<div class="uk-margin-top uk-article-meta"> <!--div class="uk-margin-top uk-article-meta">
<div *ngIf="entityType == 'projects'">Research results page views in Repositories</div> <div *ngIf="entityType == 'projects'">Research results page views in Repositories</div>
<div *ngIf="entityType == 'datasources'">Research results page views in Repository</div> <div *ngIf="entityType == 'datasources'">Research results page views in Repository</div>
<div *ngIf="entityType == 'results'">{{entity}} page views in Repositories</div> <div *ngIf="entityType == 'results'">{{entity}} page views in Repositories</div>
@ -82,10 +83,10 @@ import { Subscription } from 'rxjs/Subscription';
<div *ngIf="entityType=='datasources' && metrics.totalOpenaireViews > 0"> <div *ngIf="entityType=='datasources' && metrics.totalOpenaireViews > 0">
Of the {{metrics.totalViews}} views, repository accessed {{metrics.totalOpenaireViews}} time(s) from OpenAIRE Of the {{metrics.totalViews}} views, repository accessed {{metrics.totalOpenaireViews}} time(s) from OpenAIRE
</div> </div>
</div> </div-->
</div> </div>
</div> </div>
<div> <div class="metrics-downloads">
<div class="uk-tile uk-tile-primary uk-padding-small"> <div class="uk-tile uk-tile-primary uk-padding-small">
<!--div class="uk-clearfix"> <!--div class="uk-clearfix">
<div class="uk-float-left " uk-tooltip="pos:right; delay:5" <div class="uk-float-left " uk-tooltip="pos:right; delay:5"
@ -96,16 +97,16 @@ import { Subscription } from 'rxjs/Subscription';
</span> </span>
</div> </div>
</div--> </div-->
<div *ngIf="entityType=='results'" class="uk-text-center">Total downloads</div> <div class="uk-text-center"> {{metrics.totalDownloads}}
<div *ngIf="entityType!='results'" class="uk-text-center"> Total research results downloads</div> <span *ngIf="metrics.totalDownloads > 0 && metrics.totalOpenaireDownloads > 0">
( {{metrics.totalOpenaireDownloads}} from OpenAIRE )
</span></div>
<div class="uk-text-center">downloads in local repository</div>
<!--div *ngIf="entityType!='results'" class="uk-text-center">research results downloads in local repository</div-->
<!--div *ngIf="type!='results'" class="uk-text-center">Total <span [innerHTML]="name"></span> Research Results Downloads</div--> <!--div *ngIf="type!='results'" class="uk-text-center">Total <span [innerHTML]="name"></span> Research Results Downloads</div-->
<div class="uk-text-center"> {{metrics.totalDownloads}}
<span *ngIf="metrics.totalDownloads > 0 && metrics.totalOpenaireDownloads > 0">
( {{metrics.totalOpenaireDownloads}} from OpenAIRE )
</span></div>
<div class="uk-margin-top uk-article-meta"> <!--div class="uk-margin-top uk-article-meta">
<div *ngIf="entityType == 'projects'">Research results page downloads in Repositories</div> <div *ngIf="entityType == 'projects'">Research results page downloads in Repositories</div>
<div *ngIf="entityType == 'datasources'">Research results page downloads in Repository</div> <div *ngIf="entityType == 'datasources'">Research results page downloads in Repository</div>
<div *ngIf="entityType == 'results'">{{entity}} page downloads in Repositories</div> <div *ngIf="entityType == 'results'">{{entity}} page downloads in Repositories</div>
@ -115,7 +116,7 @@ import { Subscription } from 'rxjs/Subscription';
<div *ngIf="entityType=='datasources' && metrics.totalOpenaireDownloads > 0"> <div *ngIf="entityType=='datasources' && metrics.totalOpenaireDownloads > 0">
Of the {{metrics.totalDownloads}} downloads, repository accessed {{metrics.totalOpenaireDownloads}} time(s) from OpenAIRE Of the {{metrics.totalDownloads}} downloads, repository accessed {{metrics.totalOpenaireDownloads}} time(s) from OpenAIRE
</div> </div>
</div> </div-->
</div> </div>
</div> </div>

56
portal-2/src/app/landingPages/organization/organization.component.html
View File

@ -145,38 +145,40 @@
<div> <div>
Share - Bookmark<addThis ></addThis> Share - Bookmark<addThis ></addThis>
</div> </div>
<div class="app-box uk-margin-medium-top uk-margin-medium-bottom"> <div class="uk-margin-medium-top uk-margin-medium-bottom">
<div class="uk-text-center uk-text-large"> <div class="uk-text-center uk-text-large">
Application Box Application Box
</div> </div>
<ul class="uk-list"> <div class="app-box" >
<ul class="uk-list">
<ng-container *ngIf="fetchProjects && fetchProjects.funders.length > 0"> <ng-container *ngIf="fetchProjects && fetchProjects.funders.length > 0">
<li *ngFor="let funder of fetchProjects.funders"> <li *ngFor="let funder of fetchProjects.funders">
<!--a href="{{downloadURLAPI}}resources?size={{organizationInfo.projects.get(key).length}}&{{csvProjectParamsHead}}{{organizationInfo.projects.get(key)[0]['funderId']}}{{csvParamsTail}}"> <!--a href="{{downloadURLAPI}}resources?size={{organizationInfo.projects.get(key).length}}&{{csvProjectParamsHead}}{{organizationInfo.projects.get(key)[0]['funderId']}}{{csvParamsTail}}">
Download projects report (CSV) for {{key}} Download projects report (CSV) for {{key}}
</a--> </a-->
<a class="clickable" (click)="downloadFile(downloadURLAPI+'resources?size='+funder.number+'&'+csvProjectParamsHead+funder.id+csvParamsTail)"> <a class="clickable" (click)="downloadFile(downloadURLAPI+'resources?size='+funder.number+'&'+csvProjectParamsHead+funder.id+csvParamsTail)">
<!--span class="clickable" (click)="downloadProjectsFile(downloadURLAPI+'organizations/'+organizationId+'/projects?fq=(funderid exact '+funder.id+')&size='+funder.number)"--> <!--span class="clickable" (click)="downloadProjectsFile(downloadURLAPI+'organizations/'+organizationId+'/projects?fq=(funderid exact '+funder.id+')&size='+funder.number)"-->
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span>
<span class="uk-icon-download"> Project list for {{funder.name}} (CSV)</span> <span class="uk-icon-download"> Project list for {{funder.name}} (CSV)</span>
</a> </a>
</li> </li>
<li *ngFor="let funder of fetchProjects.funders"> <li *ngFor="let funder of fetchProjects.funders">
<a class="clickable" (click)="confirmOpenApplyAll(funder.name,funder.id, funder.number)"> <a class="clickable" (click)="confirmOpenApplyAll(funder.name,funder.id, funder.number)">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span>
<span class="uk-icon-download"> Project Publications for {{funder.name}} (CSV)</span> <span class="uk-icon-download"> Project Publications for {{funder.name}} (CSV)</span>
</a> </a>
</li> </li>
</ng-container> </ng-container>
<li> <li>
<a class="clickable" (click)="downloadFile(downloadURLAPI+'organizations/'+organizationId+'/publications?format=csv')"> <a class="clickable" (click)="downloadFile(downloadURLAPI+'organizations/'+organizationId+'/publications?format=csv')">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span>
<span class="uk-icon-download"> Publications of organization (CSV) - based on the affiliation information.</span> <span class="uk-icon-download"> Publications of organization (CSV) - based on the affiliation information.</span>
</a> </a>
</li> </li>
</ul> </ul>
</div>
</div> </div>

57
portal-2/src/app/landingPages/project/project.component.html
View File

@ -36,8 +36,7 @@
[title]="organization.name"> [title]="organization.name">
<a *ngIf="organization.id" <a *ngIf="organization.id"
[queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization"> [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
<span *ngIf="organization.acronym">{{organization.acronym}}</span><span {{(organization.acronym)?organization.acronym:''}} {{(!organization.acronym && organization.name)?organization.name:''}}</a>
*ngIf="!organization.acronym && organization.name">{{organization.name}}</span></a>
<span <span
*ngIf="!organization.id"> *ngIf="!organization.id">
@ -54,6 +53,29 @@
</span> </span>
</li> </li>
</ul> </ul>
<div class="uk-clearfix"><div class="uk-button-group uk-float-right uk-margin-top">
<button class="uk-button uk-button-small uk-button-action">
<span class="uk-icon" >
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Link this project to
</button>
<div class="uk-inline">
<button class="uk-button uk-button-small uk-button-action" type="button">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-down" ratio="1"><polygon points="5 7 15 7 10 12"></polygon></svg></span>
</button>
<div uk-dropdown="mode: click; boundary: ! .uk-button-group; boundary-align: true;"
class="uk-dropdown uk-dropdown-boundary uk-dropdown-bottom-left" style="top: 40px; left: -236.5px;">
<ul class="uk-nav uk-dropdown-nav uk-padding-small" >
<li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId,'project','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Other research results</a></li>
</ul>
</div>
</div>
</div></div>
<ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content"> <ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
<li (click)="activeTab='Publications'" [class]="activeTab == 'Publications'?'uk-active':''"> <li (click)="activeTab='Publications'" [class]="activeTab == 'Publications'?'uk-active':''">
<a> <a>
@ -228,11 +250,12 @@
<div> <div>
Share - Bookmark<addThis ></addThis> Share - Bookmark<addThis ></addThis>
</div> </div>
<div class="app-box uk-margin-medium-top uk-margin-medium-bottom"> <div class="uk-margin-medium-top uk-margin-medium-bottom">
<div class="uk-text-center uk-text-large"> <div class="uk-text-center uk-text-large">
Application Box Application Box
</div> </div>
<ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-app-box-project"> <div class="app-box" >
<ul class="uk-tab" uk-tab="connect: #tab-app-box-project">
<li> <li>
<a>Publications</a> <a>Publications</a>
</li> </li>
@ -240,7 +263,7 @@
<a>Research Data</a> <a>Research Data</a>
</li> </li>
</ul> </ul>
<ul id="tab-app-box-project" class="uk-switcher uk-margin"> <ul id="tab-app-box-project" class="uk-switcher uk-margin uk-padding-small">
<li class="uk-animation-fade"> <li class="uk-animation-fade">
<!-- Publication box--> <!-- Publication box-->
<ul class="uk-list"> <ul class="uk-list">
@ -308,32 +331,10 @@
</ul> </ul>
</li> </li>
</ul> </ul>
</div>
</div> </div>
<!--a class="uk-button uk-button-default" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId,'project','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span>
Link to research results
</a-->
<div class="uk-card uk-card-default uk-padding-small uk-card-body">
<div class="uk-card-title">
<span class="" uk-tooltip="pos:right; delay:5"
title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
<p>Do you think that information is missing about research results related to this project?</p>
<p>You are able to enhance it! Please follow the links and create the missing relations.</p>
</div>'>
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Link this project to</div>
<div>
<div class="uk-clearfix">
<div><a class=" uk-button-text uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId,'project','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Other research results</a></div>
</div>
</div>
</div>
</div> </div>
</div> </div>

25
portal-2/src/app/landingPages/publication/publication.component.html
View File

@ -65,27 +65,24 @@
</div> </div>
<div class="uk-clearfix"><div class="uk-button-group uk-float-right"> <div class="uk-clearfix"><div class="uk-button-group uk-float-right uk-margin-top">
<button class="uk-button uk-button-default"> <button class="uk-button uk-button-small uk-button-action">
<span class="" uk-tooltip="pos:right; delay:5" <span class="uk-icon" >
title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
<p>Do you think that information is missing about a project, a community or other research results related to this publication?</p>
<p>You are able to enhance it! Please follow the links and create the missing relations.</p>
</div>'>
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span> <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Link this publication to Link this publication to
</button> </button>
<div class="uk-inline"> <div class="uk-inline">
<button class="uk-button uk-button-default" type="button"> <button class="uk-button uk-button-small uk-button-action" type="button">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-down" ratio="1"><polygon points="5 7 15 7 10 12"></polygon></svg></span> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-down" ratio="1"><polygon points="5 7 15 7 10 12"></polygon></svg></span>
</button> </button>
<div uk-dropdown="mode: click; boundary: ! .uk-button-group; boundary-align: true;"> <div uk-dropdown="mode: click; boundary: ! .uk-button-group; boundary-align: true;"
<ul class="uk-nav uk-dropdown-nav uk-margin-top uk-margin-bottom uk-margin-right uk-margin-left" > class="uk-dropdown uk-dropdown-boundary uk-dropdown-bottom-left" style="top: 40px; left: -236.5px;">
<li><a class="uk-button-text uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <ul class="uk-nav uk-dropdown-nav uk-padding-small" >
<li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Projects</a></li> Projects</a></li>
<li><a class=" uk-button-text uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <li><a class="uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Communities</a></li> Communities</a></li>
<li><a class=" uk-button-text uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Other research results</a></li> Other research results</a></li>
</ul> </ul>
</div> </div>
@ -612,7 +609,7 @@
</dl> </dl>
</li> </li>
<li><citeThis [result]="publicationInfo" [id]="articleId"></citeThis></li> <li><citeThis [result]="publicationInfo" [id]="articleId" type="publication"></citeThis></li>
<li *ngIf="publicationInfo.collectedFrom && publicationInfo.collectedFrom.length > 0"> <li *ngIf="publicationInfo.collectedFrom && publicationInfo.collectedFrom.length > 0">
<dl class="uk-description-list-line"> <dl class="uk-description-list-line">
<dt>Collected from</dt> <dt>Collected from</dt>

4
portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -14,7 +14,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({ @Component({
selector: 'advanced-search-dataprovider', selector: 'advanced-search-dataprovider',
template: ` template: `
<advanced-search-page pageTitle="Advanced Search Content Providers" entityType="dataprovider" <advanced-search-page pageTitle="Advanced Search for Content Providers" entityType="dataprovider"
type = "content providers" type = "content providers"
[(results)] = "results" [(results)] = "results"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
@ -82,7 +82,7 @@ export class AdvancedSearchDataProvidersComponent {
this.results = []; this.results = [];
this.searchUtils.totalResults = 0; this.searchUtils.totalResults = 0;
console.info("Advanced Search Publications: Execute search query "+parameters); console.info("Advanced Search for Publications: Execute search query "+parameters);
this._searchDataProvidersService.advancedSearchDataproviders(parameters, page, size).subscribe( this._searchDataProvidersService.advancedSearchDataproviders(parameters, page, size).subscribe(
data => { data => {
this.searchUtils.totalResults = data[0]; this.searchUtils.totalResults = data[0];

4
portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
View File

@ -13,7 +13,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({ @Component({
selector: 'advanced-search-datasets', selector: 'advanced-search-datasets',
template: ` template: `
<advanced-search-page pageTitle="Advanced Search Research Data" entityType="dataset" <advanced-search-page pageTitle="Advanced Search for Research Data" entityType="dataset"
type = "research data" type = "research data"
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
@ -87,7 +87,7 @@ export class AdvancedSearchDatasetsComponent {
this.results = []; this.results = [];
this.searchUtils.totalResults = 0; this.searchUtils.totalResults = 0;
console.info("Advanced Search Research Data: Execute search query "+parameters); console.info("Advanced Search for Research Data: Execute search query "+parameters);
this._searchDatasetsService.advancedSearchDatasets(parameters, page, size).subscribe( this._searchDatasetsService.advancedSearchDatasets(parameters, page, size).subscribe(
data => { data => {
this.searchUtils.totalResults = data[0]; this.searchUtils.totalResults = data[0];

4
portal-2/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -13,7 +13,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({ @Component({
selector: 'advanced-search-organizations', selector: 'advanced-search-organizations',
template: ` template: `
<advanced-search-page pageTitle="Advanced Search Organizations" entityType="organization" <advanced-search-page pageTitle="Advanced Search for Organizations" entityType="organization"
type = "organizations" type = "organizations"
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
@ -85,7 +85,7 @@ public resourcesQuery = "(oaftype exact organization)";
this.results = []; this.results = [];
this.searchUtils.totalResults = 0; this.searchUtils.totalResults = 0;
console.info("Advanced Search Organizations: Execute search query "+parameters); console.info("Advanced Search for Organizations: Execute search query "+parameters);
this._searchOrganizationsService.advancedSearchOrganizations(parameters, page, size).subscribe( this._searchOrganizationsService.advancedSearchOrganizations(parameters, page, size).subscribe(
data => { data => {
this.searchUtils.totalResults = data[0]; this.searchUtils.totalResults = data[0];

6
portal-2/src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

@ -12,7 +12,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({ @Component({
selector: 'advanced-search-projects', selector: 'advanced-search-projects',
template: ` template: `
<advanced-search-page pageTitle="Advanced Search Projects" entityType="project" <advanced-search-page pageTitle="Advanced Search for Projects" entityType="project"
type = "projects" type = "projects"
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
@ -85,11 +85,11 @@ export class AdvancedSearchProjectsComponent {
this.results = []; this.results = [];
this.searchUtils.totalResults = 0; this.searchUtils.totalResults = 0;
console.info("Advanced Search Publications: Execute search query "+parameters); console.info("Advanced Search for Publications: Execute search query "+parameters);
this._searchProjectsService.advancedSearchProjects(parameters, page, size).subscribe( this._searchProjectsService.advancedSearchProjects(parameters, page, size).subscribe(
data => { data => {
this.searchUtils.totalResults = data[0]; this.searchUtils.totalResults = data[0];
console.info("Advanced Search Projects total="+this.searchUtils.totalResults); console.info("Advanced Search for Projects total="+this.searchUtils.totalResults);
this.results = data[1]; this.results = data[1];
this.searchPage.updateBaseUrlWithParameters(); this.searchPage.updateBaseUrlWithParameters();
var errorCodes:ErrorCodes = new ErrorCodes(); var errorCodes:ErrorCodes = new ErrorCodes();

4
portal-2/src/app/searchPages/advanced/advancedSearchPublications.component.ts
View File

@ -13,7 +13,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({ @Component({
selector: 'advanced-search-publications', selector: 'advanced-search-publications',
template: ` template: `
<advanced-search-page pageTitle="Advanced Search Publications" entityType="publication" <advanced-search-page pageTitle="Advanced Search for Publications" entityType="publication"
type="publications" type="publications"
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
@ -86,7 +86,7 @@ export class AdvancedSearchPublicationsComponent {
this.results = []; this.results = [];
this.searchUtils.totalResults = 0; this.searchUtils.totalResults = 0;
console.info("Advanced Search Publications: Execute search query "+parameters); console.info("Advanced Search for Publications: Execute search query "+parameters);
this._searchPublicationsService.advancedSearchPublications(parameters, page, size).subscribe( this._searchPublicationsService.advancedSearchPublications(parameters, page, size).subscribe(
data => { data => {
this.searchUtils.totalResults = data[0]; this.searchUtils.totalResults = data[0];

2
portal-2/src/app/searchPages/find/search.component.ts
View File

@ -241,7 +241,6 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
}) })
export class SearchComponent { export class SearchComponent {
public sub: any; piwiksub: any; public sub: any; piwiksub: any;
public subfunders: any;
public reloadPublications: boolean; public reloadPublications: boolean;
public reloadDatasets: boolean; public reloadDatasets: boolean;
public reloadProjects: boolean; public reloadProjects: boolean;
@ -327,7 +326,6 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
} }
public ngOnDestroy() { public ngOnDestroy() {
this.sub.unsubscribe(); this.sub.unsubscribe();
this.subfunders.unsubscribe();
if(this.piwiksub){ if(this.piwiksub){
this.piwiksub.unsubscribe(); this.piwiksub.unsubscribe();
} }

16
portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts
View File

@ -9,7 +9,7 @@ import {Dates} from '../../utils/string-utils.class';
@Component({ @Component({
selector: 'advanced-search-form', selector: 'advanced-search-form',
template: ` template: `
<form [class]="(isDisabled)?'uk-disabled':''"> <form [class]="(isDisabled )?'uk-disabled advancedSearchForm uk-tile uk-tile-muted':'advancedSearchForm uk-tile uk-tile-muted'">
<table class=" uk-table uk-table-responsive" > <table class=" uk-table uk-table-responsive" >
<tr *ngFor="let selectedField of selectedFields; let i = index" class="-row "> <tr *ngFor="let selectedField of selectedFields; let i = index" class="-row ">
<td *ngIf ="i==0 " class="">Search for:</td> <td *ngIf ="i==0 " class="">Search for:</td>
@ -47,16 +47,16 @@ import {Dates} from '../../utils/string-utils.class';
</span> </span>
</td> </td>
<td class=" " > <td class=" " >
<button *ngIf="selectedFields.length > 1" type="button" class="uk-icon-button uk-button-danger" (click)="removeField(i)"> <span *ngIf="selectedFields.length > 1" type="button" class="uk-icon-button" (click)="removeField(i)">
<span class=""><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="minus" ratio="1"><rect height="1" width="18" y="9" x="1"></rect></svg></span>
</span>
<span *ngIf="selectedFields.length == 1" type="button" class="uk-icon-button" disabled>
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="minus" ratio="1"><rect height="1" width="18" y="9" x="1"></rect></svg></span> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="minus" ratio="1"><rect height="1" width="18" y="9" x="1"></rect></svg></span>
</button> </span>
<button *ngIf="selectedFields.length == 1" type="button" class="uk-icon-button uk-button-danger" disabled>
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="minus" ratio="1"><rect height="1" width="18" y="9" x="1"></rect></svg></span>
</button>
</td> </td>
<td *ngIf="i == selectedFields.length-1 " class=" "><button type="button" class="uk-icon-button" (click)="addField()"> <td *ngIf="i == selectedFields.length-1 " class=" "><span type="button" class="uk-icon-button" (click)="addField()">
<span><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="plus" ratio="1"><rect x="9" y="1" width="1" height="17"></rect><rect x="1" y="9" width="17" height="1"></rect></svg></span> <span><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="plus" ratio="1"><rect x="9" y="1" width="1" height="17"></rect><rect x="1" y="9" width="17" height="1"></rect></svg></span>
</button></td> </span></td>
</tr> </tr>
</table> </table>
<div class="-row uk-text-right"> <div class="-row uk-text-right">

4
portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
View File

@ -19,8 +19,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<div uk-grid uk-grid> <div uk-grid uk-grid>
<div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first "> <div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first ">
<div class="uk-container uk-margin-top"> <div class="uk-container uk-margin-top">
<div class="page-header"> <div class="uk-article-title">
<h2>{{pageTitle}}</h2> {{pageTitle}}
</div> </div>
<div> <div>
<a *ngIf = "simpleSearchLink && simpleSearchLink.length > 0" routerLinkActive="router-link-active" [routerLink]=simpleSearchLink [class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted':'uk-float-right'" >Simple search <span class="uk-icon"> <a *ngIf = "simpleSearchLink && simpleSearchLink.length > 0" routerLinkActive="router-link-active" [routerLink]=simpleSearchLink [class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted':'uk-float-right'" >Simple search <span class="uk-icon">

2
portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts
View File

@ -13,7 +13,7 @@ import {ModalLoading} from '../../utils/modal/loading.component';
<!--a (click)="download()" href="{{downloadURLAPI}}{{type}}?format=csv&page=0&size={{totalResults}}{{csvParams}}" --> <!--a (click)="download()" href="{{downloadURLAPI}}{{type}}?format=csv&page=0&size={{totalResults}}{{csvParams}}" -->
<span class="clickable" (click)="downloadfile(downloadURLAPI+type+'?format=csv&page=0&size='+totalResults+csvParams,type+'-report-'+totalResults)"> <span class="clickable" (click)="downloadfile(downloadURLAPI+type+'?format=csv&page=0&size='+totalResults+csvParams,type+'-report-'+totalResults)">
<span aria-hidden="true" class="glyphicon glyphicon-download"></span> <span aria-hidden="true" class="glyphicon glyphicon-download"></span>
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> Results (CSV) <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> (CSV)
</span> </span>
</p> </p>
</div> </div>

21
portal-2/src/app/searchPages/searchUtils/searchPage.component.ts
View File

@ -28,14 +28,14 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<h2>{{pageTitle}}</h2> <h2>{{pageTitle}}</h2>
</div--> </div-->
<!--div class="uk-width-1-1 uk-margin uk-padding uk-panel uk-background-muted"--> <!--div class="uk-width-1-1 uk-margin uk-padding uk-panel uk-background-muted"-->
<div [class]="'uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle '+searchFormClass" > <div [class]="'uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle uk- light '+searchFormClass" >
<div class="uk-width-1-1"> <div class="uk-width-1-1">
<div class="uk-width-1-1"> <div class="uk-width-1-1">
<search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form> <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
</div> </div>
<div class="uk-width-1-1 "> <div class="uk-width-1-1 ">
<!--link to advanced search --> <!--link to advanced search -->
<a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted':'uk-float-right '" [routerLink]=advancedSearchLink >More search options <span class="uk-icon"> <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted uk-light ':'uk-float-right uk-light'" [routerLink]=advancedSearchLink >More search options <span class="uk-icon">
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg> <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
</span> </span>
</a> </a>
@ -102,14 +102,19 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
</div> </div>
<div *ngIf="tableViewLink || searchUtils.totalResults <=10000" class=" search-filters uk-width-1-5@l uk-width-1-5@m uk-width-1-1@s uk-visible@m"> <div *ngIf="tableViewLink || searchUtils.totalResults <=10000" class=" search-filters uk-width-1-5@l uk-width-1-5@m uk-width-1-1@s uk-visible@m">
<p *ngIf="tableViewLink" >
<a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
<span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
</a>
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
</p>
<search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" (downloadClick)="downloadClicked($event)"></search-download> <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" (downloadClick)="downloadClicked($event)"></search-download>
<p *ngIf="tableViewLink" class="uk-text-right">
<a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink > </div>
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span> <div [class]="(showRefine)?'uk-width-3-5@m uk-width-3-5@l uk-width-1-1@s uk-align-center uk-margin-remove-bottom':'uk-width-1-1'">
Show results in table view <search-paging [type]="type" [(searchUtils)] = "searchUtils" [(results)] = "results" [(baseUrl)] = "baseUrl" [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues" ></search-paging>
</a>
</p>
</div> </div>

12
portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts
View File

@ -57,7 +57,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<div *ngIf="searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade uk-margin-top" role="alert">No Results found</div> <div *ngIf="searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade uk-margin-top" role="alert">No Results found</div>
<div *ngIf="searchUtils.status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade uk-margin-top" role="alert">An Error Occured</div> <div *ngIf="searchUtils.status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade uk-margin-top" role="alert">An Error Occured</div>
<div *ngIf="searchUtils.status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade uk-margin-top" role="alert">Service not available</div> <div *ngIf="searchUtils.status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade uk-margin-top" role="alert">Service not available</div>
<div *ngIf="searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade uk-margin-top" role="alert">This may take a while...</div> <div *ngIf="searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade uk-margin-top" role="alert"
class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img src="./assets/loading.gif" class="uk-align-center" alt="Loading">
</div>
<div class="uk-grid uk-width-1-1 uk-margin"> <div class="uk-grid uk-width-1-1 uk-margin">
<div *ngIf="searchUtils.totalResults > 0" class="uk-offcanvas-content uk-hidden@m"> <div *ngIf="searchUtils.totalResults > 0" class="uk-offcanvas-content uk-hidden@m">
@ -94,11 +96,11 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
</td></tr--> </td></tr-->
<tr *ngIf="searchViewLink"><td colspan="5" class="uk-padding-remove-top uk-padding-remove-right uk-text-right"> <tr *ngIf="searchViewLink"><td colspan="5" class="uk-padding-remove-top uk-padding-remove-right uk-text-right">
<p> <p>
<span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
<a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=searchViewLink > <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=searchViewLink >
<span class="uk-icon"> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
</span>
Show results in search view
</a> </a>
</p> </p>
</td></tr> </td></tr>

10
portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts
View File

@ -4,12 +4,12 @@ import {Observable} from 'rxjs/Observable';
@Component({ @Component({
selector: 'search-paging', selector: 'search-paging',
template: ` template: `
<div class= "searchPaging uk-panel uk-margin-top"> <div class= "searchPaging uk-panel uk-margin-top uk-grid">
<div class="uk-float-right uk-margin-large-right" *ngIf="results && searchUtils.totalResults > searchUtils.size"> <div class="uk-h6 uk-margin-remove uk-width-1-1@s uk-width-1-2@m" *ngIf="results && searchUtils.totalResults > 0">
<paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [baseUrl]="baseUrl" [size]="searchUtils.size" [parameterNames] = "parameterNames" [parameterValues] = "parameterValues" > </paging> {{searchUtils.totalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages())}}
</div> </div>
<div class="uk-h6 uk-margin-remove" *ngIf="results && searchUtils.totalResults > 0"> <div class="uk-width-1-1@s uk-width-1-2@m " *ngIf="results && searchUtils.totalResults > searchUtils.size">
{{searchUtils.totalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages())}} <paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [baseUrl]="baseUrl" [size]="searchUtils.size" [parameterNames] = "parameterNames" [parameterValues] = "parameterValues" > </paging>
</div> </div>
</div> </div>
` `

2
portal-2/src/app/searchPages/searchUtils/searchResult.component.ts
View File

@ -40,7 +40,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
</span> </span>
</div> </div>
<div *ngIf="result.publisher != undefined && result.publisher != ''">Publisher: {{result.publisher}}</div> <div *ngIf="result.publisher != undefined && result.publisher != ''"><span class="uk-text-bold">Publisher:</span> {{result.publisher}}</div>
<div *ngIf="result.country != undefined && result.country != ''">Country: {{result.country}}</div> <div *ngIf="result.country != undefined && result.country != ''">Country: {{result.country}}</div>

2
portal-2/src/app/services/searchDatasets.service.ts
View File

@ -10,7 +10,7 @@ import 'rxjs/add/operator/share';
import { CacheService } from '../shared/cache.service'; import { CacheService } from '../shared/cache.service';
@Injectable() @Injectable()
export class SearchDatasetsService { export class SearchDatasetsService {
private sizeOfDescription: number = 497; private sizeOfDescription: number = 270;
constructor(private http: Http, public _cache: CacheService) {} constructor(private http: Http, public _cache: CacheService) {}

2
portal-2/src/app/services/searchProjects.service.ts
View File

@ -11,7 +11,7 @@ import {RefineResultsUtils} from './servicesUtils/refineResults.class';
@Injectable() @Injectable()
export class SearchProjectsService { export class SearchProjectsService {
private sizeOfDescription: number = 497; private sizeOfDescription: number = 270;
constructor(private http: Http, public _cache: CacheService) {} constructor(private http: Http, public _cache: CacheService) {}

2
portal-2/src/app/services/searchPublications.service.ts
View File

@ -12,7 +12,7 @@ import {RefineResultsUtils} from './servicesUtils/refineResults.class';
@Injectable() @Injectable()
export class SearchPublicationsService { export class SearchPublicationsService {
private sizeOfDescription: number = 497; private sizeOfDescription: number = 270;
constructor(private http: Http, public _cache: CacheService) {} constructor(private http: Http, public _cache: CacheService) {}

79
portal-2/src/app/sharedComponents/navigationBar.component.ts
View File

@ -21,7 +21,7 @@ import {Session} from '../login/utils/helper.class';
<a class="uk-navbar-item uk-logo" routerLinkActive="uk-link" routerLink="/" > <a class="uk-navbar-item uk-logo" routerLinkActive="uk-link" routerLink="/" >
<img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"> </a> <img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"> </a>
</div> </div>
<div class="uk-navbar-right"> <div class="uk-navbar-right uk-margin-xlarge-top">
<user-mini></user-mini> <user-mini></user-mini>
</div> </div>
</nav> </nav>
@ -42,14 +42,7 @@ import {Session} from '../login/utils/helper.class';
<li><a routerLinkActive="uk-link" routerLink="/search/find/organizations" class="uk-offcanvas-close custom-offcanvas-close">Organizations</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/organizations" class="uk-offcanvas-close custom-offcanvas-close">Organizations</a></li>
</ul> </ul>
</li> </li>
<li class="uk-nav-header uk-parent">
Content Providers
<ul class="uk-nav-sub">
<li><a routerLinkActive="uk-link" routerLink="/search/content-providers" class="uk-offcanvas-close custom-offcanvas-close" >OpenAIRE Content Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Registries/ Databases</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/journals" class="uk-offcanvas-close custom-offcanvas-close" >Journals</a></li>
</ul>
</li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Deposit Deposit
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
@ -58,33 +51,26 @@ import {Session} from '../login/utils/helper.class';
</ul> </ul>
</li> </li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Linking Link
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li><a routerLinkActive="uk-link" routerLink="/participate/claim" class="uk-offcanvas-close custom-offcanvas-close" >Linking</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/claim" class="uk-offcanvas-close custom-offcanvas-close" >Link</a></li>
<li><a routerLinkActive="uk-link" routerLink="/myclaims" class="uk-offcanvas-close custom-offcanvas-close">My Claims</a></li> <li><a routerLinkActive="uk-link" routerLink="/myclaims" class="uk-offcanvas-close custom-offcanvas-close">My Claims</a></li>
<li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims" class="uk-offcanvas-close custom-offcanvas-close">Manage all Claims</a></li> <li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims" class="uk-offcanvas-close custom-offcanvas-close">Manage all Claims</a></li>
</ul> </ul>
</li> </li>
<li class="uk-nav-header uk-parent">
Resources
<ul class="uk-nav-sub">
<li><a href="https://beta.openaire.eu/oa-policies-mandates" class="uk-offcanvas-close custom-offcanvas-close" >Policies and mandates</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/content-providers" class="uk-offcanvas-close custom-offcanvas-close" >OpenAIRE Content Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Registries/ Databases</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/journals" class="uk-offcanvas-close custom-offcanvas-close" >Journals</a></li>
</ul>
</li>
</ul> </ul>
</div> </div>
</div> </div>
<!--div>
<div class="uk-panel" id="module-tm-2">
<form id="search-tm-2" action="/" method="post" role="search" class="uk-search uk-search-default">
<span uk-search-icon="" class="uk-search-icon uk-icon">
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search-icon" ratio="1">
<circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle>
<path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path>
</svg>
</span>
<input name="searchword" placeholder="Search" class="uk-search-input" type="search">
<input name="task" value="search" type="hidden">
<input name="option" value="com_search" type="hidden">
<input name="Itemid" value="1860" type="hidden">
</form>
</div>
</div-->
</div> </div>
</div> </div>
</div> </div>
@ -96,7 +82,10 @@ import {Session} from '../login/utils/helper.class';
<div class="uk-first-column"> <div class="uk-first-column">
<div class="uk-panel inner" id="module-119"> <div class="uk-panel inner" id="module-119">
<ul class="uk-subnav uk-subnav-line"> <ul class="uk-subnav uk-subnav-line">
<li class="uk-active"><a href="https://beta.openaire.eu"><img class="uk-responsive-height" src="assets/common/Home-icon.png" alt="home"></a></li> <li ><a href="https://beta.openaire.eu" class="home-icon"><span class="uk-responsive-height" >
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 20 20" height="20px" id="Layer_1" version="1.1" viewBox="0 0 48 48" width="20px" xml:space="preserve"><path id="home" clip-rule="evenodd" d="M44.715,23.711c-0.381,0.382-1,0.382-1.381,0l-8.939-8.938 c-0.064-0.051-0.119-0.106-0.17-0.171l-3.83-3.829c-0.064-0.051-0.119-0.106-0.17-0.171L24,4.377L4.667,23.711 c-0.381,0.382-1,0.382-1.381,0c-0.381-0.381-0.381-1,0-1.381L23.191,2.425c0.031-0.047,0.053-0.101,0.094-0.144 C23.482,2.085,23.742,1.994,24,2c0.258-0.006,0.518,0.084,0.715,0.281c0.043,0.042,0.062,0.096,0.096,0.144L30,7.616V4.997 c0,0,0,0,0,0c0-0.552,0.447-1,1-1h4c0.277,0,0.527,0.112,0.707,0.293C35.889,4.471,36,4.721,36,4.997v8.619l8.715,8.714 C45.096,22.711,45.096,23.33,44.715,23.711z M34,5.997h-2v3.619l2,2V5.997z M10,21.997c0.552,0,1,0.448,1,1v19c0,1.105,0.896,2,2,2 h6l0,0v-13c0-0.553,0.447-1,1-1h8c0.553,0,1,0.447,1,1v13l0,0h6c1.105,0,2-0.895,2-2v-19c0-0.552,0.447-1,1-1s1,0.448,1,1v19 c0,2.209-1.791,4-4,4H13c-2.209,0-4-1.791-4-4v-19C9,22.444,9.448,21.997,10,21.997z M27,43.996v-12h-6v12l0,0H27L27,43.996z" fill-rule="evenodd" fill="#fff"/></svg>
<!--img class="uk-responsive-height" src="assets/Home_24white.svg" alt="home"-->
</span></a></li>
<li class="custom-discover-li"><a routerLinkActive="uk-link" routerLink="/" >Discover</a></li> <li class="custom-discover-li"><a routerLinkActive="uk-link" routerLink="/" >Discover</a></li>
<li><a >Join</a></li> <li><a >Join</a></li>
<li><a >Connect</a></li> <li><a >Connect</a></li>
@ -139,20 +128,7 @@ import {Session} from '../login/utils/helper.class';
</div> </div>
</div> </div>
</li> </li>
<li class="uk-parent">
<a routerLinkActive="uk-link" routerLink="/search/content-providers" class="" aria-expanded="false">Content Providers</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="uk-link" routerLink="/search/content-providers">OpenAIRE Content Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Registries/ Databases</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/journals">Journals</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="" aria-expanded="false">Deposit</a> <a routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="" aria-expanded="false">Deposit</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 240px;" id="depositMenu" (click)="onClick('depositMenu')"> <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 240px;" id="depositMenu" (click)="onClick('depositMenu')">
@ -167,12 +143,12 @@ import {Session} from '../login/utils/helper.class';
</div> </div>
</li> </li>
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="uk-link" routerLink="/participate/claim" class="" aria-expanded="false">Linking</a> <a routerLinkActive="uk-link" routerLink="/participate/claim" class="" aria-expanded="false">Link</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 358px;" id="linkingMenu" (click)="onClick('linkingMenu')" > <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 358px;" id="linkingMenu" (click)="onClick('linkingMenu')" >
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav"> <ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="uk-link" routerLink="/participate/claim">Linking</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/claim">Link</a></li>
<li><a routerLinkActive="uk-link" routerLink="/myclaims">My Claims</a></li> <li><a routerLinkActive="uk-link" routerLink="/myclaims">My Claims</a></li>
<li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li> <li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li>
</ul> </ul>
@ -180,6 +156,21 @@ import {Session} from '../login/utils/helper.class';
</div> </div>
</div> </div>
</li> </li>
<li class="uk-parent">
<a routerLinkActive="uk-link" routerLink="/search/content-providers" class="" aria-expanded="false">Resources</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
<li><a href="https://beta.openaire.eu/oa-policies-mandates" class="uk-offcanvas-close custom-offcanvas-close" >Policies and mandates</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/content-providers">OpenAIRE Content Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Registries/ Databases</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/journals">Journals</a></li>
</ul>
</div>
</div>
</div>
</li>
</ul> </ul>
</div> </div>
<div class="uk-navbar-right"> <div class="uk-navbar-right">

2
portal-2/src/app/utils/properties/openaireProperties.ts
View File

@ -25,7 +25,7 @@ export class OpenaireProperties {
public static searchLinkToJournals = "search/journals"; public static searchLinkToJournals = "search/journals";
public static searchLinkToJournalsTable = "search/journals-table"; public static searchLinkToJournalsTable = "search/journals-table";
//Advanced Search pages //Advanced Search for pages
public static searchLinkToAdvancedPublications = "search/advanced/publications"; public static searchLinkToAdvancedPublications = "search/advanced/publications";
public static searchLinkToAdvancedProjects = "search/advanced/projects"; public static searchLinkToAdvancedProjects = "search/advanced/projects";
public static searchLinkToAdvancedDatasets = "search/advanced/datasets"; public static searchLinkToAdvancedDatasets = "search/advanced/datasets";

1
portal-2/src/assets/Home_24white.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 20 20" height="20px" id="Layer_1" version="1.1" viewBox="0 0 48 48" width="20px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path id="home" clip-rule="evenodd" d="M44.715,23.711c-0.381,0.382-1,0.382-1.381,0l-8.939-8.938 c-0.064-0.051-0.119-0.106-0.17-0.171l-3.83-3.829c-0.064-0.051-0.119-0.106-0.17-0.171L24,4.377L4.667,23.711 c-0.381,0.382-1,0.382-1.381,0c-0.381-0.381-0.381-1,0-1.381L23.191,2.425c0.031-0.047,0.053-0.101,0.094-0.144 C23.482,2.085,23.742,1.994,24,2c0.258-0.006,0.518,0.084,0.715,0.281c0.043,0.042,0.062,0.096,0.096,0.144L30,7.616V4.997 c0,0,0,0,0,0c0-0.552,0.447-1,1-1h4c0.277,0,0.527,0.112,0.707,0.293C35.889,4.471,36,4.721,36,4.997v8.619l8.715,8.714 C45.096,22.711,45.096,23.33,44.715,23.711z M34,5.997h-2v3.619l2,2V5.997z M10,21.997c0.552,0,1,0.448,1,1v19c0,1.105,0.896,2,2,2 h6l0,0v-13c0-0.553,0.447-1,1-1h8c0.553,0,1,0.447,1,1v13l0,0h6c1.105,0,2-0.895,2-2v-19c0-0.552,0.447-1,1-1s1,0.448,1,1v19 c0,2.209-1.791,4-4,4H13c-2.209,0-4-1.791-4-4v-19C9,22.444,9.448,21.997,10,21.997z M27,43.996v-12h-6v12l0,0H27L27,43.996z" fill-rule="evenodd" fill="#fff"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

42
portal-2/src/assets/discover-custom.css
View File

@ -7,6 +7,7 @@
.tm-toolbar .uk-subnav-line .custom-discover-li a{ .tm-toolbar .uk-subnav-line .custom-discover-li a{
color:#05007A !important; color:#05007A !important;
} }
.custom-discover-toolbar ul.uk-subnav.uk-subnav-line{ .custom-discover-toolbar ul.uk-subnav.uk-subnav-line{
background-color: #f25f30 !important; background-color: #f25f30 !important;
} }
@ -322,7 +323,7 @@ color: #414141}
background-image: url('./search_general_3.jpg'); box-sizing: border-box; height: 250px; background-image: url('./search_general_3.jpg'); box-sizing: border-box; height: 250px;
} }
.publicationsSearchForm{ .publicationsSearchForm{
background-image: url('./search_pubs_2.jpg'); box-sizing: border-box; height: 250px; background-image: url('./search_pubs_1.jpg'); box-sizing: border-box; height: 250px;
} }
.projectsSearchForm{ .projectsSearchForm{
background-image: url('./projects_search.jpg'); box-sizing: border-box; height: 250px; background-image: url('./projects_search.jpg'); box-sizing: border-box; height: 250px;
@ -343,7 +344,7 @@ color: #414141}
.entityRegistriesSearchForm, .entityRegistriesTableSearchForm { .entityRegistriesSearchForm, .entityRegistriesTableSearchForm {
background-image: url('./search_registries.jpg'); box-sizing: border-box; height: 250px; background-image: url('./search_registries.jpg'); box-sizing: border-box; height: 250px;
} }
.divider-table tbody td, .uk-table th { .divider-table tbody td, .uk-table th {
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
@ -377,6 +378,13 @@ color: #414141}
.descriptionText{ .descriptionText{
Padding-left: 25px !important; Padding-left: 25px !important;
Border-left: 10px solid #fafafa; Border-left: 10px solid #fafafa;
display: inline-block;
position: relative;
top: calc(-0.1 * 1em);
vertical-align: middle;
margin-right: 10px;
border-left: 8px solid #e5e5e5;
margin-top: 8px;
} }
@ -431,10 +439,38 @@ html {
color: #444 !important; color: #444 !important;
} }
h2{ h2, h4{
font-weight: 400; font-weight: 400;
text-transform: none; text-transform: none;
} }
.linkdropdown{ .linkdropdown{
min-width:250px; min-width:250px;
} }
.uk-button-action{
background-color: #D6352B;
color: #fff
}
.uk-pagination>*>* {
color:#666 !important;
}
h2, .uk-h2{
font-size:28px !important;
}
.app-box {
border: #e5e5e5 solid 1px;
}
.uk-subnav-line li:hover .home-icon svg #home{
fill: #05007A !important;
}
svg #home{
fill: white !important;
}
.tm-toolbar .uk-subnav-line li a:hover, .tm-toolbar .uk-subnav-line li:hover a{
display: block;
color: #d4d4d4 !important;
}
.tm-toolbar .uk-subnav-line li:hover {display: block;} // remove the others

BIN
portal-2/src/assets/logo/android-icon-144x144.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
portal-2/src/assets/logo/android-icon-192x192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
portal-2/src/assets/logo/android-icon-36x36.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
portal-2/src/assets/logo/android-icon-48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
portal-2/src/assets/logo/android-icon-72x72.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
portal-2/src/assets/logo/android-icon-96x96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
portal-2/src/assets/logo/apple-icon-114x114.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
portal-2/src/assets/logo/apple-icon-120x120.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
portal-2/src/assets/logo/apple-icon-144x144.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
portal-2/src/assets/logo/apple-icon-152x152.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
portal-2/src/assets/logo/apple-icon-180x180.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
portal-2/src/assets/logo/apple-icon-57x57.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
portal-2/src/assets/logo/apple-icon-60x60.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
portal-2/src/assets/logo/apple-icon-72x72.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
portal-2/src/assets/logo/apple-icon-76x76.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
portal-2/src/assets/logo/apple-icon-precomposed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
portal-2/src/assets/logo/apple-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

2
portal-2/src/assets/logo/browserconfig.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

BIN
portal-2/src/assets/logo/favicon-16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
portal-2/src/assets/logo/favicon-32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
portal-2/src/assets/logo/favicon-96x96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
portal-2/src/assets/logo/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

41
portal-2/src/assets/logo/manifest.json Normal file
View File

@ -0,0 +1,41 @@
{
"name": "App",
"icons": [
{
"src": "\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}

BIN
portal-2/src/assets/logo/ms-icon-144x144.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
portal-2/src/assets/logo/ms-icon-150x150.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
portal-2/src/assets/logo/ms-icon-310x310.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
portal-2/src/assets/logo/ms-icon-70x70.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

19
portal-2/src/index.html
View File

@ -21,7 +21,24 @@
<meta property="og:image:width" content="360" /> <meta property="og:image:width" content="360" />
<meta property="og:image:height" content="359" /> <meta property="og:image:height" content="359" />
<link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> <link rel="apple-touch-icon" sizes="57x57" href="assets/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="assets/logo/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/logo/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="assets/logo/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/logo/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="assets/logo/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="assets/logo/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="assets/logo/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="assets/logo/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="assets/logo/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="assets/logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="assets/logo/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/logo/favicon-16x16.png">
<link rel="manifest" href="assets/logo/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<title>Search OpenAIRE</title> <title>Search OpenAIRE</title>
<script> <script>
window.onerror = function (errorMsg, url, lineNumber, column, errorObj) { window.onerror = function (errorMsg, url, lineNumber, column, errorObj) {