Update first page content, in search pages parse extra fields to show info in labels like landing pages

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@50016 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2017-11-29 11:54:16 +00:00
parent 890a971e39
commit a4c4102bf0
23 changed files with 1745 additions and 35 deletions

View File

@ -40,8 +40,8 @@
</div-->
<ul uk-accordion>
<li>
<h3 class="uk-margin-remove-vertical uk-width-small uk-margin-auto-left uk-accordion-title basket-title ">
In basket
<h3 class=" uk-text-right uk-margin-remove-vertical uk-width-small uk-margin-auto-left uk-accordion-title basket-title ">
<span class="uk-icon"><svg xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" height="28px" id="my-box" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="28px" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px"><g> <path d="M480,320v128H32V320h78.859l64.016,96h162.25l64-96H480 M384,32H128L0,288v192h512V288L384,32L384,32z M35.781,288l112-224 h216.438l112,224H384l-64,96H192l-64.016-96H35.781L35.781,288z" fill="#b5b5b5"></path></g> </svg> </span>
<span *ngIf="(projects.length + contexts.length + results.length)> 0" class="uk-badge basket-badge ">{{(projects.length + contexts.length + results.length)}}</span>
</h3>
<div class="uk-accordion-content dropbasket uk-padding-small uk-margin uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-grid uk-grid-stack">

View File

@ -22,9 +22,9 @@
<!--start-over [results]="results" [contexts]="contexts" [projects]="projects" ></start-over-->
<ul uk-accordion>
<li>
<h3 class="uk-margin-remove-vertical uk-width-small uk-margin-auto-left uk-accordion-title basket-title ">
<h3 class=" uk-text-right uk-margin-remove-vertical uk-width-small uk-margin-auto-left uk-accordion-title basket-title ">
In basket
<span class="uk-icon"><svg xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" height="28px" id="my-box" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="28px" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px"><g> <path d="M480,320v128H32V320h78.859l64.016,96h162.25l64-96H480 M384,32H128L0,288v192h512V288L384,32L384,32z M35.781,288l112-224 h216.438l112,224H384l-64,96H192l-64.016-96H35.781L35.781,288z" fill="#b5b5b5"></path></g> </svg> </span>
<span *ngIf="(projects.length + contexts.length + results.length)> 0" class="uk-badge basket-badge ">{{(projects.length + contexts.length + results.length)}}</span>
</h3>
<div class="uk-accordion-content dropbasket uk-padding-small uk-margin uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-grid uk-grid-stack">
@ -40,6 +40,7 @@
</ul>
<div *ngIf="step==1">
<ul class=" uk-tab " uk-tab="connect: #tabs; animation: uk-animation-fade">
<li>
<a>Projects ({{projects.length}})</a>

View File

