submit initial facelift css changes

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53353 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-10-01 15:02:14 +00:00
parent c00ee7b7dd
commit b0193ef255
29 changed files with 450 additions and 778 deletions

View File

@ -80,9 +80,9 @@
<li *ngIf="dataProviderInfo.tabs2.indexOf('Publications') != -1" (click)="search('publicationsTab', 1, 10); activeTab='Publications'">
<a class="uk-accordion-title" href="#">Publications
<span class="uk-badge uk-badge-notification">
{{fetchPublications.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchPublications.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<publicationsTab *ngIf="activeTab=='Publications'"
@ -93,9 +93,9 @@
</li>
<li *ngIf="dataProviderInfo.tabs2.indexOf('Research Data') != -1" (click)="search('datasetsTab', 1, 10); activeTab='Research Data'">
<a class="uk-accordion-title" href="#">Research Data
<span class="uk-badge uk-badge-notification">
{{fetchDatasets.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchDatasets.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<p>
@ -109,9 +109,9 @@
<li *ngIf="dataProviderInfo.tabs2.indexOf('Software') != -1" (click)="search('softwareTab', 1, 10); activeTab='Software'">
<a class="uk-accordion-title" href="#">Software
<span class="uk-badge uk-badge-notification">
{{fetchSoftware.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchSoftware.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<softwareTab *ngIf="activeTab=='Software'"
@ -123,9 +123,9 @@
<li *ngIf="dataProviderInfo.tabs2.indexOf('Other Research Products') != -1" (click)="search('orpsTab', 1, 10); activeTab='Other Research Products'">
<a class="uk-accordion-title" href="#">Other Research Products
<span class="uk-badge uk-badge-notification">
{{fetchOrps.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchOrps.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<orpsTab *ngIf="activeTab=='Other Research Products'"
@ -137,9 +137,9 @@
<li *ngIf="dataProviderInfo.tabs2.indexOf('Projects') != -1" (click)="search('projectsTab', 1, 10); activeTab='Projects'">
<a class="uk-accordion-title" href="#">Projects
<span class="uk-badge uk-badge-notification">
{{fetchProjects.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchProjects.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<projectsTab *ngIf="activeTab=='Projects'"
@ -150,9 +150,9 @@
</li>
<li *ngIf="dataProviderInfo.tabs2.indexOf('Content Providers') != -1" (click)="search('datasourcesTab', 1, 10); activeTab='Content Providers'">
<a class="uk-accordion-title" href="#">Content Providers
<span class="uk-badge uk-badge-notification">
{{fetchDataproviders.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchDataproviders.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<datasourcesTab *ngIf="activeTab=='Content Providers'"
@ -163,9 +163,9 @@
</li>
<li *ngIf="dataProviderInfo.tabs2.indexOf('Organizations') != -1" (click)="search('organizationsTab', 1, 10); activeTab='Organizations'">
<a class="uk-accordion-title" href="#">Organizations
<span class="uk-badge uk-badge-notification">
{{dataProviderInfo.organizations.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{dataProviderInfo.organizations.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<organizationsTab *ngIf="activeTab=='Organizations'"

View File

@ -51,6 +51,7 @@
</showSubjects>
</li>
</ul>
<hr *ngIf="datasetInfo.description" >
<div *ngIf="datasetInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
{{datasetInfo.description}}
@ -87,9 +88,9 @@
<span *ngIf="datasetInfo.relatedResearchResults" class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{relatedResearchResultsNum | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!datasetInfo.relatedResearchResults" class = "uk-alert uk-alert-primary">
@ -98,7 +99,7 @@
<div *ngIf="datasetInfo.relatedResearchResults"> -->
<div>
<div *ngFor="let provenanceaction of getKeys(datasetInfo.relatedResearchResults)">
<div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
<div class="uk-text-large">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="datasetInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
@ -113,9 +114,9 @@
<span *ngIf="datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{datasetInfo.similarResearchResults.length | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{datasetInfo.similarResearchResults.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{datasetInfo.similarResearchResults.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!datasetInfo.similarResearchResults" class = "uk-alert uk-alert-primary" >
@ -148,106 +149,6 @@
</li>
</ul>
<!-- <ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
<li (click)="activeTab='Related Research Results'"
[class]="activeTab == 'Related Research Results'?'uk-active':''">
<a>
Related Research Results
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
</a>
</li>
<li (click)="activeTab='Similar Research Results'"
[class]="activeTab == 'Similar Research Results'?'uk-active':''">
<a>
Similar Research Results
<span *ngIf="!datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{datasetInfo.similarResearchResults.length | number}}
</span>
</a>
</li>
<li (click)="metricsClicked=true; activeTab='Metrics'"
[class]="activeTab == 'Metrics'?'uk-active':''">
<a>
Metrics
</a>
</li>
</ul> -->
<!-- <button class="uk-button uk-button-default uk-hidden@m" type="button">
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
</button>
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
<li (click)="activeTab='Related Research Results'"
[class]="activeTab == 'Related Research Results'?'uk-active':''">
<a>
Related Research Results
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
</a>
</li>
<li (click)="activeTab='Similar Research Results'"
[class]="activeTab == 'Similar Research Results'?'uk-active':''">
<a>
Similar Research Results
<span *ngIf="!datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{datasetInfo.similarResearchResults.length | number}}
</span>
</a>
</li>
<li (click)="metricsClicked=true; activeTab='Metrics'"
[class]="activeTab == 'Metrics'?'uk-active':''">
<a>
Metrics
</a>
</li>
</ul> -->
<!-- <div class="uk-margin custom-tab-content">
<div *ngIf="activeTab=='Related Research Results'" class="uk-animation-fade">
<div *ngIf="!datasetInfo.relatedResearchResults" class = "uk-alert uk-alert-primary" >
No related research results available
</div>
<div *ngIf="datasetInfo.relatedResearchResults && datasetInfo.relatedResearchResults.size > 0">
<div *ngFor="let provenanceaction of getKeys(datasetInfo.relatedResearchResults)">
<div class="uk-text-large">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="datasetInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
</div>
</div>
<div *ngIf="activeTab=='Similar Research Results'" class="uk-animation-fade">
<div *ngIf="!datasetInfo.similarResearchResults" class = "uk-alert uk-alert-primary" >
No similar research results available
</div>
<div *ngIf="datasetInfo.similarResearchResults">
<tabTable [percentageName]="similarity" [info]="datasetInfo.similarResearchResults" [(properties)]=properties></tabTable>
</div>
</div>
<div *ngIf="activeTab=='Metrics'" class="uk-animation-fade">
<metrics [pageViews]="pageViews"
[id]="datasetId" [entityType]="'results'" [entity]="'Research Data'"
(metricsResults)="metricsResults($event)" [(properties)] = properties>
</metrics>
<i-frame *ngIf="metricsClicked && totalViews > 0"
[url]=viewsFrameUrl width="100%" height="250">
</i-frame>
<i-frame *ngIf="metricsClicked && totalDownloads > 0"
[url]=downloadsFrameUrl width="100%" height="250">
</i-frame>
</div>
</div> -->
</div>
<div class="uk-width-large@m uk-width-1-1@s">
@ -259,7 +160,7 @@
<altmetrics *ngIf="datasetInfo.identifiers && datasetInfo.identifiers.get('doi')"
id="{{datasetInfo.identifiers.get('doi')[0]}}" type="doi">
</altmetrics >
<ul class="uk-list ">
<ul class="uk-list uk-margin-remove-bottom ">
<li *ngIf="datasetInfo.hostedBy_collectedFrom && datasetInfo.hostedBy_collectedFrom.length > 0">
<availableOn [availableOn]="datasetInfo.hostedBy_collectedFrom"></availableOn>
@ -296,43 +197,46 @@
</li-->
<li>
<ul uk-accordion class="uk-padding-remove citation-accordion">
<li>
<div class="sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
Cite this research data
</div>
<div class="uk-accordion-content">
<citeThis [result]="datasetInfo" [id]="datasetId" type="research data"></citeThis>
</div>
</li>
</ul>
<div class="sideInfoTitle cite-this-button uk-width-1-1" type="button">
Cite this research data
</div>
<div class=" ">
<citeThis [result]="datasetInfo" [id]="datasetId" type="research data"></citeThis>
</div>
</li>
<!--li>
<ul uk-accordion class="uk-padding-remove">
<li>
<button class="uk-button uk-button-primary uk-accordion-title link-to-button uk-width-1-1" type="button">
<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>
<span>Link this research data to</span>
</button>
<div class="uk-accordion-content">
<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>
</li>
</ul>
</li-->
</ul>
<button style=" box-shadow: 0 1px 10px #444444" class=" uk-button portal-button uk-width-1-1 ">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span> Link this dataset to...
</button>
<div uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
<ul class="uk-iconnav uk-iconnav-vertical">
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-light '>Projects</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','project'])" 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="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
</a>
</li>
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-light '>Communities</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','context'])" 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="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
</a>
</li>
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-light uk-margin-small'>Other research results</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [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="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</a>
</li>
</ul>
</div>
</div>
</div>
@ -345,7 +249,7 @@
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="40" viewBox="0 0 20 20" height="40"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span>
</a-->
<button style=" box-shadow: 0 1px 10px #444444" class=" uk-button uk-button-danger ">
<!--button style=" box-shadow: 0 1px 10px #444444" class=" uk-button uk-button-danger ">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span> Link this dataset to
@ -373,7 +277,7 @@
</li>
</ul>
</div>
</div-->
</div>
</div>
</div>

View File

@ -29,10 +29,14 @@ export class AddThisComponent {
if (typeof document !== 'undefined' && typeof addthis !== 'undefined') {
try{
console.log("AddThis: try load");
addthis.init();
addthis.layers.refresh();
}catch (e) {
console.log("AddThis may didn't load properly");
addthis.init();
addthis.layers.refresh();
console.log("AddThis: one more");
}
}
});

View File

@ -13,9 +13,10 @@ declare var Sys:any;
<!--dt class="title">Cite this {{type}}</dt-->
<dd class="line" >
<select class="select" id="citations" name="citeselect" [(ngModel)]="selectedStyle" (ngModelChange)="styleChanged()">
<option value="0">select an organization</option>
<option *ngFor=" let style of this.citation.templates let i = index" [value]="style">{{style}}</option>
</select>
<div id="citation" class="box-content uk-padding-small" [innerHTML]=citationText></div>
<div *ngIf="selectedStyle!='0'" id="citation" class="box-content uk-padding-small" [innerHTML]=citationText></div>
</dd>
</dl>
</div>
@ -23,7 +24,7 @@ declare var Sys:any;
})
export class CiteThisComponent {
private sub:any;
public selectedStyle:string;
public selectedStyle:string="0";
public citationText:string;
public citation:Citation = new Citation();
// public cite: any;
@ -35,7 +36,7 @@ export class CiteThisComponent {
constructor(private route: ActivatedRoute) {
this.selectedStyle = this.citation.templates[0];
// this.selectedStyle = this.citation.templates[0];
}
ngOnInit() {
@ -138,7 +139,7 @@ export class CiteThisComponent {
}
};
var citeproc = new CSL.Engine(new Sys(this.citation.locale, this.data ), this.citation[this.selectedStyle]);
var citeproc = new CSL.Engine(new Sys(this.citation.locale, this.data ), this.citation[(this.selectedStyle == "0")?this.citation.templates[0]:this.selectedStyle]);
citeproc.updateItems([this.data.id]);
this.citationText = citeproc.makeBibliography();
this.citationText = ((this.citationText != null) && (this.citationText.length > 1) && (this.citationText[1].length > 0)) ? this.citationText[1][0] : '';

View File

@ -78,7 +78,7 @@ export class FundedByComponent {
public buildFundingTooltip(item: { "id": string, "acronym": string, "title": string,
"funderShortname": string, "funderName": string,
"funding": string, "code": string, "provenanceAction": string, inline: boolean}) {
let tooltipContent: string = "<div class='tooltip-custom-font-size uk-light uk-padding-small'>";
let tooltipContent: string = "<div class='tooltip-custom-font-size uk-padding-small'>";
if(item.title) {
tooltipContent += "<h5>"+item.title+"</h5>";

View File

@ -19,9 +19,9 @@
<li (click)="activeTab='Publications'; searchPublicationsInit()">
<a class="uk-accordion-title" href="#">
Publications
<span class="uk-badge uk-badge-notification">
{{fetchPublications.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchPublications.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
@ -69,9 +69,9 @@
<li (click)="activeTab='Projects'; projectsClicked=true;">
<a class="uk-accordion-title" href="#">
Projects
<span class="uk-badge uk-badge-notification">
{{fetchProjects.searchUtils.totalResultsNoFilters | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchProjects.searchUtils.totalResultsNoFilters | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<searchingProjectsTab *ngIf="projectsClicked" [(fetchProjects)]="fetchProjects" [organizationId]="organizationId" [(properties)]=properties></searchingProjectsTab>
@ -81,9 +81,9 @@
<li (click)="activeTab='Content Providers'; searchDataprovidersInit()">
<a class="uk-accordion-title" href="#">
Content Providers
<span class="uk-badge uk-badge-notification">
{{fetchDataproviders.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchDataproviders.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'" tab_error_class=true></errorMessages>

View File

@ -56,7 +56,7 @@
<div class="uk-accordion-content">
<div>
<div *ngFor="let provenanceaction of getKeys(orpInfo.relatedResearchResults)">
<div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
<div class="uk-text-large">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="orpInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
</div>

View File

@ -83,9 +83,9 @@
<li (click)="activeTab='Publications'; searchPublicationsInit()">
<a class="uk-accordion-title" href="#">
Publications
<span class="uk-badge uk-badge-notification">
{{fetchPublications.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchPublications.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
@ -108,9 +108,9 @@
<li (click)="activeTab='Research Data'; searchDatasetsInit()">
<a class="uk-accordion-title" href="#">
Research Data
<span class="uk-badge uk-badge-notification">
{{fetchDatasets.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchDatasets.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<errorMessages [status]="[fetchDatasets.searchUtils.status]" [type]="'research data'" tab_error_class=true></errorMessages>
@ -134,9 +134,9 @@
<li (click)="activeTab='Software'; searchSoftwareInit()">
<a class="uk-accordion-title" href="#">
Software
<span class="uk-badge uk-badge-notification">
{{fetchSoftware.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchSoftware.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<errorMessages [status]="[fetchSoftware.searchUtils.status]" [type]="'software'" tab_error_class=true></errorMessages>
@ -160,9 +160,9 @@
<li (click)="activeTab='Other Research Products'; searchOrpsInit()">
<a class="uk-accordion-title" href="#">
Other Research Products
<span class="uk-badge uk-badge-notification">
{{fetchOrps.searchUtils.totalResults | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{fetchOrps.searchUtils.totalResults | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<errorMessages [status]="[fetchOrps.searchUtils.status]" [type]="'other research products'" tab_error_class=true></errorMessages>
@ -419,12 +419,17 @@
<ul class="uk-list">
<li>
<a class="clickable" uk-toggle="target: #publications_dynamic; animation:uk-animation-fade"><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="code" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.01" points="13,4 19,10 13,16"></polyline><polyline fill="none" stroke="#000" stroke-width="1.01" points="7,4 1,10 7,16"></polyline></svg></span> Include in your site (HTML)</a>
<div hidden id="publications_dynamic">
<button class="uk-button uk-button-default publ_clipboard_btn" data-clipboard-target="#publ_clipboard">
Copy to clipboard
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</button>
<pre><code id="publ_clipboard">{{publications_dynamic}}</code></pre>
<div hidden id="publications_dynamic" class="widget-box uk-padding-small uk-card uk-card-default ">
<div class=" uk-alert uk-alert-primary uk-padding-small uk-margin-remove-bottom uk-margin-right">
For further information please contact us <a href="mailto:helpdesk@openaire.eu">helpdesk@openaire.eu</a>
</div>
<div class="uk-grid">
<a class=" publ_clipboard_btn uk-padding-remove-left uk-margin-small-left uk-text-right uk-width-1-1 " data-clipboard-target="#publ_clipboard" title="Copy to clipboard">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</a>
</div>
<pre class="box-content uk-padding-remove-bottom uk-margin-remove-bottom"><code id="publ_clipboard">{{publications_dynamic}}</code></pre>
</div>
</li>
<li>
@ -452,12 +457,16 @@
<ul class="uk-list">
<li>
<a class="clickable" uk-toggle="target: #datasets_dynamic; animation:uk-animation-fade"><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="code" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.01" points="13,4 19,10 13,16"></polyline><polyline fill="none" stroke="#000" stroke-width="1.01" points="7,4 1,10 7,16"></polyline></svg></span> Include in your site (HTML) </a>
<div hidden id="datasets_dynamic">
<button class="uk-button uk-button-default datasets_clipboard_btn" data-clipboard-target="#datasets_clipboard">
Copy to clipboard
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</button>
<pre><code id="datasets_clipboard">{{datasets_dynamic}}</code></pre>
<div hidden id="datasets_dynamic" class="widget-box uk-padding-small uk-card uk-card-default ">
<div class=" uk-alert uk-alert-primary uk-padding-small uk-margin-remove-bottom uk-margin-right">
For further information please contact us <a href="mailto:helpdesk@openaire.eu">helpdesk@openaire.eu</a>
</div>
<div class="uk-grid">
<a class=" datasets_clipboard_btn uk-padding-remove-left uk-margin-small-left uk-text-right uk-width-1-1 " data-clipboard-target="#datasets_clipboard" title="Copy to clipboard">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</a>
</div>
<pre class="box-content uk-padding-remove-bottom uk-margin-remove-bottom"><code id="datasets_clipboard">{{datasets_dynamic}}</code></pre>
</div>
</li>
<li>
@ -483,21 +492,24 @@
</ul>
</div>
<!--ul uk-accordion class="uk-padding-remove">
<li>
<button class="uk-button uk-button-primary uk-accordion-title link-to-button uk-width-1-1" type="button">
<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>
<span>Link this project to</span>
</button>
<div class="uk-accordion-content">
<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>
</li>
</ul-->
<button style=" box-shadow: 0 1px 10px #444444" class=" uk-button portal-button uk-margin-small-top uk-width-1-1">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span> Link this project to...
</button>
<div uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;" class=" uk-margin-remove-top uk-padding-small">
<ul class="uk-iconnav uk-iconnav-vertical">
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-margin-small'>Research results</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId,'project','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="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</a>
</li>
</ul>
</div>
</div>
<!--metrics [pageViews]="pageViews" shortView=true
[id]="projectId" [entityType]="'projects'" [entity]="'Project'"
@ -509,13 +521,13 @@
<modal-loading></modal-loading>
<modal-alert #AlertModalCsvError></modal-alert>
<!-- Claiming FAB -->
<div class="uk-inline">
<!--div class="uk-inline">
<div class=" uk-float-right " style="z-index: 200; bottom: 55px; position: fixed; right: 45%;">
<!--a style="padding: 30px; box-shadow: 0 1px 10px #444444" class=" uk-icon-button uk-button-primary shadowBox" uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Link this publication to</div>">
< !--a style="padding: 30px; box-shadow: 0 1px 10px #444444" class=" uk-icon-button uk-button-primary shadowBox" uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Link this publication to</div>">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="40" viewBox="0 0 20 20" height="40"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span>
</a-->
</a- ->
<button style=" box-shadow: 0 1px 10px #444444" class=" uk-button uk-button-danger ">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
@ -534,7 +546,7 @@
</ul>
</div>
</div>
</div>
</div-->
</div>
</div>
</div>

View File

@ -77,7 +77,7 @@
</showSubjects>
</li>
</ul>
<hr *ngIf="publicationInfo.description">
<div *ngIf="publicationInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
{{publicationInfo.description}}
</div>
@ -121,9 +121,9 @@
<span *ngIf="publicationInfo.references" class="uk-badge uk-badge-notification">
{{publicationInfo.references.length | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{publicationInfo.references.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{publicationInfo.references.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!publicationInfo.references" class = "uk-alert uk-alert-primary" >
@ -159,9 +159,9 @@
<span *ngIf="publicationInfo.relatedResearchResults" class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{relatedResearchResultsNum | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!publicationInfo.relatedResearchResults" class = "uk-alert uk-alert-primary">
@ -170,7 +170,7 @@
<div *ngIf="publicationInfo.relatedResearchResults"> -->
<div>
<div *ngFor="let provenanceaction of getKeys(publicationInfo.relatedResearchResults)">
<div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
<div class="uk-text-large">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="publicationInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
@ -185,9 +185,9 @@
<span *ngIf="publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{publicationInfo.similarResearchResults.length | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{publicationInfo.similarResearchResults.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{publicationInfo.similarResearchResults.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!publicationInfo.similarResearchResults" class = "uk-alert uk-alert-primary" >
@ -208,9 +208,9 @@
<span *ngIf="publicationInfo.organizations" class="uk-badge uk-badge-notification">
{{publicationInfo.organizations.length | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{publicationInfo.organizations.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{publicationInfo.organizations.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!publicationInfo.organizations" class = "uk-alert uk-alert-primary">
@ -269,9 +269,9 @@
<span *ngIf="publicationInfo.bioentities" class="uk-badge uk-badge-notification">
{{publicationInfo.bioentitiesNum | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{bioentitiesNum | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{bioentitiesNum | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<div *ngIf="publicationInfo.bioentities && bioentitiesNum > pageSize" class="uk-margin-bottom">
@ -308,9 +308,9 @@
<span *ngIf="publicationInfo.software" class="uk-badge uk-badge-notification">
{{publicationInfo.software.length | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{publicationInfo.software.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{publicationInfo.software.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<div *ngIf="publicationInfo.software && publicationInfo.software.length > pageSize" class="uk-margin-bottom">
@ -354,292 +354,6 @@
</li>
</ul>
<!-- <ul class="uk-tab uk-visible@l" uk-tab="connect: #tab-content">
<li *ngIf="publicationInfo.references" (click)="activeTab='References'"
[class]="activeTab == 'References'?'uk-active':''">
<a>
References
<span *ngIf="publicationInfo.references" class="uk-badge uk-badge-notification">
{{publicationInfo.references.length | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.relatedResearchResults" (click)="activeTab='Related Research Results'"
[class]="activeTab == 'Related Research Results'?'uk-active':''">
<a>
Related Research Results
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.similarResearchResults" (click)="activeTab='Similar Research Results'"
[class]="activeTab == 'Similar Research Results'?'uk-active':''">
<a>
Similar Research Results
<span *ngIf="!publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{publicationInfo.similarResearchResults.length | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.organizations" (click)="activeTab='Related Organizations'"
[class]="activeTab == 'Related Organizations'?'uk-active':''">
<a>
Related Organizations
<span *ngIf="!publicationInfo.organizations" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="publicationInfo.organizations" class="uk-badge uk-badge-notification">
{{publicationInfo.organizations.length | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.bioentities" (click)="activeTab='Bioentities'"
[class]="activeTab == 'Bioentities'?'uk-active':''">
<a>
Bioentities
<span class="uk-badge uk-badge-notification">{{bioentitiesNum | number}}</span>
</a>
</li>
<li *ngIf="publicationInfo.software" (click)="activeTab='Software'"
[class]="activeTab == 'Software'?'uk-active':''">
<a>
Software
<span class="uk-badge uk-badge-notification">{{publicationInfo.software.length | number}}</span>
</a>
</li>
<li (click)="metricsClicked=true; activeTab='Metrics'"
[class]="activeTab == 'Metrics'?'uk-active':''">
<a>
Metrics
</a>
</li>
</ul> -->
<!-- <button class="uk-button uk-button-default uk-hidden@l" type="button">
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
</button>
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@l" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
<li *ngIf="publicationInfo.references" (click)="activeTab='References'"
[class]="activeTab == 'References'?'uk-active':''">
<a>
References
<span *ngIf="!publicationInfo.references" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="publicationInfo.references" class="uk-badge uk-badge-notification">
{{publicationInfo.references.length | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.relatedResearchResults" (click)="activeTab='Related Research Results'"
[class]="activeTab == 'Related Research Results'?'uk-active':''">
<a>
Related Research Results
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.similarResearchResults" (click)="activeTab='Similar Research Results'"
[class]="activeTab == 'Similar Research Results'?'uk-active':''">
<a>
Similar Research Results
<span *ngIf="!publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{publicationInfo.similarResearchResults.length | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.organizations" (click)="activeTab='Related Organizations'"
[class]="activeTab == 'Related Organizations'?'uk-active':''">
<a>
Related Organizations
<span *ngIf="!publicationInfo.organizations" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="publicationInfo.organizations" class="uk-badge uk-badge-notification">
{{publicationInfo.organizations.length | number}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.bioentities" (click)="activeTab='Bioentities'"
[class]="activeTab == 'Bioentities'?'uk-active':''">
<a>
Bioentities
<span class="uk-badge uk-badge-notification">{{bioentitiesNum | number}}</span>
</a>
</li>
<li *ngIf="publicationInfo.software" (click)="activeTab='Software'"
[class]="activeTab == 'Software'?'uk-active':''">
<a>
Software
<span class="uk-badge uk-badge-notification">{{publicationInfo.software.length | number}}</span>
</a>
</li>
<li (click)="metricsClicked=true; activeTab='Metrics'"
[class]="activeTab == 'Metrics'?'uk-active':''">
<a>
Metrics
</a>
</li>
</ul> -->
<!-- <div class="uk-margin custom-tab-content">
<div *ngIf="activeTab == 'References'" class="uk-animation-fade">
<div *ngIf="!publicationInfo.references" class = "uk-alert uk-alert-primary" >
No references available
</div>
<div *ngIf="publicationInfo.references">
<div *ngIf="publicationInfo.references && publicationInfo.references.length > pageSize" class="uk-margin-bottom">
<span class="uk-h6">{{publicationInfo.references.length | number}} references, page {{referencesPage | number}} of {{totalPages(publicationInfo.references.length) | number}}</span>
<paging-no-load class="uk-float-right" [currentPage]="referencesPage" [totalResults]="publicationInfo.references.length" [size]="pageSize" (pageChange)="updateReferencesPage($event)"></paging-no-load>
</div>
<div *ngFor="let item of publicationInfo.references.slice((referencesPage-1)*pageSize, referencesPage*pageSize)">
<p *ngIf=" item && item['url']"
class="custom-external custom-icon">
<a href="{{item['url']}}" target="_blank">
{{item['name']}}
</a>
</p>
<p *ngIf="!item['url']" class="pseudo-external custom-icon">
{{item['name']}}
</p>
</div>
</div>
</div>
<div *ngIf="activeTab == 'Related Research Results'" class="uk-animation-fade">
<div *ngIf="!publicationInfo.relatedResearchResults" class = "uk-alert uk-alert-primary">
No related research results available
</div>
<div *ngIf="publicationInfo.relatedResearchResults">
<div *ngFor="let provenanceaction of getKeys(publicationInfo.relatedResearchResults)">
<div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="publicationInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
</div>
</div>
<div *ngIf="activeTab == 'Similar Research Results'" class="uk-animation-fade">
<div *ngIf="!publicationInfo.similarResearchResults" class = "uk-alert uk-alert-primary">
No similar research results available
</div>
<div *ngIf="publicationInfo.similarResearchResults">
<tabTable [percentageName]="similarity" [info]="publicationInfo.similarResearchResults" [(properties)]=properties></tabTable>
</div>
</div>
<div *ngIf="activeTab == 'Related Organizations'" class="uk-animation-fade">
<div *ngIf="!publicationInfo.organizations" class = "uk-alert uk-alert-primary">
No related organizations available
</div>
<div *ngIf="publicationInfo.organizations">
<div *ngIf="publicationInfo.organizations && publicationInfo.organizations.length > pageSize" class="uk-margin-bottom">
<span class="uk-text-bold">{{publicationInfo.organizations.length | number}} organizations, page {{organizationsPage | number}} of {{totalPages(publicationInfo.organizations.length) | number}}</span>
<paging-no-load class="uk-float-right" [currentPage]="organizationsPage" [totalResults]="publicationInfo.organizations.length" [size]="pageSize" (pageChange)="updateOrganizationsPage($event)"></paging-no-load>
</div>
<table class="uk-table uk-table-small uk-table-divider uk-table-middle ">
<tbody>
<tr *ngFor="let organization of publicationInfo.organizations.slice((organizationsPage-1)*pageSize, organizationsPage*pageSize)">
<td>
<a *ngIf="(organization['id']) && ((organization['name']) || (organization['shortname']))"
[queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
{{organization['name']}}
<span *ngIf="organization.name && organization.shortname"> ( </span>
<span *ngIf="organization.shortname">{{organization.shortname}}</span>
<span *ngIf="organization.name && organization.shortname"> ) </span>
</a>
<p *ngIf="(!organization['id']) && ((organization['name']) || (organization['shortname']))">
{{organization['name']}}
<span *ngIf="organization.name && organization.shortname"> ( </span>
<span *ngIf="organization.shortname">{{organization.shortname}}</span>
<span *ngIf="organization.name && organization.shortname"> ) </span>
</p>
<div *ngIf="organization.country">{{organization.country}}</div>
<div *ngIf="organization.websiteUrl">Website url:
<a href="{{organization.websiteUrl}}" target="_blank">{{organization.websiteUrl}}</a>
</div>
</td>
<td>
<div *ngIf="organization['trust']" title="{{organization['trust']}}%" >
<div class="uk-text-center">{{organization['trust']}}%</div>
<progress class="uk-progress uk-margin-remove" value="{{organization['trust']}}" max="100"></progress>
</div>
<div *ngIf="!organization['trust']">
<p>no trust available</p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div *ngIf="activeTab=='Bioentities'" class="uk-animation-fade">
<div *ngIf="publicationInfo.bioentities && bioentitiesNum > pageSize" class="uk-margin-bottom">
<span class="uk-text-bold"> {{bioentitiesNum | number}} bioentities, page {{bioentitiesPage | number}} of {{totalPages(bioentitiesNum) | number}}</span>
<paging-no-load class="uk-float-right" [currentPage]="bioentitiesPage" [totalResults]="bioentitiesNum" [size]="pageSize" (pageChange)="updateBioentitiesPage($event)"></paging-no-load>
</div>
<table id="bioentitiesTable" class="uk-table ">
<tbody>
<ng-container *ngFor="let key of getKeys(publicationInfo.bioentities) let i=index">
<tr *ngFor="let keyIn of keysToArray(publicationInfo.bioentities.get(key)).slice((bioentitiesPage-1)*pageSize, bioentitiesPage*pageSize)">
<td class="uk-text-center" *ngIf="keyIn">
<span class="custom-external custom-icon">
<a href="{{publicationInfo.bioentities.get(key).get(keyIn)}}"
target="_blank">
{{keyIn}}
</a>
</span>
</td>
<td class="uk-text-center">
{{key}}
</td>
</tr>
</ng-container>
</tbody>
</table>
</div>
<div *ngIf="activeTab == 'Software'" class="uk-animation-fade">
<div *ngIf="publicationInfo.software && publicationInfo.software.length > pageSize" class="uk-margin-bottom">
<span class="uk-text-bold">{{publicationInfo.software.length | number}} software results, page {{softwarePage | number}} of {{totalPages(publicationInfo.software.length) | number}}</span>
<paging-no-load class="uk-float-right" [currentPage]="softwarePage" [totalResults]="publicationInfo.software.length" [size]="pageSize" (pageChange)="updateSoftwarePage($event)"></paging-no-load>
</div>
<table id="softwareTable" class="uk-table ">
<tbody>
<tr *ngFor="let item of publicationInfo.software.slice((softwarePage-1)*pageSize, softwarePage*pageSize)" class="uk-text-center">
<td>
<span class="custom-external custom-icon">
<a href="{{item.url}}" target="_blank">
{{item.name}}
</a>
</span>
</td>
</tr>
</tbody>
</table>
</div>
<div *ngIf="activeTab == 'Metrics'" class="uk-animation-fade">
<metrics [pageViews]="pageViews"
[id]="articleId" [entityType]="'results'" [entity]="'Publication'"
(metricsResults)="metricsResults($event)" [(properties)] = properties>
</metrics>
<i-frame *ngIf="metricsClicked && totalViews>0"
[url]=viewsFrameUrl width="100%" height="250">
</i-frame>
<i-frame *ngIf="metricsClicked && totalDownloads>0"
[url]=downloadsFrameUrl width="100%" height="250">
</i-frame>
</div>
</div> -->
</div>
<div class="uk-width-large@m uk-width-1-1@s">
@ -651,7 +365,7 @@
<altmetrics *ngIf="publicationInfo.identifiers && publicationInfo.identifiers.get('doi')"
id="{{publicationInfo.identifiers.get('doi')[0]}}" type="doi">
</altmetrics>
<ul class="uk-list">
<ul class="uk-list uk-margin-remove-bottom">
<li *ngIf="publicationInfo.hostedBy_collectedFrom && publicationInfo.hostedBy_collectedFrom.length > 0">
<availableOn [availableOn]="publicationInfo.hostedBy_collectedFrom"></availableOn>
</li>
@ -684,20 +398,47 @@
</metrics-->
</li>
<li>
<ul uk-accordion class="uk-padding-remove citation-accordion">
<li>
<div class=" sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
Cite this publication
</div>
<div class="uk-accordion-content">
<div class=" sideInfoTitle cite-this-button uk-width-1-1" type="button">
Cite this publication
</div>
<div class=" ">
<citeThis [result]="publicationInfo" [id]="articleId" type="publication"></citeThis>
</div>
</li>
</ul>
</li>
</ul>
<button class=" uk-button portal-button uk-width-1-1 ">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span> Link this publication to...
</button>
<div class=" uk-margin-remove-top uk-padding-small" uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
<ul class="uk-iconnav uk-iconnav-vertical">
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size '>Projects</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])" 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="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
</a>
</li>
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size '>Communities</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])" 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="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
</a>
</li>
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-margin-small'>Other research results</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','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="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
<!-- Claiming FAB -->
@ -724,7 +465,7 @@
</a>
</div>
</div-->
<div class="uk-inline">
<!--div class="uk-inline">
<div class=" uk-float-right " style="z-index: 200; bottom: 55px; position: fixed; right: 45%;">
@ -758,7 +499,7 @@
</ul>
</div>
</div>
</div>
</div-->
</div>
</div>

View File

@ -51,7 +51,7 @@
</showSubjects>
</li>
</ul>
<hr *ngIf="softwareInfo.description" >
<div *ngIf="softwareInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
{{softwareInfo.description}}
</div>
@ -81,7 +81,7 @@
</div>
</div></div> -->
<ul class="custom-accordion" uk-accordion>
<ul class="custom-accordion " uk-accordion>
<li *ngIf="softwareInfo.relatedResearchResults" (click)="activeTab='Related Research Results'">
<a class="uk-accordion-title" href="#">
@ -90,9 +90,9 @@
<span *ngIf="softwareInfo.relatedResearchResults" class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{relatedResearchResultsNum | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!softwareInfo.relatedResearchResults" class = "uk-alert uk-alert-primary">
@ -101,7 +101,7 @@
<div *ngIf="softwareInfo.relatedResearchResults"> -->
<div>
<div *ngFor="let provenanceaction of getKeys(softwareInfo.relatedResearchResults)">
<div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
<div class="uk-text-large">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="softwareInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
@ -116,9 +116,9 @@
<span *ngIf="softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{softwareInfo.similarResearchResults.length | number}}
</span> -->
<span class="uk-badge uk-badge-notification">
{{softwareInfo.similarResearchResults.length | number}}
</span>
<!-- <span class="uk-badge uk-badge-notification"> -->
({{softwareInfo.similarResearchResults.length | number}})
<!-- </span> -->
</a>
<div class="uk-accordion-content">
<!-- <div *ngIf="!softwareInfo.similarResearchResults" class = "uk-alert uk-alert-primary" >
@ -151,105 +151,6 @@
</li>
</ul>
<!-- <ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
<li (click)="activeTab='Related Research Results'"
[class]="activeTab == 'Related Research Results'?'uk-active':''">
<a>
Related Research Results
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
</a>
</li>
<li (click)="activeTab='Similar Research Results'"
[class]="activeTab == 'Similar Research Results'?'uk-active':''">
<a>
Similar Research Results
<span *ngIf="!softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{softwareInfo.similarResearchResults.length | number}}
</span>
</a>
</li>
<li (click)="metricsClicked=true; activeTab='Metrics'"
[class]="activeTab == 'Metrics'?'uk-active':''">
<a>
Metrics
</a>
</li>
</ul> -->
<!-- <button class="uk-button uk-button-default uk-hidden@m" type="button">
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
</button>
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
<li (click)="activeTab='Related Research Results'"
[class]="activeTab == 'Related Research Results'?'uk-active':''">
<a>
Related Research Results
<span class="uk-badge uk-badge-notification">
{{relatedResearchResultsNum | number}}
</span>
</a>
</li>
<li (click)="activeTab='Similar Research Results'"
[class]="activeTab == 'Similar Research Results'?'uk-active':''">
<a>
Similar Research Results
<span *ngIf="!softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">
{{softwareInfo.similarResearchResults.length | number}}
</span>
</a>
</li>
<li (click)="metricsClicked=true; activeTab='Metrics'"
[class]="activeTab == 'Metrics'?'uk-active':''">
<a>
Metrics
</a>
</li>
</ul> -->
<!-- <div class="uk-margin custom-tab-content">
<div *ngIf="activeTab=='Related Research Results'" class="uk-animation-fade">
<div *ngIf="!softwareInfo.relatedResearchResults" class = "uk-alert uk-alert-primary" >
No related research results available
</div>
<div *ngIf="softwareInfo.relatedResearchResults">
<div *ngFor="let provenanceaction of getKeys(softwareInfo.relatedResearchResults)">
<div class="uk-text-large">{{provenanceaction}}</div>
<tabTable [percentageName]="trust" [info]="softwareInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
</div>
</div>
</div>
<div *ngIf="activeTab=='Similar Research Results'" class="uk-animation-fade">
<div *ngIf="!softwareInfo.similarResearchResults" class = "uk-alert uk-alert-primary" >
No similar research results available
</div>
<div *ngIf="softwareInfo.similarResearchResults">
<tabTable [percentageName]="similarity" [info]="softwareInfo.similarResearchResults"></tabTable>
</div>
</div>
<div *ngIf="activeTab=='Metrics'" class="uk-animation-fade">
<metrics [pageViews]="pageViews"
[id]="softwareId" [entityType]="'results'" [entity]="'Software'"
(metricsResults)="metricsResults($event)" [(properties)] = properties>
</metrics>
<i-frame *ngIf="metricsClicked && totalViews > 0"
[url]=viewsFrameUrl width="100%" height="250">
</i-frame>
<i-frame *ngIf="metricsClicked && totalDownloads > 0"
[url]=downloadsFrameUrl width="100%" height="250">
</i-frame>
</div>
</div> -->
</div>
<div class="uk-width-large@m uk-width-1-1@s">
@ -261,7 +162,7 @@
<altmetrics *ngIf="softwareInfo.identifiers && softwareInfo.identifiers.get('doi')"
id="{{softwareInfo.identifiers.get('doi')[0]}}" type="doi">
</altmetrics >
<ul class="uk-list ">
<ul class="uk-list uk-margin-remove-bottom">
<li *ngIf="softwareInfo.hostedBy_collectedFrom && softwareInfo.hostedBy_collectedFrom.length > 0">
<availableOn [availableOn]="softwareInfo.hostedBy_collectedFrom"></availableOn>
@ -298,18 +199,13 @@
</li-->
<li>
<ul uk-accordion class="uk-padding-remove">
<li>
<div class=" sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
Cite this software
</div>
<div class="uk-accordion-content">
<citeThis [result]="softwareInfo" [id]="softwareId" type="software"></citeThis>
</div>
</li>
</ul>
<div class=" sideInfoTitle cite-this-button uk-width-1-1" type="button">
Cite this software
</div>
<div class="">
<citeThis [result]="softwareInfo" [id]="softwareId" type="software"></citeThis>
</div>
</li>
<!--li>
<ul uk-accordion class="uk-padding-remove">
@ -334,7 +230,35 @@
</li-->
</ul>
<button style=" box-shadow: 0 1px 10px #444444" class=" uk-button portal-button uk-width-1-1 ">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span> Link this software to...
</button>
<div uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
<ul class="uk-iconnav uk-iconnav-vertical">
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-light '>Projects</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[softwareId,'software','project'])" 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="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
</a>
</li>
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-light '>Communities</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[softwareId,'software','context'])" 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="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
</a>
</li>
<li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-light uk-margin-small'>Other research results</div>">
<a class=" uk-icon-button portal-button shadowBox" style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[softwareId,'software','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="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
@ -346,7 +270,7 @@
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="40" viewBox="0 0 20 20" height="40"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span>
</a-->
<button style=" box-shadow: 0 1px 10px #444444" class=" uk-button uk-button-danger ">
<!-- <button style=" box-shadow: 0 1px 10px #444444" class=" uk-button uk-button-danger ">
<span class="uk-icon">
<svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path 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" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
</span> Link this software to
@ -374,7 +298,8 @@
</li>
</ul>
</div>
</div> -->
</div>
</div>

View File

@ -24,7 +24,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[csvParams]="csvParams" csvPath="datasources" simpleSearchLink="/search/find/dataproviders"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId>
[oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId
searchFormClass="datasourcesSearchForm">
</advanced-search-page>
`

View File

@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[csvParams]="csvParams" csvPath="datasets" simpleSearchLink="/search/find/datasets"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId >
[oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
searchFormClass="datasetsSearchForm">
</advanced-search-page>
`

View File

@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[csvParams]="csvParams" csvPath="organizations" simpleSearchLink="/search/find/organizations"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId>
[oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId
searchFormClass="organizationsSearchForm">
</advanced-search-page>
`

View File

@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[csvParams]="csvParams" csvPath="other" simpleSearchLink="/search/find/other"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId >
[oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
searchFormClass="orpsSearchForm">
</advanced-search-page>
`

View File

@ -22,7 +22,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[csvParams]="csvParams" csvPath="projects" simpleSearchLink="/search/find/projects"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId>
[oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId
searchFormClass="projectsSearchForm">
</advanced-search-page>
`

View File

@ -25,7 +25,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults"
[(openaireLink)]=openaireLink
[(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId>
[(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
searchFormClass="publicationsSearchForm">
</advanced-search-page>
`
})

View File

@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[csvParams]="csvParams" csvPath="software" simpleSearchLink="/search/find/software"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId>
[oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
searchFormClass="softwareSearchForm">
</advanced-search-page>
`

View File

@ -1,70 +1,79 @@
<div class="image-front-topbar uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
<div uk-height-viewport="offset-top: true;offset-bottom: 60" style="box-sizing: border-box; " class=" uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed generalSearchForm">
<div class="uk-position-cover" style="background-color: rgba(255, 255, 255, 0.37);"></div>
<div class="uk-container">
<div class="uk-position-relative">
<div id="tm-main" class=" uk-section uk-margin-small-top tm-middle" >
<div uk-grid uk-grid>
<div class="uk-container">
<div class="uk-width-1-1">
<a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" class="uk-float-right uk-light portal-color uk-margin-small-bottom" [routerLink]=advancedSearchLink >Advanced search for {{activeTab}}
</a>
<search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)" placeholderText="Search for research results, projects, content providers & organizations in OpenAIRE"></search-form>
</div>
</div>
</div>
</div>
</div>
</div>
<div id="tm-main" class=" uk-section uk-padding-remove-top tm-middle" >
<div 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="">
<div class="uk-width-1-1 ">
<div class="uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle generalSearchForm">
<div class="uk-width-1-1">
<search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)" placeholderText="Search for research results, software, other research products, projects, content providers, organizations in OpenAIRE information space"></search-form>
<a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" class="uk-float-right uk-light" [routerLink]=advancedSearchLink >Advanced search for {{activeTab}}<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>
</span>
</a>
</div>
</div>
</div>
<div class=" uk-margin-small-top uk-container uk-container-small">
<div class="uk-grid uk-margin-top">
<ul class=" uk-tab uk-tab-left uk-width-1-5 uk-visible@m" uk-tab="animation: uk-animation-fade">
<li *ngIf="showPublications" (click)="searchPublications()" [class]="activeTab == 'publications'?'uk-active':''">
<a>
Publications
<span [class]="(fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchPublications.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+ (fetchPublications.searchUtils.totalResults | number) +')' :'')}}</span>
</a>
</li>
<li *ngIf="showDatasets" (click)="searchDatasets()" [class]="activeTab == 'research data'?'uk-active':''">
<a>
Research Data
<span [class]="(fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchDatasets.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchDatasets.searchUtils.totalResults | number) +')':'')}}</span>
</a>
</li>
<li *ngIf="showSoftware" (click)="searchSoftware()" [class]="activeTab == 'software'?'uk-active':''">
<a>
Software
<span [class]="(fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchSoftware.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchSoftware.searchUtils.totalResults | number)+')' :'')}}</span>
</a>
</li>
<li *ngIf="showOrps" (click)="searchOrps()" [class]="activeTab == 'other research products'?'uk-active':''">
<a>
Other Research Products
<span [class]="(fetchOrps.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchOrps.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchOrps.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchOrps.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchOrps.searchUtils.totalResults | number) +')':'')}}</span>
</a>
</li>
<li *ngIf="showProjects" (click)="searchProjects()" [class]="activeTab == 'projects'?'uk-active':''">
<a>
Projects
<span [class]="(fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchProjects.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchProjects.searchUtils.totalResults | number) +')':'')}}</span>
</a>
</li>
<li *ngIf="showDataProviders" (click)="searchDataProviders()" [class]="activeTab == 'content providers'?'uk-active':''">
<a>
Content Providers
<span [class]="(fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchDataproviders.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchDataproviders.searchUtils.totalResults | number) +')':'')}}</span>
</a>
</li>
<li *ngIf="showOrganizations" (click)="searchOrganizations()" [class]="activeTab == 'organizations'?'uk-active':''">
<a>
Organizations
<span [class]="(fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchOrganizations.searchUtils.totalResults | number) :'')}}</span>
<span > {{((fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchOrganizations.searchUtils.totalResults | number)+')' :'')}}</span>
</a>
</li>
</ul>

View File

@ -1,5 +1,14 @@
<form [class]="(isDisabled )?'uk-disabled advancedSearchForm uk-tile uk-margin-small-top':'advancedSearchForm uk-tile uk-margin-small-top'">
<form [class]="(isDisabled )?'uk-disabled advancedSearchForm uk-tile uk-margin-small-top uk-padding-small':'advancedSearchForm uk-tile uk-margin-small-top uk-padding-small'">
<div class="uk-article-title custom-article-title uk-text-center">
{{pageTitle}}
</div>
<a *ngIf = "simpleSearchLink && simpleSearchLink.length > 0" routerLinkActive="router-link-active" [routerLink]=simpleSearchLink style="z-index:1;"
[class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted uk-button portal-color uk-text-secondary uk-margin-right ':'uk-float-right uk-button portal-color uk-text-secondary uk-margin-right '" >Simple search
<!--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>
</span-->
</a>
<table class=" uk-table uk-table-responsive uk-table-small" >
<tr *ngFor="let selectedField of selectedFields; let i = index" class="-row ">
<td *ngIf ="i==0 " class="">Search for:</td>
@ -52,8 +61,10 @@
</span></td>
</tr>
</table>
<div class="-row uk-text-right">
<button (click)="queryChanged()" type="submit" class="uk-button uk-button-danger">Search</button>
<div class=" uk-text-center">
<button (click)="queryChanged()" type="submit" class=" uk-button portal-background-color uk-padding uk-padding-remove-top uk-padding-remove-bottom ">
<span class="uk-icon" ><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1.5"><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>
</button>
</div>
</form>

View File

@ -18,7 +18,8 @@ export class AdvancedSearchFormComponent {
@Input() fieldIdsMap;
@Input() selectedFields:AdvancedField[];
@Input() isDisabled: boolean = false;
@Input() simpleSearchLink;
@Input() pageTitle;
@Output() queryChange = new EventEmitter();
newFieldId:string;
newFieldName:string;

View File

@ -1,6 +1,7 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import{AdvancedSearchFormComponent} from './advancedSearchForm.component';
import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entitiesAutoComplete.module';
@ -10,7 +11,7 @@ import {DateFilterModule} from './dateFilter.module';
@NgModule({
imports: [
CommonModule, FormsModule, EntitiesAutocompleteModule, StaticAutocompleteModule, DateFilterModule
CommonModule, FormsModule, RouterModule, EntitiesAutocompleteModule, StaticAutocompleteModule, DateFilterModule
],
declarations: [
AdvancedSearchFormComponent,

View File

@ -1,29 +1,41 @@
<div id="tm-main" class=" uk-section uk-margin-small-top tm-middle">
<div class="image-front-topbar uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
<div style="box-sizing: border-box; " [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed advancedSearchFormBackground '+searchFormClass">
<div class="uk-position-cover" style="background-color: rgba(255, 255, 255, 0.37);"></div>
<div class="uk-width-1-1">
<div class="uk-position-relative">
<div class="uk-container uk-margin-large-top">
<advanced-search-form
[entityType] = "entityType"
[(fieldIds)]="fieldIds"
[(fieldIdsMap)]="fieldIdsMap"
[(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"
[isDisabled]="disableForms"
[simpleSearchLink]=simpleSearchLink
[pageTitle]=pageTitle
>
</advanced-search-form>
</div>
</div>
</div>
</div>
</div>
<div id="tm-main" class=" tm-middle">
<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="uk-container uk-margin-top">
<div class="uk-article-title custom-article-title">
{{pageTitle}}
</div>
<div class="uk-container ">
<div>
<a *ngIf = "simpleSearchLink && simpleSearchLink.length > 0" routerLinkActive="router-link-active" [routerLink]=simpleSearchLink style="z-index:1;"
[class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted uk-button uk-button-text uk-text-secondary uk-margin-right uk-margin-top':'uk-float-right uk-button uk-button-text uk-text-secondary uk-margin-right uk-margin-top'" >Simple search
<!--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>
</span-->
</a>
<advanced-search-form
[entityType] = "entityType"
[(fieldIds)]="fieldIds"
[(fieldIdsMap)]="fieldIdsMap"
[(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"
[isDisabled]="disableForms">
</advanced-search-form>
<div class="uk-width-1-1">
<helper position="top"></helper>
</div>
<div class="uk-width-1-1 uk-grid helper-grid" >
<div class="uk-width-1-1 uk-grid helper-grid uk-padding-large uk-padding-remove-top" >
<helper class="helper-left-right uk-visible@m" position="left"></helper>
<div class="uk-width-expand@m uk-with-1-1@s">
<div *ngIf="openaireLink"> <a class="uk-margin-top uk-button uk-button-text" [href]=openaireLink target="_blank" >Results in OpenAIRE</a></div>

View File

@ -40,6 +40,7 @@ export class AdvancedSearchPageComponent {
@Input() oldTotalResults: number = 0;
@Input() openaireLink: string;
@Input() connectCommunityId: string;
@Input() searchFormClass: string = "searchForm";
piwiksub: any;
public parameterNames:string[] =[];
public parameterValues:string[] =[];
@ -275,7 +276,7 @@ export class AdvancedSearchPageComponent {
if(this.fieldIdsMap[id]["param"] == parameter){
return this.fieldIdsMap[id]["operator"];
}
}
}
}
// for loading
public openLoading(){

View File

@ -7,8 +7,8 @@
<a class = " filterItem" [queryParams]="routerHelper.createQueryParam(filter.filterId,quote(value.id))" routerLinkActive="router-link-active" [routerLink]=baseUrl>
<span class="filterName"><div title = "{{value.name}}">{{_formatName(value)}} </div></span> <span class="filterNumber" > ({{value.number | number}})</span></a>
</li>
<li *ngIf= " filter.values.length > 5 " class= " uk-margin-remove-top">
<a href="#modal-{{filter.filterId}}" uk-toggle class="uk-button uk-button-text">View more <!--span class="uk-text-muted">View more </span>
<li *ngIf= " filter.values.length > 5 " class= "uk-padding-small-top">
<a href="#modal-{{filter.filterId}}" uk-toggle class="uk-text-secondary ">View more <!--span class="uk-text-muted">View more </span>
<span class="uk-icon">
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-right" ratio="1"><polygon points="8 5 13 10 8 15"></polygon></svg>
</span-->

View File

@ -1,17 +1,17 @@
<ul *ngIf= "filter.values.length >0" class="uk-list">
<li class="uk-open">
<h5 class="uk-margin-bottom-remove sideInfoTitle">{{_formatTitle(filter.title,filter.values.length)}}
<h5 class="uk-margin-bottom-remove searchFilterTitle">{{_formatTitle(filter.title,filter.values.length)}}
</h5>
<div aria-expanded="false">
<div class="searchFilterBoxValues ">
<div *ngFor = "let value of getSelectedValues(filter,'num')" class = "uk-animation-fade filterItem">
<!--div *ngFor = "let value of getSelectedValues(filter,'num')" class = "uk-animation-fade filterItem">
<span class="filterName"><div title = "{{value.name}}">
<input [disabled]="isDisabled" [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
{{_formatName(value)}} </div></span>
<span class="filterNumber" *ngIf = "showResultCount === true" > ({{value.number|number}})</span>
</div>
<hr *ngIf="filter.countSelectedValues > 0 && (filter.values.length-filter.countSelectedValues ) > 0 " class="uk-grid-divider uk-margin-small">
<hr *ngIf="filter.countSelectedValues > 0 && (filter.values.length-filter.countSelectedValues ) > 0 " class="uk-grid-divider uk-margin-small"-->
<div *ngFor = "let value of getNotSelectedValues(filter,'num').slice(0,(!addShowMore?getNotSelectedValues(filter,'num').length:5-getSelectedValues(filter,'num').length))" class = "uk-animation-fade filterItem">
<span class="filterName"><div title = "{{value.name}}"> <input [disabled]="isDisabled" [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
@ -20,7 +20,7 @@
</div>
<a *ngIf=" addShowMore && (filter.values.length) > 5" (click)="open()"
[class]="(isDisabled)?'uk-disabled uk-link-muted uk-button uk-button-text uk-text-secondary':'uk-button uk-button-text uk-text-secondary'">View more
[class]="(isDisabled)?'uk-disabled uk-link-muted uk-text-secondary':' uk-text-secondary'">View more
</a>
@ -32,7 +32,7 @@
{{filter.title}}
</h5>
<div *ngIf="filter.values.length >= 99" class="uk-alert uk-alert-primary uk-text-center uk-margin-right uk-margin-left">Showing top {{filter.values.length}} values. </div>
<div *ngIf="filter.values.length >= 99" class="uk-alert uk-alert-primary uk-text-center uk-margin-right uk-margin-left uk-margin-small-top uk-margin-small-bottom ">Showing top {{filter.values.length}} values. </div>
<div class="uk-grid uk-margin-left uk-margin-right">
<input class="uk-input uk-margin-small-bottom uk-width-1-2 " name="filter-keyword" placeholder="Search for {{filter.title}}" type="text" [(ngModel)]="keyword">
<select *ngIf = "showResultCount === true" [(ngModel)]="sortBy" class="uk-select uk-margin-small-bottom uk-width-1-2 uk-padding-remove" name="select_order" (ngModelChange)="sortByChanged = true;" >

View File

@ -8,16 +8,12 @@ import {Router} from '@angular/router';
template: `
<form [class]="(isDisabled)?'uk-margin uk-text-center uk-margin-top uk-disabled':'uk-margin uk-text-center uk-margin-top'">
<input type="text" class="uk-input uk-width-1-2" [placeholder]="placeholderText" aria-describedby="sizing-addon2" [(ngModel)]="keyword" name="keyword" >
<button *ngIf="!link" (click)="keywordChanged()" type="submit" class=" uk-button uk-button-danger">
<span class="uk-icon">
<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>Search
<input type="text" class="uk-input uk-width-xlarge" [placeholder]="placeholderText" aria-describedby="sizing-addon2" [(ngModel)]="keyword" name="keyword" >
<button *ngIf="!link" (click)="keywordChanged()" type="submit" class=" uk-button portal-button">
<span class="uk-icon" ><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1.5"><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>
</button>
<button *ngIf="link" class=" uk-button uk-button-danger" (click)="goTo()" type="submit" >
<span class="uk-icon">
<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>Search
<button *ngIf="link" (click)="goTo()" type="submit" class=" uk-button portal-button uk-padding uk-padding-remove-top uk-padding-remove-bottom ">
<span class="uk-icon" ><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1.5"><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>
</button>
</form>
`

View File

@ -1,49 +1,32 @@
<div id="tm-main" class=" uk-section uk-margin-small-top tm-middle" >
<div class="image-front-topbar uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
<div uk-height-viewport="offset-top: true;offset-bottom: 40" style="box-sizing: border-box; " [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">
<div class="uk-position-cover" style="background-color: rgba(255, 255, 255, 0.37);"></div>
<div class="uk-container">
<div class="uk-position-relative">
<div class="uk-container ">
<div class="uk-width-1-1">
<!--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-light ':'uk-float-right uk-light') +' portal-color uk-margin-small-bottom'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >
<span class=" ">Advanced search</span>
</a>
<search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
</div>
</div>
</div>
</div>
</div>
</div>
<div id="tm-main" class=" uk-section uk-padding-remove-top tm-middle" >
<div 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="">
<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">
<search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
</div>
<div class="uk-width-1-1 ">
<div *ngIf="countFilters()>0" class = "uk-container uk-width-1-2@m uk-width-1-2@s uk-align-center uk-text-center uk-text-small whiteText uk-padding-small">
<a *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' uk-button uk-button-default uk-margin-small-right'">
Clear All
</a>
<span *ngIf = "searchUtils.keyword.length > 0">Keywords: <span [innerHtml]="searchUtils.keyword"></span>
<a (click) = "clearKeywords() " title="Remove keywords" [class]="(disableForms)?'uk-icon-button icon-button-small uk-margin-small-right uk-disabled':'uk-icon-button icon-button-small uk-margin-small-right'"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><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></span></a>
</span>
<span *ngFor="let filter of filters " >
<span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
<span *ngFor="let value of getSelectedValues(filter); let i = index; let end = last; " ><span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
<a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="(disableForms)?'uk-icon-button icon-button-small uk-margin-small-right uk-disabled':'uk-icon-button icon-button-small uk-margin-small-right'"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><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></span></a>
<!--span *ngIf="!end" class=" uk-margin-small-right ">, </span-->
</span>
</span>
</span>
</div>
<div *ngIf= "showUnknownFilters" class = " uk-text-center ">
<a (click) = "clearFilters() " >Try new Query</a>
</div>
<!--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-light ':'uk-float-right uk-light') +' whiteText uk-padding-small uk-button-text'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >
<span class="uk-padding-small">More search options</span>
</a>
</div>
</div>
</div>
<div class="uk-container">
<helper position="top"></helper>
<div [class]="(showRefine)? 'uk-width-3-5@m uk-width-3-5@l uk-width-1-1@s' :'uk-width-1-1'">
@ -54,6 +37,38 @@
<div id="offcanvas-usage" uk-offcanvas>
<div class="uk-offcanvas-bar">
<button class="uk-offcanvas-close" type="button" uk-close></button>
<div class="uk-width-1-1 uk-margin-small-bottom ">
<div *ngIf="countFilters()>0" class="uk-margin-small-bottom">
<span *ngIf = "searchUtils.keyword.length > 0"><span class="uk-text-bold">Keywords:</span>
<a (click) = "clearKeywords() " title="Remove keywords" [class]="((disableForms)?' uk-disabled':' ')+' uk-margin-small-right portal-color '"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
</span></span></a>
<span [innerHtml]="searchUtils.keyword"></span>
</span>
<div *ngFor="let filter of filters " >
<span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
<span *ngFor="let value of getSelectedValues(filter); let i = index; let end = last; " >
<a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="((disableForms)?' uk-disabled':' ')+' portal-color '"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
</span></span></a>
<span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
<span *ngIf="!end" class=" ">, </span>
</span>
</span>
</div>
</div>
<a *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' portal-reverse-button '">
Clear All
</a>
<a *ngIf= "showUnknownFilters" class = " portal-reverse-button " (click) = "clearFilters() " >Try new Query</a>
</div>
<div class="uk-text-large">Filter By:</div>
<search-filter *ngFor="let filter of filters " [addShowMore]=false [isDisabled]="disableForms" [filter]="filter" [showResultCount]=showResultCount (onFilterChange)="filterChanged($event)" [(connectCommunityId)]=connectCommunityId></search-filter>
</div>
@ -66,6 +81,38 @@
<div class="uk-grid uk-width-1-1">
<div *ngIf="showRefine" class="helper-left-right search-filters uk-visible@m">
<helper position="left" before="true"></helper>
<div class="uk-width-1-1 uk-margin-small-bottom ">
<div *ngIf="countFilters()>0" class="uk-margin-small-bottom">
<span *ngIf = "searchUtils.keyword.length > 0"><span class="uk-text-bold">Keywords:</span>
<a (click) = "clearKeywords() " title="Remove keywords" [class]="((disableForms)?' uk-disabled':' ')+' uk-margin-small-right portal-color '"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
</span></span></a>
<span [innerHtml]="searchUtils.keyword"></span>
</span>
<div *ngFor="let filter of filters " >
<span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
<span *ngFor="let value of getSelectedValues(filter); let i = index; let end = last; " >
<a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="((disableForms)?' uk-disabled':' ')+' portal-color '"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
<svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
</span></span></a>
<span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
<span *ngIf="!end" class=" ">, </span>
</span>
</span>
</div>
</div>
<a *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' portal-reverse-button '">
Clear All
</a>
<a *ngIf= "showUnknownFilters" class = " portal-reverse-button " (click) = "clearFilters() " >Try new Query</a>
</div>
<search-filter *ngFor="let filter of filters " [isDisabled]="disableForms" [filter]="filter" [showResultCount]=showResultCount (onFilterChange)="filterChanged($event)" [(connectCommunityId)]=connectCommunityId></search-filter>
<helper position="left" before="false"></helper>
</div>

File diff suppressed because one or more lines are too long

View File

@ -120,7 +120,7 @@
</div>
<div class="tm-header uk-visible@m tm-header-transparent" uk-header="">
<div [class]="'uk-navbar-container uk-sticky uk-navbar-transparent uk-light '+portal+'-menu'" uk-sticky="" media="768" cls-active="uk-active uk-navbar-sticky" animation="uk-animation-slide-top" top=".tm-header + [class*=&quot;uk-section&quot;]" cls-inactive="uk-navbar-transparent uk-light" style="">
<div [class]="'uk-navbar-container uk-sticky uk-navbar-transparent '+portal+'-menu'" uk-sticky="" media="768" cls-active="uk-active uk-navbar-sticky" animation="uk-animation-slide-top" top=".tm-header + [class*=&quot;uk-section&quot;]" cls-inactive="uk-navbar-transparent" style="">
<div class="uk-container uk-container-expand">
<nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}">
<div class="uk-navbar-left uk-visible@l uk-width-1-3">
@ -163,7 +163,7 @@
</li>
</ng-container>
</ul>
</div>
<div *ngIf="userMenu" class="uk-navbar-right">