change links from top menu - footer | add more information in linking / direct linking |change badges in search/find page | add compatibility check for contentProvidersDatatable pipes
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48504 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki
parent
6a5e1a9fae
commit
1cca965ba6
|
|
@ -16,6 +16,30 @@ import { Meta} from '../../../angular2-meta';
|
|||
</div>
|
||||
<div *ngIf="validInput != null && !validInput" class="uk-alert uk-alert-warning" role="alert">No valid arguments provided in order to start linking openAIRE entities. </div>
|
||||
<div *ngIf="validInput != null && validInput">
|
||||
<div class="uk-clearfix">
|
||||
<a class="uk-float-right" uk-toggle="target: #linkingInfo; animation: uk-animation-fade"><span class="uk-icon">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> More Information </a>
|
||||
</div>
|
||||
<div id="linkingInfo" class="uk-card uk-card-default uk-card-body uk-margin-small" hidden>
|
||||
<a uk-toggle="target: #linkingInfo; animation: uk-animation-fade" class="uk-float-right"><span class="uk-icon">
|
||||
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="1"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
|
||||
</span></a>
|
||||
<div class="uk-text-bold"><span class="uk-icon">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> Linking Functionality:</div>
|
||||
<p>Through linking functioanilty you are able to create links from {{type}} to {{(linkTo =='context')?"communities/ concepts":((linkTo =='project')?"projects":"research results")}}. You have to select at least one {{(linkTo =='context')?"community/ concept":((linkTo =='project')?"project":"research result")}} in order to be able to proceed.</p>
|
||||
|
||||
<p *ngIf="linkTo=='project'">Projects: Search and add projects using keyword search. Limit the search space by specifying project Funder. </p>
|
||||
<p *ngIf="linkTo=='context'">Communities: Search and add communities/ concepts by selecting community, category and using keyword search for . Or browse through the categories and add communities. </p>
|
||||
<p *ngIf="linkTo=='result'">Research Results: You can search for reasearch results (publication and/ or datasets) to link, in openaire, crossref, and/ or Datacite. Use search mode, to search and add results through keyword search. Use upload mode, to upload a list of DOIs of results. </p>
|
||||
<p *ngIf="show=='claim' && linkTo=='result'">Review Metadata: For selected research results that came from 3rd party repositories (Datacite, Crossreff), you need to set access mode, and type before they are included in openaire information space.
|
||||
Please have in mind that if you ignore this step they will have the default values.
|
||||
</p>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="uk-text-large">
|
||||
Link {{(type=="project")?'Project':' Research result'}}:
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';
|
|||
<div class="uk-clearfix">
|
||||
<a class="uk-float-right" uk-toggle="target: #uploadInfo; animation: uk-animation-fade"><span class="uk-icon">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> What is results bulk mode? </a>
|
||||
</span> What is upload mode? </a>
|
||||
</div>
|
||||
<div id="uploadInfo" class="uk-card uk-card-default uk-card-body uk-margin-small" hidden>
|
||||
<a uk-toggle="target: #uploadInfo; animation: uk-animation-fade" class="uk-float-right"><span class="uk-icon">
|
||||
|
|
@ -28,7 +28,7 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> Upload information:</div>
|
||||
Upload a csv file containing a list of DOIs. For each DOI found in the file, metadata will be fetched from CrossRef or Datacite.
|
||||
Available results will be linked with the selected Projects and Contexts.
|
||||
Available results will be added to your selected resarch results list in order to be linked with the selected Projects and Contexts.
|
||||
|
||||
<div class="uk-article-meta">
|
||||
CSV format:
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ declare var UIkit:any;
|
|||
</div>
|
||||
<div class="uk-clearfix">
|
||||
<a class="uk-float-right" uk-toggle="target: #linkingInfo; animation: uk-animation-fade"><span class="uk-icon">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> Do you need help? </a>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> More Information </a>
|
||||
</div>
|
||||
<div id="linkingInfo" class="uk-card uk-card-default uk-card-body uk-margin-small" hidden>
|
||||
<a uk-toggle="target: #linkingInfo; animation: uk-animation-fade" class="uk-float-right"><span class="uk-icon">
|
||||
|
|
@ -26,8 +26,17 @@ declare var UIkit:any;
|
|||
</span></a>
|
||||
<div class="uk-text-bold"><span class="uk-icon">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
|
||||
</span> Linking Functioanlity:</div>
|
||||
<p>TODO: Put some useful information here... </p>
|
||||
</span> Linking Functionality:</div>
|
||||
<p>Through linking functioanilty you are able to create links from research results to projects and/ or communities. You have to select at least one research result and one project or community in order to be able to proceed.</p>
|
||||
<p>You can search for reasearch results (publication and/ or datasets) to link, in openaire, crossref, and/ or Datacite. </p>
|
||||
|
||||
<p *ngIf="show=='project'">Projects: Search and add projects using keyword search. Limit the search space by specifying project Funder. </p>
|
||||
<p *ngIf="show=='context'">Communities: Search and add communities/ concepts by selecting community, category and using keyword search for . Or browse through the categories and add communities. </p>
|
||||
<p *ngIf="show=='result'">Research Results: Use search mode, to search and add results through keyword search. Use upload mode, to upload a list of DOIs of results. </p>
|
||||
<p *ngIf="show=='claim'">Review Metadata: For selected research results that came from 3rd party repositories (Datacite, Crossreff), you need to set access mode, and type before they are included in openaire information space.
|
||||
Please have in mind that if you ignore this step they will have the default values.
|
||||
</p>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import {Dates} from '../../../utils/string-utils.class';
|
|||
|
||||
<div *ngIf="showSearch " class="uk-width-1-2 ">
|
||||
<div class="uk-clearfix"><a (click)="bulkMode = !bulkMode;" class=" uk-animation uk-float-right">
|
||||
<span *ngIf="!bulkMode">Switch to Bulk mode <i class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="upload" ratio="1"><polyline fill="none" stroke="#000" points="5 8 9.5 3.5 14 8 "></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="15" x2="9.5" y2="4"></line></svg></i></span>
|
||||
<span *ngIf="!bulkMode">Switch to Upload mode <i class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="upload" ratio="1"><polyline fill="none" stroke="#000" points="5 8 9.5 3.5 14 8 "></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="15" x2="9.5" y2="4"></line></svg></i></span>
|
||||
<span *ngIf="bulkMode">Switch to Search mode <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></span>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ import {RouterHelper} from '../utils/routerHelper.class';
|
|||
</span>
|
||||
No data providers found for institution:
|
||||
<a *ngIf="organization['url']!=''" target="_blank" href="{{organization.url}}">
|
||||
<span>{{organization['name']}}</span>
|
||||
<span>{{organization['name']}} (<i class="custom-external"></i>)</span>
|
||||
</a>
|
||||
<span *ngIf="organization['url']==''">{{organization['name']}}</span>
|
||||
.
|
||||
|
|
|
|||
|
|
@ -43,36 +43,35 @@ import {RouterHelper} from '../../utils/routerHelper.class';
|
|||
<li (click)="searchPublications()" >
|
||||
<a>
|
||||
Publications
|
||||
<span *ngIf = "fetchPublications.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
|
||||
<span *ngIf = "fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification">{{((keyword.length > 0)? fetchPublications.searchUtils.totalResults :'')}}</span>
|
||||
<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 :'')}}</span>
|
||||
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="searchDatasets()">
|
||||
<a>
|
||||
Datasets
|
||||
<span *ngIf = "fetchDatasets.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
|
||||
<span *ngIf = "fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}}</span>
|
||||
<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 :'')}}</span>
|
||||
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="searchProjects()" >
|
||||
<a>
|
||||
Projects
|
||||
<span *ngIf = "fetchProjects.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
|
||||
<span *ngIf = "fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchProjects.searchUtils.totalResults :'')}}</span>
|
||||
<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 :'')}}</span>
|
||||
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="searchDataProviders()" >
|
||||
<a>
|
||||
Data Providers
|
||||
<span *ngIf = "fetchDataproviders.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
|
||||
<span (click)="searchDataProviders()" *ngIf = "fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}}</span>
|
||||
<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 :'')}}</span>
|
||||
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="searchOrganizations()" >
|
||||
<a>
|
||||
Organizations
|
||||
<span *ngIf = "fetchOrganizations.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
|
||||
<span *ngIf = "fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchOrganizations.searchUtils.totalResults :'')}}</span>
|
||||
<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 :'')}}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,22 +40,22 @@ import 'rxjs/Rx';
|
|||
<div>
|
||||
<ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider" uk-margin="">
|
||||
<li class="el-item uk-first-column">
|
||||
<a class="el-link" href="http://dl119.madgik.di.uoa.gr/www.cnn.com">About</a>
|
||||
<a target="_blank" href="https://beta.openaire.eu/project-factsheets">About</a>
|
||||
</li>
|
||||
<li class="el-item">
|
||||
<a class="el-content uk-disabled">Services</a>
|
||||
<a target="_blank" >Services</a>
|
||||
</li>
|
||||
<li class="el-item">
|
||||
<a class="el-content uk-disabled">News</a>
|
||||
<a target="_blank" href="https://beta.openaire.eu/news-events/">News</a>
|
||||
</li>
|
||||
<li class="el-item">
|
||||
<a class="el-content uk-disabled">Events</a>
|
||||
<a target="_blank" href="https://beta.openaire.eu/news-events/">Events</a>
|
||||
</li>
|
||||
<li class="el-item">
|
||||
<a class="el-content uk-disabled">Blog</a>
|
||||
<a target="_blank" href="https://blogs.openaire.eu/">Blog</a>
|
||||
</li>
|
||||
<li class="el-item">
|
||||
<a class="el-content uk-disabled">Contact us</a>
|
||||
<a target="_blank" href="https://beta.openaire.eu/contact-us">Contact us</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -96,12 +96,12 @@ import {Session} from '../login/utils/helper.class';
|
|||
<div class="uk-first-column">
|
||||
<div class="uk-panel inner" id="module-119">
|
||||
<ul class="uk-subnav uk-subnav-line">
|
||||
<li class="uk-active"><a href="http://dl119.madgik.di.uoa.gr/"><img class="uk-responsive-height" src="assets/dl119_files/Home-icon.png" alt="home"></a></li>
|
||||
<li class="custom-discover-li"><a routerLinkActive="uk-link" routerLink="/search/find" >Discover/Share</a></li>
|
||||
<li><a href="#">Join</a></li>
|
||||
<li><a href="#">Connect</a></li>
|
||||
<li><a href="#">Monitor_</a></li>
|
||||
<li><a href="#">Develop</a></li>
|
||||
<li class="uk-active"><a href="https://beta.openaire.eu"><img class="uk-responsive-height" src="assets/dl119_files/Home-icon.png" alt="home"></a></li>
|
||||
<li class="custom-discover-li"><a routerLinkActive="uk-link" routerLink="/search/find" >Discover/ Share</a></li>
|
||||
<li><a >Join</a></li>
|
||||
<li><a >Connect</a></li>
|
||||
<li><a >Monitor</a></li>
|
||||
<li><a >Develop</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ export class ContentProvidersDatatablePipe implements PipeTransform {
|
|||
}
|
||||
}
|
||||
|
||||
if(row.compatibility.toLowerCase().indexOf(query) > -1) {
|
||||
if(row.compatibility && row.compatibility.toLowerCase().indexOf(query) > -1) {
|
||||
returnValue = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ white-space: nowrap;
|
|||
.filterItem span div {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
min-width: 65px;
|
||||
min-width: 81px;
|
||||
}
|
||||
|
||||
.browseFilters{
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@ $(document).ready(function(){
|
|||
|
||||
<!-- End of Google sitelinks search markup-->
|
||||
|
||||
|
||||
<script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
|
||||
|
||||
</head>
|
||||
|
|
@ -99,9 +98,6 @@ $(document).ready(function(){
|
|||
<div class="uk-offcanvas-content uk-height-viewport">
|
||||
<script async src="/main.bundle.js"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
<app>
|
||||
Loading Universal ...
|
||||
</app>
|
||||
|
|
|
|||
Loading…
Reference in New Issue