@ -16,7 +16,7 @@
</div>
</div>
</div>
<div class="uk-container uk-container-large uk-margin-medium">
<div class="uk-container uk-container-large uk-margin-medium explore-numbers">
<div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<div class="search_box_bg uk-margin-large uk-margin-remove-bottom uk-text-center uk-grid-match uk-child-width-1-2 uk-child-width-1-2@s uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-4@xl uk-grid-collapse uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" uk-grid="" data-id="page#7" style="">
@ -49,8 +49,9 @@
</div>
</div>
</div>
<div *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-meta uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" data-id="page#8" style="">
<span style="color:#fff!important; font-size:30pt!important">all linked together</span>
<div *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" class="uk-text-large custom-uk-text-light uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
all linked together
</div>
</div>
</div>
@ -59,7 +60,241 @@
</div>
</div>
</div>
<div class="uk-section-muted uk-section uk-section-small uk-flex uk-flex-middle" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-slide-top-medium&quot;,&quot;delay&quot;:false}" uk-height-viewport="offset-top: true" style="box-sizing: border-box; min-height: 100vh; height: 100vh;">
<div class="uk-width-1-1">
<div class="uk-container">
<div class="uk-margin-small uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<h6 id="page#12" class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-h6 uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" style="">
Learn more on OpenAIRE's discovery and sharing services
</h6>
<hr class="uk-width-small uk-margin-auto uk-divider-small uk-text-center uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" style="">
</div>
</div>
<div class="uk-container uk-container-large uk-margin-large">
<div uk-grid="" class="uk-grid uk-grid-stack">
<div class="uk-width-1-1@m uk-first-column">
<div class="uk-margin uk-grid-match uk-child-width-1-1 uk-child-width-1-1@s uk-child-width-1-3@m uk-child-width-1-3@l uk-child-width-1-3@xl uk-grid-parallax uk-grid uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" uk-grid-parallax="translate: " uk-lightbox="toggle: a[data-type]" style="margin-bottom: 0px;">
<div class="uk-first-column">
<div uk-scrollspy-class="" class="el-item uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" style="">
<a routerLinkActive="uk-link" routerLink="/search/find" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent" data-caption="&lt;h4 class='uk-margin-remove'&gt;Explore &lt;/h4&gt;&lt;div&gt;Search for publications-data-software and other research artefacts. See how these are linked together and how they are linked to funding and organizations.&lt;/div&gt;
&lt;p&gt;View statistics on projects and institutions.&lt;/p&gt;"></a>
<div class="uk-card-media-top"><img src="assets/explrore.jpg" sizes="(min-width: 711px) 711px, 100vw" class="el-image" alt="" width="711"></div>
<div class="uk-card-body">
<h3 class="el-title uk-margin uk-h2 uk-margin-remove-adjacent uk-margin-remove-bottom">
Explore
</h3>
<div class="el-meta uk-margin uk-text-meta">Discover linked open research</div>
<div class="el-content uk-margin">
<div>Search for
publications-data-software and other research artefacts. See how these
are linked together and how they are linked to funding and
organizations.
</div>
<p>View statistics on projects and institutions.</p>
</div>
</div>
</div>
</div>
<div>
<div uk-scrollspy-class="" class="el-item uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" style="">
<a routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent" data-caption="&lt;h4 class='uk-margin-remove'&gt;Share&lt;/h4&gt;&lt;div class=&quot;uk-margin-bottom&quot;&gt;Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.&lt;/div&gt;
&lt;div&gt;Use &lt;a href=&quot;http://www.zenodo.org&quot; target=&quot;_blank&quot; rel=&quot;noopener&quot;&gt;ZENODO&lt;/a&gt;, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)&lt;/div&gt;"></a>
<div class="uk-card-media-top"><img src="assets/open.jpg" sizes="(min-width: 1090px) 1090px, 100vw" class="el-image" alt="" width="1090"></div>
<div class="uk-card-body">
<h3 class="el-title uk-margin uk-h2 uk-margin-remove-adjacent uk-margin-remove-bottom">
Share
</h3>
<div class="el-meta uk-margin uk-text-meta">Deposit in a repository of your choice</div>
<div class="el-content uk-margin">
<div class="uk-margin-bottom">Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.</div>
<div>Use <a href="http://www.zenodo.org/" target="_blank" rel="noopener">ZENODO</a>, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)</div>
</div>
</div>
</div>
</div>
<div>
<div uk-scrollspy-class="" class="el-item uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" style="">
<a routerLinkActive="uk-link" routerLink="/participate/claim" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent" data-caption="&lt;h4 class='uk-margin-remove'&gt;Link&lt;/h4&gt;&lt;div class=&quot;uk-margin-bottom&quot;&gt;If you don't find your research results in OpenAIRE, don't worry!&lt;/div&gt;
&lt;div&gt;Use our &lt;strong&gt;LINK OUT service&lt;/strong&gt;, that reaches out to many external sources via APIs, to connect your research results and &lt;em&gt;claim&lt;/em&gt; them to your project.&lt;/div&gt;"></a>
<div class="uk-card-media-top"><img src="assets/link.jpg" sizes="(min-width: 693px) 693px, 100vw" class="el-image" alt="" width="693"></div>
<div class="uk-card-body">
<h3 class="el-title uk-margin uk-h2 uk-margin-remove-adjacent uk-margin-remove-bottom">
Link
</h3>
<div class="el-meta uk-margin uk-text-meta">Connect all your research</div>
<div class="el-content uk-margin">
<div class="uk-margin-bottom">If you don't find your research results in OpenAIRE, don't worry!</div>
<div>Use our <strong>LINK OUT service</strong>, that reaches out to many external sources via APIs, to connect your research results and <em>claim</em> them to your project.</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="uk-section-default uk-section">
<div class="uk-container">
<div class="uk-grid-small uk-margin-medium uk-grid" uk-grid="">
<div class="uk-width-expand@m uk-first-column">
<h3 class="uk-margin-small uk-h3 uk-heading-line uk-text-primary">
<span>New content providers</span>
</h3>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
Aaltodoc Publication Archive
</h6>
<div class="el-meta uk-margin uk-text-meta">Aalto University</div>
<div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-danger">Data</span>&nbsp;<span class="uk-label uk-label-success">OpenAIRE 3.0</span><br>
12469 datasets
</div>
</div>
</div>
<div class="uk-grid-margin uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
Cambridge Server
</h6>
<div class="el-meta uk-margin uk-text-meta">Cambridge Uviversity</div>
<div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-warning">Literature</span>&nbsp;<span class="uk-label uk-label-success" style="background-color:orange!important">OpenAIRE 2.0</span><br>
4567 publications
</div>
</div>
</div>
</div>
<hr>
<div class="uk-margin">
<a class="el-content uk-button uk-button-text" routerLinkActive="uk-link" routerLink="/search/find/dataproviders" >
View all
</a>
</div>
</div>
<div class="uk-width-expand@m">
<h2 class="uk-h3 uk-heading-line uk-text-primary">
<span>New funders</span>
</h2>
<div class="uk-margin uk-text-meta">
Latest funding database incorporated in OpenAIRE
</div>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
Swiss National Science Foundation
</h6>
<div class="el-meta uk-margin uk-text-meta">Switzerland</div>
<div class="el-content uk-margin"><span class="uk-label">OA mandate</span><br> 47.509 publications</div>
</div>
</div>
<div class="uk-grid-margin uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
Ministry of Education, Science and Technological Development of Republic of Serbia
</h6>
<div class="el-meta uk-margin uk-text-meta">Serbia</div>
<div class="el-content uk-margin">7.942 publicatios</div>
</div>
</div>
</div>
</div>
<div class="uk-width-expand@m uk-grid-item-match">
<div class="uk-tile-secondary uk-tile uk-tile-xsmall">
<h4 class="uk-margin-remove-top uk-h4">
Our data policies
</h4>
<ul class="uk-margin-small uk-list uk-list-large">
<li class="el-item">
<h3 class="el-title uk-h3 uk-margin-remove">Data acquisition</h3>
<div class="el-content">
<a href="http://dl119.madgik.di.uoa.gr/www.cnn.com">How we
retrieve data, how often, what processes it goes through (aggregating
cleaning, trasnforming, inferring, de-duplicating), what are the quality
checks&nbsp;along all&nbsp; data processing stages.</a>
</div>
</li>
<li class="el-item">
<h3 class="el-title uk-h3 uk-margin-remove">Data usage</h3>
<div class="el-content">
<a href="http://dl119.madgik.di.uoa.gr/www.cnn.com">Who is able to retrieve our data, what are the licences, what about specific SLAs.</a>
</div>
</li>
</ul>
<div class="uk-margin uk-margin-remove-bottom uk-text-left">
<a class="el-content uk-link-text" href="http://dl119.madgik.di.uoa.gr/www.cnn.com" target="_blank">
Learn more
</a>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="uk-section-default" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
<div style="background-image: url('assets/sky_bw3.png');" class="uk-background-norepeat uk-background-cover uk-background-center-center uk-background-fixed uk-section uk-section-small">
<div class="uk-container">
<div class="uk-grid-divider uk-margin-remove-vertical uk-grid" uk-grid="">
<div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-first-column">
<h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
A content provider?
</h4>
<div class="custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
Join OpenAIRE, use our tools and make your content more visible around the world.
</div>
<div id="page#37" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<a class="providelink el-content uk-button uk-button-default uk-button-small" href="https://provide.openaire.eu" target="_blank">
OpenAIRE.PROVIDE
</a>
</div>
</div>
<div class="uk-width-expand@m uk-width-1-2@s uk-dark">
<h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
A research manager?
</h4>
<div class="custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
Use our monitoring services and easily track all relevant research results.
</div>
<div id="page#41" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<a class="monitorlink el-content uk-button uk-button-default uk-button-small" href="https://monitor.openaire.eu" target="_blank">
OpenAIRE.MONITOR
</a>
</div>
</div>
<div class="uk-width-expand@m uk-width-1-2@s uk-dark">
<h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
A research community?
</h4>
<div class="custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
Use a trusted partner to share, link, disseminate and monitor your research.
</div>
<div id="page#45" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<a class="connectlink el-content uk-button uk-button-default uk-button-small" href="https://connect.openaire.eu" target="_blank">
OpenAIRE.CONNECT
</a>
</div>
</div>
<div class="uk-width-expand@m uk-width-1-2@s uk-dark">
<h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
A developer?
</h4>
<div id="page#48" class="custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
Get access to OpenAIRE data and capitalize on on Europe's open linked research.
</div>
<div id="page#49" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<a class="developlink el-content uk-button uk-button-default uk-button-small" href="https://develop.openaire.eu" target="_blank">
OpenAIRE.DEVELOP
</a>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -7,7 +7,7 @@
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger uk-margin-large-top" role="alert">{{errorMessage}}</div>
<div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img src="./assets/loading.gif" class="uk-align-center" alt="Loading"></div>
<div *ngIf="dataProviderInfo != null" uk-grid>
<div *ngIf="dataProviderInfo != null" uk-grid class="uk-grid-large">
<div class="uk-width-3-4@l uk-width-3-4@xl uk-width-3-4@m uk-width-1-1@s">
<!--h3 *ngIf="dataProviderInfo.title != null">
@ -221,8 +221,10 @@
</div>
<div class="uk-width-1-4@l uk-width-1-4@xl uk-width-1-4@m uk-width-1-1@s">
<div>
Share - Bookmark<addThis ></addThis>
<div class="uk-card uk-card-default uk-padding-small">
<div>
Share - Bookmark<addThis ></addThis>
</div>
</div>
</div>
</div>

View File

@ -12,6 +12,8 @@
<div class="uk-width-3-4@l uk-width-3-4@xl uk-width-3-4@m uk-width-1-1@s">
<showTitle [title]="datasetInfo.title"></showTitle>
<span *ngIf="datasetInfo.types.length > 0"class="uk-label custom-label label-dataset " title="Type">{{datasetInfo.types.join(", ")}}</span>
<span *ngIf="datasetInfo.languages.length > 0" class="uk-label custom-label label-language " title="Language">{{datasetInfo.languages.join(", ")}}</span>
<span *ngIf="datasetInfo.title && datasetInfo.title.accessMode" [class]="'uk-label custom-label label-'+ datasetInfo.title.accessMode " >{{datasetInfo.title.accessMode}}</span>
<span *ngIf="datasetInfo.underCurationMessage" class="uk-label custom-label label-underCuration " >
<span uk-tooltip="pos:right; delay:10"

View File

@ -7,7 +7,7 @@
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger uk-margin-large-top" role="alert">{{errorMessage}}</div>
<div [style.display]="showLoading ? 'inline' : 'none'"class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img src="./assets/loading.gif" class="uk-align-center" alt="Loading"></div>
<div *ngIf="organizationInfo != null" uk-grid>
<div *ngIf="organizationInfo != null" uk-grid class="uk-grid-large">
<div class="uk-width-3-4@l uk-width-3-4@xl uk-width-3-4@m uk-width-1-1@s">
<showTitle [title]="organizationInfo.title"></showTitle>
<div class="uk-text-large " *ngIf="organizationInfo.title.name && organizationInfo.title.name != organizationInfo.name ">{{organizationInfo.name}}</div>
@ -144,6 +144,7 @@
</div>
<div class="uk-width-1-4@l uk-width-1-4@xl uk-width-1-4@m uk-width-1-1@s">
<div class="uk-card uk-card-default uk-padding-small">
<div>
Share - Bookmark<addThis ></addThis>
</div>
@ -181,9 +182,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<modal-loading></modal-loading>

View File

@ -7,14 +7,15 @@
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger uk-margin-large-top" role="alert">{{errorMessage}}</div>
<div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img src="./assets/loading.gif" class="uk-align-center" alt="Loading"></div>
<div *ngIf="projectInfo != null" uk-grid>
<div *ngIf="projectInfo != null" uk-grid class="uk-grid-large">
<div class="uk-width-3-4@l uk-width-3-4@xl uk-width-3-4@m uk-width-1-1@s">
<!--h3 *ngIf="projectInfo.acronym != undefined && projectInfo.acronym != ''">{{projectInfo.acronym}}</h3>
<h3 *ngIf="projectInfo.acronym == undefined || projectInfo.acronym == ''">{{projectInfo.title}}</h3-->
<h2 class="projectIcon">
<!--span class="entityTitleIcon projectTitleIcon"></span-->
<span *ngIf="projectInfo.specialClause39==true" class="sc39">{{projectName}}</span>
<span *ngIf="projectInfo.specialClause39!=true">{{projectName}}</span>
<!-- <span *ngIf="projectInfo.specialClause39==true" class="sc39">{{projectName}}</span>
<span *ngIf="projectInfo.specialClause39!=true">{{projectName}}</span> -->
<span>{{projectName}}</span>
<span *ngIf=" projectInfo.title == projectName ">({{projectInfo.contractNum}})</span>
</h2>
<div class="uk-text-large " *ngIf="projectInfo.title && projectInfo.title != projectName ">{{projectInfo.title}} ({{projectInfo.contractNum}})</div>
@ -55,7 +56,7 @@
</li>
</ul>
<div class="uk-clearfix"><div class="uk-button-group uk-float-right uk-margin-top">
<!-- <div class="uk-clearfix"><div class="uk-button-group uk-float-right uk-margin-top">
<button class="uk-button uk-button-small uk-button-action">
<span class="uk-icon" >
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
@ -75,7 +76,7 @@
</ul>
</div>
</div>
</div></div>
</div></div> -->
<ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
<li (click)="activeTab='Publications'" [class]="activeTab == 'Publications'?'uk-active':''">
@ -284,6 +285,7 @@
</div>
<div class="uk-width-1-4@l uk-width-1-4@xl uk-width-1-4@m uk-width-1-1@s">
<div class="uk-card uk-card-default uk-padding-small">
<div>
Share - Bookmark<addThis ></addThis>
</div>
@ -368,12 +370,27 @@
</ul>
</li>
</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>
</div>
</div>
</div>
</div>
</div>
<modal-loading></modal-loading>
<modal-alert #AlertModalCsvError></modal-alert>

View File

@ -12,6 +12,7 @@
<div class="uk-width-3-4@l uk-width-3-4@xl uk-width-3-4@m uk-width-1-1@s">
<showTitle [title]="softwareInfo.title"></showTitle>
<span *ngIf="softwareInfo.types.length > 0"class="uk-label custom-label label-software " title="Type">{{softwareInfo.types.join(", ")}}</span>
<span *ngIf="softwareInfo.languages.length > 0" class="uk-label custom-label label-language " title="Language">{{softwareInfo.languages.join(", ")}}</span>
<span *ngIf="softwareInfo.title && softwareInfo.title.accessMode" [class]="'uk-label custom-label label-'+ softwareInfo.title.accessMode " >{{softwareInfo.title.accessMode}}</span>
<span *ngIf="softwareInfo.underCurationMessage" class="uk-label custom-label label-underCuration " >
<span uk-tooltip="pos:right; delay:10"
@ -233,7 +234,7 @@
</div>
</li>
</ul>
</li>
<li>

View File

@ -1,5 +1,5 @@
<div id="tm-main" class=" uk-section uk-margin-small-top tm-middle" >
<div uk-grid uk-grid>
<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="">

View File

@ -18,10 +18,18 @@
</p>
</a>
</h4>
<!-- <span *ngIf="publicationInfo.types.length > 0"class="uk-label custom-label label-blue label-publication" title="Type">{{publicationInfo.types.join(", ")}}</span>
<span *ngIf="publicationInfo.languages.length > 0" class="uk-label custom-label label-language " title="Language">{{publicationInfo.languages.join(", ")}}</span> -->
<span *ngIf="result.types && result.types.length > 0" [class]="'uk-label custom-label label-blue label-'+result.entityType" title="Type">{{result.types.join(", ")}}</span>
<span *ngIf="result.languages && result.languages.length > 0" class="uk-label custom-label label-language " title="Language">{{result.languages.join(", ")}}</span>
<span *ngIf="result.title && result.title.accessMode" [class]="'uk-label custom-label label-'+ result.title.accessMode " title="Access Mode">{{result.title.accessMode}}</span>
<!-- <span *ngIf="projectInfo.openAccessMandate != undefined && projectInfo.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span> -->
<span *ngIf="result['funders'] && result['funders'].length > 0" class="uk-label custom-label label-funder " title="Funder"><span *ngFor="let funder of result['funders'] let i=index">
<span *ngIf="funder.funderShortname">
{{funder.funderShortname}}</span><span
*ngIf="i < result['funders'].length-1">, </span>
</span></span>
<span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
<span *ngIf="result.title && result.title.sc39" class="uk-label custom-label label-sc39 " title="Special Clause 39">Special Clause 39</span>
<div>
<span *ngIf="result['authors'] != undefined">
@ -75,7 +83,7 @@
<mark *ngIf="result.embargoEndDate != undefined && result.embargoEndDate != ''">Embargo End Date: {{result.embargoEndDate}}</mark>
<div *ngIf="result['funders'] != undefined">
<!-- <div *ngIf="result['funders'] != undefined">
<span> Funder: </span>
<span *ngFor="let funder of result['funders'] let i=index">
@ -85,7 +93,8 @@
*ngIf="i < result['funders'].length-1">,</span>
</span>
<span *ngIf="result.startYear && result.endYear"> (start {{result.startYear}} - end {{result.endYear}})</span>
</div>
</div> -->
<div *ngIf="result.startYear && result.endYear"> Start year: {{result.startYear}} - End year: {{result.endYear}})</div>
<div *ngIf="showOrganizations && result['organizations'] != undefined && result['organizations'].length > 0">
<span> Organization: </span>
<span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">

View File

@ -7,10 +7,13 @@ import {RefineResultsUtils} from './servicesUtils/refineResults.class';
import 'rxjs/add/observable/of';
import 'rxjs/add/operator/do';
import 'rxjs/add/operator/share';
import { } from '../shared/cache.service';
import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
@Injectable()
export class SearchDatasetsService {
private sizeOfDescription: number = 270;
public parsingFunctions: ParsingFunctions = new ParsingFunctions();
constructor(private http: Http ) {}
@ -129,7 +132,33 @@ export class SearchDatasetsService {
let resData = Array.isArray(data) ? data[i]['result']['metadata']['oaf:entity']['oaf:result'] : data['result']['metadata']['oaf:entity']['oaf:result'];
var result: SearchResult = new SearchResult();
result.entityType = "dataset";
if(resData['language'] && resData['language'] != null) {
result.languages = new Array<string>();
result.types = new Array<string>();
let types = new Set<string>();
let counter = 0;
let instance;
let length = Array.isArray(resData['children']['instance']) ? resData['children']['instance'].length : 1;
for(let i=0; i<length; i++) {
instance = Array.isArray(resData['children']['instance']) ? resData['children']['instance'][i] : resData['children']['instance'];
this.parsingFunctions.parseTypes(result.types, types, instance);
}
if(!Array.isArray(resData['language'])) {
if(resData['language'].classname != "Undetermined" && resData['language'].classname) {
result.languages.push(resData['language'].classname);
}
} else {
for(let i=0; i<resData['language'].length; i++) {
if(resData['language'][i].classname != "Undetermined" && resData['language'][i].classname) {
result.languages.push(resData['language'][i].classname);
}
}
}
}
result['title'] = {"name": '', "accessMode": '', "sc39": ''};
if(Array.isArray(resData['title'])) {

View File

@ -122,7 +122,7 @@ export class SearchProjectsService {
let resData = Array.isArray(data) ? data[i]['result']['metadata']['oaf:entity']['oaf:project'] : data['result']['metadata']['oaf:entity']['oaf:project'];
var result: SearchResult = new SearchResult();
result.openAccessMandate = (resData['oamandatepublications'])?true:false;
result['title'] = {"name": '', "accessMode": '', "sc39": ''};
if(resData['acronym'] != undefined && resData['acronym'] != "") {
result['title'].name = resData['acronym'] + " - ";

View File

@ -10,9 +10,13 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
import {SearchResult} from '../utils/entities/searchResult';
import {RefineResultsUtils} from './servicesUtils/refineResults.class';
import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
@Injectable()
export class SearchPublicationsService {
private sizeOfDescription: number = 270;
public parsingFunctions: ParsingFunctions = new ParsingFunctions();
constructor(private http: Http ) {}
@ -159,7 +163,33 @@ export class SearchPublicationsService {
let resData = Array.isArray(data) ? data[i]['result']['metadata']['oaf:entity']['oaf:result'] : data['result']['metadata']['oaf:entity']['oaf:result'];
var result: SearchResult = new SearchResult();
result.entityType = "publication";
if(resData['language'] && resData['language'] != null) {
result.languages = new Array<string>();
result.types = new Array<string>();
let types = new Set<string>();
let counter = 0;
let instance;
let length = Array.isArray(resData['children']['instance']) ? resData['children']['instance'].length : 1;
for(let i=0; i<length; i++) {
instance = Array.isArray(resData['children']['instance']) ? resData['children']['instance'][i] : resData['children']['instance'];
this.parsingFunctions.parseTypes(result.types, types, instance);
}
if(!Array.isArray(resData['language'])) {
if(resData['language'].classname != "Undetermined" && resData['language'].classname) {
result.languages.push(resData['language'].classname);
}
} else {
for(let i=0; i<resData['language'].length; i++) {
if(resData['language'][i].classname != "Undetermined" && resData['language'][i].classname) {
result.languages.push(resData['language'][i].classname);
}
}
}
}
result['title'] = {"name": '', "accessMode": '', "sc39": ''};
if(Array.isArray(resData['title'])) {

View File

@ -7,10 +7,12 @@ import {RefineResultsUtils} from './servicesUtils/refineResults.class';
import 'rxjs/add/observable/of';
import 'rxjs/add/operator/do';
import 'rxjs/add/operator/share';
import { } from '../shared/cache.service';
import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
@Injectable()
export class SearchSoftwareService {
private sizeOfDescription: number = 270;
public parsingFunctions: ParsingFunctions = new ParsingFunctions();
constructor(private http: Http ) {}
@ -130,7 +132,33 @@ export class SearchSoftwareService {
let resData = Array.isArray(data) ? data[i]['result']['metadata']['oaf:entity']['oaf:result'] : data['result']['metadata']['oaf:entity']['oaf:result'];
var result: SearchResult = new SearchResult();
result.entityType = "software";
if(resData['language'] && resData['language'] != null) {
result.languages = new Array<string>();
result.types = new Array<string>();
let types = new Set<string>();
let counter = 0;
let instance;
let length = Array.isArray(resData['children']['instance']) ? resData['children']['instance'].length : 1;
for(let i=0; i<length; i++) {
instance = Array.isArray(resData['children']['instance']) ? resData['children']['instance'][i] : resData['children']['instance'];
this.parsingFunctions.parseTypes(result.types, types, instance);
}
if(!Array.isArray(resData['language'])) {
if(resData['language'].classname != "Undetermined" && resData['language'].classname) {
result.languages.push(resData['language'].classname);
}
} else {
for(let i=0; i<resData['language'].length; i++) {
if(resData['language'][i].classname != "Undetermined" && resData['language'][i].classname) {
result.languages.push(resData['language'][i].classname);
}
}
}
}
result['title'] = {"name": '', "accessMode": '', "sc39": ''};
if(Array.isArray(resData['title'])) {

View File

@ -25,6 +25,10 @@ export class SearchResult {
OAIPMHURL: string;
compatibility: string;
countries: string[];
entityType: string;
languages: string[];
types: string[];
openAccessMandate: boolean;
constructor(){}
}

View File

@ -116,6 +116,8 @@ export class OpenaireProperties {
private static enableHelper:boolean = false;
private static cache ="http://scoobydoo.di.uoa.gr:3000/get?url=";
private static cache_pm ="https://demo.openaire.eu/cache/get?url=";
private static useCache:boolean = true;
public static getBaseLink():string{
@ -392,7 +394,11 @@ export class OpenaireProperties {
return this.enableHelper;
}
public static getCacheUrl():string{
return this.cache;
if(this.productionMode){
return this.cache;
}else{
return this.cache_pm;
}
}
public static isCacheEnabled():boolean{
return this.useCache;

File diff suppressed because it is too large Load Diff

View File

@ -350,7 +350,7 @@ color: #414141}
border-bottom: none !important;
}
.mainPageSearchForm{
background-image: url("./home2.jpeg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
background-image: url("./explore_1.jpg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
}
.searchForm, .generalSearchForm{
@ -539,10 +539,41 @@ h2, .uk-h2{
}
.basket-badge {
position: relative;
right: 11px;
top: -11px;
right: 16px;
top: -16px;
text-align: center;
border-radius: 90%;
border-radius: 90%;
}
.explore-numbers h2, .explore-numbers div{
color: #f25f30 !important;
font-weight: 500 !important;
}
.explore-numbers h2{
font-size: 36px !important;
}
.developlink{
text-transform: none !important;
color: #fff !important;
background: #d13f96;
font-weight: 600;
}
.providelink{
text-transform: none !important;
color: #fff !important;
background: #28beff !important;
font-weight: 600;
}
.connectlink{
background-color: #ffc800 !important;
font-weight: 600;
color: #fff !important;
}
.monitorlink{
background-color: #8bcc00 !important;
font-weight: 600;
color: #fff !important;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 KiB