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

A few changes for uikit classes in main search page and simple search pages 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45020 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2016-12-21 11:29:45 +00:00
parent 291530dcac
commit 7df383d956
36 changed files with 202 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import {Observable} from 'rxjs/Observable';
<h1> Claims Administrator </h1>
</div>
<div>
<div class="text-right"><a routerLink="/linking">Add more Links?</a></div>
<div class="uk-text-right"><a routerLink="/linking">Add more Links?</a></div>
<claims enableDelete="true" myClaims="false" isAdim="true"></claims>
</div>
</div>

22
portal-2/src/app/claimPages/linking/selected/selected.component.ts
View File

@ -12,11 +12,11 @@ import {ClaimResult,ClaimProject, ClaimContext} from '../../../utils/entities/cl
<div *ngIf=" !(inline && hideType == 'context') && contexts" class="concepts" >
<ul class="uk-list">
<li class="list-group-item list-group-item-success">Selected Concepts ({{(contexts.length)}})
<span *ngIf=" !inline" title="Add More Concepts" (click)="showType('context')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline" title="Add More Concepts" (click)="showType('context')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li class="list-group-item" *ngFor="let context of contexts" >
<span >{{context.community }} > {{context.category}} > {{context.concept.label}} </span>
<span (click)="removeContext(context)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span (click)="removeContext(context)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</li>
<li *ngIf="contexts.length == 0 " class="list-group-item">There are no contexts</li>
@ -29,12 +29,12 @@ import {ClaimResult,ClaimProject, ClaimContext} from '../../../utils/entities/cl
<div *ngIf=" !(inline && hideType == 'project') && projects " class="projects" >
<ul class="uk-list">
<li class="list-group-item list-group-item-info">Selected Projects ({{(projects.length)}})
<span *ngIf=" !inline " title="Add More Projects" (click)="showType('project')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline " title="Add More Projects" (click)="showType('project')" aria-hidden="true" style="float:right;cursor: pointer;"> <i class="uk-icon-plus"></i></span>
</li>
<li class="list-group-item" *ngFor="let project of projects">
<span >{{project.funderName}} | {{project.projectName}} {{(project.projectAcronym)?'('+project.projectAcronym+')':''}} <!--[{{project.startDate}} - {{project.endDate}}]--></span>
<span (click)="removeProject(project)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span (click)="removeProject(project)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</li>
<li *ngIf="projects.length == 0 " class="list-group-item">There are no projects</li>
</ul>
@ -47,14 +47,14 @@ import {ClaimResult,ClaimProject, ClaimContext} from '../../../utils/entities/cl
<div *ngIf=" !(inline && (hideType == 'publication' || hideType == 'dataset' )) && (datasets || publications)" class="publications" >
<ul class="uk-list">
<li class="list-group-item panel-footer "> Research Results ({{(datasets.length+publications.length)}})
<span *ngIf=" !inline && linkToResults " title="Add More Research Results" (click)="showType('result')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline && linkToResults " title="Add More Research Results" (click)="showType('result')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li *ngIf="publications && datasets && publications.length == 0 && datasets.length == 0" class="list-group-item">There are no Research Results </li>
<li *ngIf="(publications && publications.length > 0) ||(datasets && datasets.length > 0 ) " class="list-group-item list-group-item-warning ">{{publications. length }} Selected Publications:
<span *ngIf=" !inline && linkToResults " title="Add More Publications" (click)="showType('publication')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline && linkToResults " title="Add More Publications" (click)="showType('publication')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li *ngFor="let pub of publications" class="list-group-item">
<span *ngIf="showAccessRights == 'true'" (click)="removePublication(pub)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="showAccessRights == 'true'" (click)="removePublication(pub)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
<span >
<a *ngIf="pub.url" target="_blank" href="{{pub.url}}" >{{pub.title}}</a>
<span *ngIf="!pub.url" >{{pub.title}}</span><span *ngIf="pub.date" >({{pub.date.substring(0,4)}})</span>
@ -73,13 +73,13 @@ import {ClaimResult,ClaimProject, ClaimContext} from '../../../utils/entities/cl
{{pub.accessRights}}
</button>
</span>
<span *ngIf="showAccessRights != 'true'" (click)="removePublication(pub)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="showAccessRights != 'true'" (click)="removePublication(pub)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</li>
<li *ngIf="publications.length > 0 || datasets.length > 0" class="list-group-item list-group-item-warning "> {{datasets.length}} Selected Research Data:
<span *ngIf=" !inline && linkToResults " title="Add More Research Data" (click)="showType('dataset')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline && linkToResults " title="Add More Research Data" (click)="showType('dataset')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li *ngFor="let dataset of datasets" class="list-group-item">
<span *ngIf="showAccessRights == 'true'" (click)="removeDataset(dataset)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="showAccessRights == 'true'" (click)="removeDataset(dataset)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
<span >
<a *ngIf="dataset.url" target="_blank" href="{{dataset.url}}" >{{dataset.title}}</a>
<span *ngIf="!dataset.url" >{{dataset.title}}</span>
@ -99,7 +99,7 @@ import {ClaimResult,ClaimProject, ClaimContext} from '../../../utils/entities/cl
{{dataset.accessRights}}
</button>
</span>
<span *ngIf="showAccessRights != 'true'" (click)="removeDataset(dataset)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="showAccessRights != 'true'" (click)="removeDataset(dataset)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</li>
</ul>

4
portal-2/src/app/claimPages/linking/selected/selectedContexts.component.ts
View File

@ -9,11 +9,11 @@ import {ClaimContext} from '../../../utils/entities/claimEntities.class';
<div>
<ul class="uk-list">
<li class="list-group-item list-group-item-success">Selected Concepts ({{(contexts.length)}})
<span *ngIf=" !inline" title="Add More Concepts" (click)="showType('context')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline" title="Add More Concepts" (click)="showType('context')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li class="list-group-item" *ngFor="let context of contexts" >
<span >{{context.community }} > {{context.category}} > {{context.concept.label}} </span>
<span (click)="removeContext(context)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span (click)="removeContext(context)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</li>
<li *ngIf="contexts.length == 0 " class="list-group-item">There are no contexts</li>

4
portal-2/src/app/claimPages/linking/selected/selectedDatasets.component.ts
View File

@ -9,11 +9,11 @@ import {ClaimResult} from '../../../utils/entities/claimEntities.class';
<div class="row">
<div [ngClass]="showAccessRights?'col-md-8':'col-md-12'">
<span *ngIf="showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
<a *ngIf="dataset.url" target="_blank" href="{{dataset.url}}" >{{dataset.title}}</a>
<span *ngIf="!dataset.url" >{{dataset.title}}</span>
<span *ngIf="dataset.date" >({{dataset.date.substring(0,4)}})</span>
<span *ngIf="!showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="!showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</div>
<div class = "col-md-4">
<span *ngIf="showAccessRights && dataset.source != 'openaire'" class="dropdown">

4
portal-2/src/app/claimPages/linking/selected/selectedProjects.component.ts
View File

@ -9,12 +9,12 @@ import {ClaimProject} from '../../../utils/entities/claimEntities.class';
<div *ngIf=" !(inline && hideType == 'project') && projects.length > 0 " class="projects" >
<ul class="uk-list">
<li class="list-group-item list-group-item-info">Selected Projects ({{(projects.length)}})
<span *ngIf=" !inline " title="Add More Projects" (click)="showType('project')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline " title="Add More Projects" (click)="showType('project')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li class="list-group-item" *ngFor="let project of projects">
<span >{{project.funderName}} | {{project.projectName}} {{(project.projectAcronym)?'('+project.projectAcronym+')':''}} <!--[{{project.startDate}} - {{project.endDate}}]--></span>
<span (click)="removeProject(project)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span (click)="removeProject(project)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</li>
<li *ngIf="projects.length == 0 " class="list-group-item">There are no projects</li>
</ul>

4
portal-2/src/app/claimPages/linking/selected/selectedPublications.component.ts
View File

@ -9,10 +9,10 @@ import {ClaimResult} from '../../../utils/entities/claimEntities.class';
<li *ngFor="let pub of publications" class="list-group-item">
<div class="row">
<div [ngClass]="showAccessRights?'col-md-8':'col-md-12'" >
<span *ngIf="showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="btn"><i class="uk-icon-remove"></i></span>
<a *ngIf="pub.url" target="_blank" href="{{pub.url}}" >{{pub.title}}</a>
<span *ngIf="!pub.url" >{{pub.title}}</span><span *ngIf="pub.date" >({{pub.date.substring(0,4)}})</span>
<span *ngIf="!showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="btn glyphicon glyphicon-remove"></span>
<span *ngIf="!showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="btn "><i class="uk-icon-remove"></i></span>
</div>
<div *ngIf="showAccessRights && pub.source != 'openaire' " class = "col-md-4">
<span *ngIf="showAccessRights && pub.source != 'openaire' " class="dropdown">

6
portal-2/src/app/claimPages/linking/selected/selectedResults.component.ts
View File

@ -11,11 +11,11 @@ import {ClaimResult} from '../../../utils/entities/claimEntities.class';
<div *ngIf=" !(inline && (hideType == 'publication' || hideType == 'dataset' )) && (datasets.length > 0 || publications.length > 0)" class="publications" >
<ul class="uk-list">
<li class="list-group-item panel-footer "> Research Results ({{(datasets.length+publications.length)}})
<span *ngIf=" !inline && linkToResults " title="Add More Research Results" (click)="showType('result')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline && linkToResults " title="Add More Research Results" (click)="showType('result')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
<li *ngIf="publications && datasets && publications.length == 0 && datasets.length == 0" class="list-group-item">There are no Research Results </li>
<li *ngIf="(publications && publications.length > 0) ||(datasets && datasets.length > 0 ) " class="list-group-item list-group-item-warning ">{{publications. length }} Selected Publications:
<span *ngIf=" !inline && linkToResults " title="Add More Publications" (click)="showType('result')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline && linkToResults " title="Add More Publications" (click)="showType('result')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>
@ -24,7 +24,7 @@ import {ClaimResult} from '../../../utils/entities/claimEntities.class';
[linkToResults]="(bulkMode)?false:true" >
</claim-selected-publications>
<li *ngIf="publications.length > 0 || datasets.length > 0" class="list-group-item list-group-item-warning "> {{datasets.length}} Selected Research Data:
<span *ngIf=" !inline && linkToResults " title="Add More Research Data" (click)="showType('result')" aria-hidden="true" class="glyphicon glyphicon-plus " style="float:right;cursor: pointer;"></span>
<span *ngIf=" !inline && linkToResults " title="Add More Research Data" (click)="showType('result')" aria-hidden="true" style="float:right;cursor: pointer;"><i class="uk-icon-plus"></i></span>
</li>

2
portal-2/src/app/claimPages/myClaims/myClaims.component.ts
View File

@ -11,7 +11,7 @@ import {Observable} from 'rxjs/Observable';
<h1> My Linked research resutls</h1>
</div>
<div>
<div class="text-right"><a routerLink="/linking">Add more Links?</a></div>
<div class="uk-text-right"><a routerLink="/linking">Add more Links?</a></div>
<claims enableDelete="true" myClaims="true" isAdmin="false" [fetchId]="user" ></claims>
</div>
</div>

2
portal-2/src/app/deposit/depositResult.component.ts
View File

@ -36,7 +36,7 @@ import {OrganizationService} from '../services/organization.service';
<div *ngIf="searchDataprovidersComponent.searchUtils.totalResults > 0">
<p>Please use the information/contacts shown below to deposit your {{requestFor}}.</p>
<!--showDataProviders [dataProviders]=dataProviders></showDataProviders-->
<div class = "text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDataprovidersComponent.results" [(status)]= "searchDataprovidersComponent.searchUtils.status"></search-result>
</div>

69
portal-2/src/app/home/home.component.ts
View File

@ -7,67 +7,18 @@ import {Location} from '@angular/common';
selector: 'home',
template:`
<div class="container">
<div class="row">
<form>
<div class="col-lg-6">
<div class="input-group">
<input #term type="text" class="form-control col-xs-5" placeholder="Search for..." name="keyword" >
<span class="input-group-btn">
<button class="uk-button" type="submit" (click)="searchTerm(term.value)" >GO</button>
</span>
</div>
</div>
</form>
<div class="uk-margin">
<div class="page-header">
<h1>Openaire Search</h1>
</div>
<div>
<form class="uk-form">
<input #term type="text" class="uk-form-medium uk-width-1-2" placeholder="Search for..." name="keyword" >
<button class="uk-button" type="submit" (click)="searchTerm(term.value)" >Search</button>
</form>
</div>
</div>
<form class="uk-form">
<input type="text" data-uk-datepicker="{format:'DD.MM.YYYY'}">
</form>
<div class="uk-button-dropdown" data-uk-dropdown="{delay: 1000}">
<button class="uk-button">Hover me <i class="uk-icon-caret-down"></i></button>
<div class="uk-dropdown">
<ul class="uk-nav uk-nav-dropdown">
<li><a href="#">Item</a></li>
<li><a href="#">Another item</a></li>
<li class="uk-nav-header">Header</li>
<li><a href="#">Item</a></li>
<li><a href="#">Another item</a></li>
<li class="uk-nav-divider"></li>
<li><a href="#">Separated item</a></li>
</ul>
</div>
</div>
<div class="uk-button-dropdown" data-uk-dropdown="" aria-haspopup="true" aria-expanded="false">
<button class="uk-button">Hover</button>
<div class="uk-dropdown uk-dropdown-small uk-dropdown-autoflip uk-dropdown-top" aria-hidden="true" style="top: -226px; left: 0px;" tabindex="">
<ul class="uk-nav uk-nav-dropdown">
<li><a href="#">Item</a></li>
<li><a href="#">Another item</a></li>
<li class="uk-nav-header">Header</li>
<li><a href="#">Item</a></li>
<li><a href="#">Another item</a></li>
<li class="uk-nav-divider"></li>
<li><a href="#">Separated item</a></li>
</ul>
</div>
</div>
<div class="uk-button-dropdown" data-uk-dropdown>
<button class="uk-button">Dropdown 0 <i class="uk-icon-caret-down"></i></button>
<div class="uk-dropdown uk-dropdown-small">
<ul class="uk-nav uk-nav-dropdown">
<li><a href="#">Item</a></li>
<li><a href="#">Another item</a></li>
<li class="uk-nav-header">Header</li>
<li><a href="#">Item</a></li>
<li><a href="#">Another item</a></li>
<li class="uk-nav-divider"></li>
<li><a href="#">Separated item</a></li>
</ul>
</div>
</div>
`
})

2
portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts
View File

@ -18,7 +18,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
</div>
`

2
portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts
View File

@ -17,7 +17,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDataprovidersComponent.results" [(status)]= "searchDataprovidersComponent.status"></search-result>
</div>
`

2
portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts
View File

@ -18,7 +18,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchProjectsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchProjects" >View all {{searchProjectsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchProjectsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchProjects" >View all {{searchProjectsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchProjectsComponent.results" [(status)]= "searchProjectsComponent.status"></search-result>
</div>
`

2
portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts
View File

@ -18,7 +18,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
</div>
`

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

@ -34,7 +34,7 @@
<div class="text-justify" [innerHTML]="datasetInfo.description"></div>
</blockquote>
<div class="text-right">
<div class="uk-text-right">
<button (click)=" toggleClaimResult()" class = "btn btn-primary btn-xs" >Add Research Results</button>
</div>
<inline-claim-result inlineType ="dataset" [inlineEntity]="result" (datasetAdded)="resultsAdded($event,false)" (publicationAdded)="resultsAdded($event,true)" ></inline-claim-result>

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

@ -123,7 +123,7 @@
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDataprovidersComponent.results" [(status)]= "searchDataprovidersComponent.status"></search-result>
</div>
</div>

4
portal-2/src/app/landingPages/person/person.component.html
View File

@ -52,7 +52,7 @@
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
</div>
</div>
@ -68,7 +68,7 @@
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
</div>
</div>

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

@ -54,7 +54,7 @@
</a>
</dd>
</dl>
<div class="text-right">
<div class="uk-text-right">
<button (click)=" toggleClaimResult()" class = "btn btn-primary btn-xs" >Add Research Results</button>
</div>
<inline-claim-result inlineType ="'project'" [inlineEntity]=project (datasetAdded)="resultsAdded($event,false)" (publicationAdded)="resultsAdded($event,true)" ></inline-claim-result>
@ -101,7 +101,7 @@
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
</div>
</div>
@ -117,7 +117,7 @@
<a href="mailto:">Let us know how we are doing!</a>
</p>
<div class = "text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
</div>
</div>

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

@ -52,7 +52,7 @@
<blockquote *ngIf="publicationInfo.description != ''">
<div class="text-justify" [innerHTML]="publicationInfo.description"></div>
</blockquote>
<div class="text-right">
<div class="uk-text-right">
<button (click)=" toggleClaimResult()" class = "btn btn-primary btn-xs" >Add Research Results</button>
</div>
<inline-claim-result inlineType ="publication" [inlineEntity]="result" (datasetAdded)="resultsAdded($event,false)" (publicationAdded)="resultsAdded($event,true)" ></inline-claim-result>
@ -275,7 +275,7 @@
<li class="list-group-item" *ngIf="publicationInfo.collectedFrom != undefined">
<dl class="functionsSection">
<dt>Collected from</dt>
<dd *ngIf="showAllCollectedFrom" class="text-right">
<dd *ngIf="showAllCollectedFrom" class="uk-text-right">
<a class="text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
View less
</a>
@ -285,12 +285,12 @@
{{item['name']}}
</a>
</dd>
<dd *ngIf="showAllCollectedFrom" class="text-right">
<dd *ngIf="showAllCollectedFrom" class="uk-text-right">
<a class="text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
View less
</a>
</dd>
<dd *ngIf="!showAllCollectedFrom && publicationInfo.collectedFrom.length > 5" class="text-right">
<dd *ngIf="!showAllCollectedFrom && publicationInfo.collectedFrom.length > 5" class="uk-text-right">
<a class="text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
View more
</a>
@ -300,7 +300,7 @@
<li class="list-group-item" *ngIf="publicationInfo.downloadFrom != undefined && publicationInfo.downloadFrom.size > 0">
<dl class="functionsSection">
<dt class="title">Download from</dt>
<dd *ngIf="showAllDownloadFrom" class="text-right">
<dd *ngIf="showAllDownloadFrom" class="uk-text-right">
<a class="text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
View less
</a>
@ -320,12 +320,12 @@
</a>
</div>
</dd>
<dd *ngIf="showAllDownloadFrom" class="text-right">
<dd *ngIf="showAllDownloadFrom" class="uk-text-right">
<a class="text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
View less
</a>
</dd>
<dd *ngIf="!showAllDownloadFrom && publicationInfo.downloadFrom.length > 5" class="text-right">
<dd *ngIf="!showAllDownloadFrom && publicationInfo.downloadFrom.length > 5" class="uk-text-right">
<a class="text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
View more
</a>
@ -335,7 +335,7 @@
<li class="list-group-item" *ngIf="publicationInfo.publishedIn != undefined && publicationInfo.publishedIn.size > 0">
<dl class="functionsSection">
<dt class="title">Published in</dt>
<dd *ngIf="showAllPublishedIn" class="text-right">
<dd *ngIf="showAllPublishedIn" class="uk-text-right">
<a class="text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
View less
</a>
@ -355,12 +355,12 @@
</a>
</div>
</dd>
<dd *ngIf="showAllPublishedIn" class="text-right">
<dd *ngIf="showAllPublishedIn" class="uk-text-right">
<a class="text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
View less
</a>
</dd>
<dd *ngIf="!showAllPublishedIn && publicationInfo.publishedIn.length > 5" class="text-right">
<dd *ngIf="!showAllPublishedIn && publicationInfo.publishedIn.length > 5" class="uk-text-right">
<a class="text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
View more
</a>
@ -371,7 +371,7 @@
<li class="list-group-item">
<dl class="functionsSection" *ngIf="publicationInfo.fundedByProjects != undefined">
<dt class="title">Funded By</dt>
<dd *ngIf="showAllFundedBy" class="text-right">
<dd *ngIf="showAllFundedBy" class="uk-text-right">
<a class="text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
View less
</a>
@ -396,12 +396,12 @@
</a>
</div>
</dd>
<dd *ngIf="showAllFundedBy" class="text-right">
<dd *ngIf="showAllFundedBy" class="uk-text-right">
<a class="text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
View less
</a>
</dd>
<dd *ngIf="!showAllFundedBy && publicationInfo.fundedByProjects.length > 5" class="text-right">
<dd *ngIf="!showAllFundedBy && publicationInfo.fundedByProjects.length > 5" class="uk-text-right">
<a class="text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
View more
</a>

4
portal-2/src/app/landingPages/showSubjects.component.ts
View File

@ -34,11 +34,11 @@ import {Component, Input} from '@angular/core';
<a (click)="showClassifiedSbj = !showClassifiedSbj;">
<div *ngIf="!showClassifiedSbj">
Show additional classifications
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<i class="uk-icon-plus"></i>
</div>
<div *ngIf="showClassifiedSbj">
Hide additional classifications
<span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
<i class="uk-icon-plus"></i>
</div>
</a>

4
portal-2/src/app/landingPages/tabPaging.component.ts
View File

@ -6,11 +6,11 @@ import {Component, Input, Output, EventEmitter} from '@angular/core';
<div class="panel panel-default" *ngIf="!showAll && length > 10">
<div class="panel-heading">
<a (click)="changeShowAll.emit({value: true});">
<div class="text-right">view all {{length}}</div>
<div class="uk-float-right">view all {{length}}</div>
</a>
</div>
</div>
`
`
})
export class TabPagingComponent {

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

@ -23,7 +23,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
selector: 'search-find',
template: `
<div class="container">
<div class="uk-margin">
<div class="page-header">
<h1>{{pageTitle}}</h1>
</div>
@ -31,68 +31,70 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
<search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)"></search-form>
<div *ngIf = "keyword.length > 0" class="uk-grid uk-margin-top">
<div *ngIf = "keyword.length > 0" class="container">
<ul class="nav nav-tabs">
<li (click)="searchPublications()">
<a data-toggle="tab" href="#pubsTab">
<ul class="uk-tab uk-tab-left uk-width-large-1-5 uk-width-small-1-1 " data-uk-tab="{connect:'#searchtabs'}">
<li (click)="searchPublications()" >
<a href="#pubsTab">
Publications ({{searchPublicationsComponent.searchUtils.totalResults}})
</a>
</li>
<li (click)="searchDatasets()">
<a data-toggle="tab" href="#dataTab">
<a href="#dataTab" (click)="searchDatasets()">
Datasets ({{searchDatasetsComponent.searchUtils.totalResults}})
</a>
</li>
<li (click)="searchProjects()">
<a data-toggle="tab" href="#projectsTab">
<li (click)="searchProjects()" >
<a href="#projectsTab">
Projects ({{searchProjectsComponent.searchUtils.totalResults}})
</a>
</li>
<li (click)="searchDataProviders()">
<a data-toggle="tab" href="#dataProviderTab">
<li (click)="searchDataProviders()" >
<a href="#dataProviderTab">
Data Providers ({{searchDataProvidersComponent.searchUtils.totalResults}})
</a>
</li>
<li (click)="searchOrganizations()">
<a data-toggle="tab" href="#organizationsTab" >
<li (click)="searchOrganizations()" >
<a href="#organizationsTab" >
Organizations ({{searchOrganizationsComponent.searchUtils.totalResults}})
</a>
</li>
<li (click)="searchPeople()">
<a data-toggle="tab" href="#peopleTab" >
<li (click)="searchPeople()" >
<a href="#peopleTab" >
People ({{searchPeopleComponent.searchUtils.totalResults}})
</a>
</li>
</ul>
<div class="tab-content">
<div id="pubsTab" class="tab-pane fade in active panel-body">
<div class = "text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<ul id="searchtabs" class="uk-switcher uk-margin-left uk-width-large-3-4 uk-width-small-1-1">
<li id="pubsTab" class="uk-active">
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
</div>
<div id="dataTab" class="tab-pane fade in panel-body" >
<div class = "text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
</li>
<li id="dataTab">
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
</div>
<div id="projectsTab" class="tab-pane fade in panel-body" >
<div class = "text-right" *ngIf = "searchProjectsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchProjects" >View all {{searchProjectsComponent.searchUtils.totalResults}} results</a></div>
</li>
<li id="projectsTab" >
<div class = "uk-text-right" *ngIf = "searchProjectsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchProjects" >View all {{searchProjectsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchProjectsComponent.results" [(status)]= "searchProjectsComponent.status"></search-result>
</div>
<div id="dataProviderTab" class="tab-pane fade in panel-body" >
<div class = "text-right" *ngIf = "searchDataProvidersComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataProvidersComponent.searchUtils.totalResults}} results</a></div>
</li>
<li id="dataProviderTab">
<div class = "uk-text-right" *ngIf = "searchDataProvidersComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataProvidersComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDataProvidersComponent.results" [(status)]= "searchDataProvidersComponent.status"></search-result>
</div>
<div id="organizationsTab" class="tab-pane fade in panel-body" >
<div class = "text-right" *ngIf = "searchOrganizationsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchOrganizations" >View all {{searchOrganizationsComponent.searchUtils.totalResults}} results</a></div>
</li>
<li id="organizationsTab" >
<div class = "uk-text-right" *ngIf = "searchOrganizationsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchOrganizations" >View all {{searchOrganizationsComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchOrganizationsComponent.results" [(status)]= "searchOrganizationsComponent.status"></search-result>
</div>
<div id="peopleTab" class="tab-pane fade in panel-body" >
<div class = "text-right" *ngIf = "searchPeopleComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchPeople" >View all {{searchPeopleComponent.searchUtils.totalResults}} results</a></div>
</li>
<li id="peopleTab">
<div class = "uk-text-right" *ngIf = "searchPeopleComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchPeople" >View all {{searchPeopleComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchPeopleComponent.results" [(status)]= "searchPeopleComponent.status"></search-result>
</div>
</div>
</li>
</ul>
</div>
</div>
`
@ -211,6 +213,7 @@ public subPub;public subData;public subProjects;public subOrg;public subPeople;
}
}
private searchProjects() {
console.info("Here!!!");
this.activeTab = "projects";
if(this.reloadProjects) {
this.reloadProjects = false;

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

@ -72,7 +72,7 @@ import {Dates} from '../../utils/string-utils.class';
</ul>
</div>
<button type="button" class="btn btn-success" (click)="addField()">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<i class="uk-icon-plus"></i>
</button>
</div>
</div>

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

@ -35,7 +35,7 @@ import {SearchUtilsClass} from './searchUtils.class';
[(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)">
</advanced-search-form>
<!--div class="text-right" *ngIf="results && results.length>= size"-->
<!--div class="uk-text-right" *ngIf="results && results.length>= size"-->
<search-paging [(searchUtils)] = "searchUtils" [(results)] = "results" [(baseUrl)] = "baseURLWithParameters" ></search-paging>
<!--/div-->

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

@ -6,13 +6,13 @@ import {AlertModal} from '../../utils/modal/alert';
selector: 'search-download',
template: `
<div class= "searchDownload" *ngIf="totalResults > 0">
<div class="text-right" *ngIf="totalResults <= 100000">
<div class="uk-text-right" *ngIf="totalResults <= 100000">
<a (click)="download()">
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
Download report (CSV)
</a>
</div>
<div class="text-right" *ngIf="totalResults > 100000">
<div class="uk-text-right" *ngIf="totalResults > 100000">
<a (click)="denialOfDownload()">
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
Download report (CSV)

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

@ -6,55 +6,35 @@ import { Filter, Value} from './searchHelperClasses.class';
@Component({
selector: 'search-filter',
template: `
<div class = "searchFilterBox">
<a (click) = "showAll = !showAll">{{_formatTitle(filter.title,filter.values.length)}}
<span *ngIf="!showAll" class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
<span *ngIf="showAll" class="glyphicon glyphicon-triangle-top" aria-hidden="true"></span>
</a>
<div class="values">
<div *ngIf = "filter.countSelectedValues > 0">
<div *ngFor = "let value of filter.values.slice(0,filter.countSelectedValues)" >
<p>
<div *ngIf="filter.countSelectedValues>0 " class = "uk-accordion " data-uk-accordion="{collapse: true, showfirst: true}">
<h3 class="uk-accordion-title">{{_formatTitle(filter.title,filter.values.length)}}
</h3>
<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;" aria-expanded="false">
<div class="uk-accordion-content searchFilterBoxValues ">
<div *ngFor = "let value of filter.values" >
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
</p>
</div>
</div>
<div *ngIf="showAll" >
<div *ngFor = "let value of filter.values.slice(filter.countSelectedValues)" >
<p>
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
</p>
</div>
</div>
</div>
</div>
</div>
<!--div *ngFor = "let value of filter.values.slice(0,5)" >
<p *ngIf = "value.id != 'HEADER'" >
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
</p>
</div>
<!--div *ngFor = "let value of filter.values.slice(0,5)" >
<p *ngIf = "value.id != 'HEADER'" >
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
</p>
</div>
<a *ngIf = "!showAll && filter.values.length > 5" (click)="toggleShowAll()" > More</a>
<span *ngIf = "filter.values.length > 5 && showAll" >
<div *ngFor = "let value of filter.values.slice(5)" >
<p *ngIf = "value.id != 'HEADER'" >
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}}) </span>
</p>
<h5 *ngIf = "value.id == 'HEADER'">{{value.name}}</h5>
<div *ngIf="filter.countSelectedValues == 0 " class = "uk-accordion " data-uk-accordion="{collapse: true, showfirst: false}">
<h3 class="uk-accordion-title">{{_formatTitle(filter.title,filter.values.length)}}
</h3>
<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;" aria-expanded="false">
<div class="uk-accordion-content searchFilterBoxValues ">
<div *ngFor = "let value of filter.values" >
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
</div>
</div>
</div>
</div>
<a (click)="toggleShowAll()" > Less</a>
</span-->
`
})

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

@ -4,14 +4,9 @@ import {Observable} from 'rxjs/Observable';
@Component({
selector: 'search-form',
template: `
<form class = "search-form">
<div class="input-group">
<!--span class="input-group-addon" id="sizing-addon2">Filter</span-->
<input type="text" class="form-control" placeholder="Type keywords..." aria-describedby="sizing-addon2" [(ngModel)]="keyword" name="keyword" >
<span class="input-group-btn">
<form class = " uk-margin uk-text-center">
<input type="text" class="uk-form-medium uk-width-1-2" placeholder="Type keywords..." aria-describedby="sizing-addon2" [(ngModel)]="keyword" name="keyword" >
<button (click)="keywordChanged()" type="submit" class="uk-button">Search</button>
</span>
</div>
</form>
`
})

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

@ -11,45 +11,43 @@ import {DOI} from '../../utils/string-utils.class';
selector: 'search-page',
template: `
<div class="container">
<div class="searchUtils.page-header">
<div>
<div class="page-header">
<h1>{{pageTitle}} {{type}}</h1>
</div>
<div>
<div *ngIf="showRefine" class="">
<div class="row row-offcanvas row-offcanvas-right">
<div class="col-xs-12 col-sm-10 text-center col-md-offset-1 ">
<div *ngIf="showRefine" class="uk-grid">
<div class="uk-width-1-1">
<search-form [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"></search-form>
<div *ngIf="isFiltered()" class = "selected-filters-box">
<div *ngIf="isFiltered()" class = " uk-margin uk-panel uk-panel-box uk-panel-box-default uk-text-center ">
<span *ngIf = "searchUtils.keyword.length > 0">Keywords:
<span>{{searchUtils.keyword}}<a (click) = "clearKeywords() "> <span class="glyphicon glyphicon-remove clickable" aria-hidden="true"></span></a></span>
<span>{{searchUtils.keyword}}<a (click) = "clearKeywords() "> <span class=" clickable" aria-hidden="true"><i class="uk-icon-remove"></i></span></a></span>
</span>
<span *ngFor="let filter of filters " >
<span *ngIf = "filter.countSelectedValues > 0"> {{filter.title}}: </span>
<span *ngFor="let value of filter.values.slice(0,filter.countSelectedValues); let i = index; let end = last; " >
{{value.name}} <a (click) = "removeFilter(value, filter) "> <span class="glyphicon glyphicon-remove clickable" aria-hidden="true"></span></a>
<span *ngIf="!end">,</span>
<span *ngIf = "filter.countSelectedValues > 0"> {{filter.title}}:
<span *ngFor="let value of filter.values.slice(0,filter.countSelectedValues); let i = index; let end = last; " >
{{value.name}} <a (click) = "removeFilter(value, filter) "> <span class=" e clickable" aria-hidden="true"><i class="uk-icon-remove"></i></span></a>
<span *ngIf="!end">,</span>
</span>
</span>
</span>
<a (click)="clearFilters()" class = "btn text-right"> Clear Filters</a>
<a (click)="clearFilters()" class = "btn uk-text-right"> Clear Filters</a>
</div>
</div>
</div>
<div class="row row-offcanvas row-offcanvas-right">
<div class="col-xs-12 col-sm-3">
<p *ngFor="let filter of filters " >
<search-filter [filter]="filter" [showResultCount]=showResultCount (change)="filterChanged($event)"></search-filter>
</p>
<div class="uk-grid uk-width-1-1 uk-margin">
<div class="uk-width-large-1-5 uk-width-medium-1-5 uk-width-small-1-1">
<search-filter *ngFor="let filter of filters " [filter]="filter" [showResultCount]=showResultCount (change)="filterChanged($event)"></search-filter>
</div>
<div class="col-xs-12 col-sm-9 " >
<div class="uk-width-large-4-5 uk-width-medium-4-5 uk-width-small-1-1" >
<search-download [totalResults]="searchUtils.totalResults" (downloadClick)="downloadClicked($event)"></search-download>
<search-paging [(searchUtils)] = "searchUtils" [(results)] = "results" [(baseUrl)] = "baseURLWithParameters"></search-paging>
<search-result [results]="results" [totalResults]="searchUtils.totalResults" [status]=searchUtils.status [page]="searchUtils.page"></search-result>
</div>
</div>
</div>
<div *ngIf="!showRefine" >
<search-form [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"></search-form>

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

@ -4,11 +4,11 @@ import {Observable} from 'rxjs/Observable';
@Component({
selector: 'search-paging',
template: `
<div class= "searchPaging">
<div class="text-right" *ngIf="results && searchUtils.totalResults > searchUtils.size">
<div class= "searchPaging uk-margin-top uk-margin-bottom">
<div class="uk-float-right" *ngIf="results && searchUtils.totalResults > searchUtils.size">
<paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [baseUrl]="baseUrl" [size]="searchUtils.size"> </paging>
</div>
<div class="text-left" *ngIf="results && searchUtils.totalResults > 0">
<div class="" *ngIf="results && searchUtils.totalResults > 0">
{{searchUtils.totalResults}} documents, page {{searchUtils.page}} of {{(totalPages())}}
</div>
</div>

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

@ -5,11 +5,11 @@ import { ErrorCodes} from '../../utils/properties/openaireProperties';
@Component({
selector: 'search-result',
template: `
<ul class="list-unstyled">
<div *ngIf="status == errorCodes.LOADING" class="alert alert-info" role="alert">Loading...</div>
<div *ngIf="status == errorCodes.NONE" class="alert alert-info" role="alert">No Results found</div>
<div *ngIf="status == errorCodes.ERROR" class="alert alert-warning" role="alert">An Error Occured</div>
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="alert alert-danger" role="alert">Service not available</div>
<ul class="uk-list uk-margin">
<div *ngIf="status == errorCodes.LOADING" class="uk-alert uk-alert-primary" role="alert">Loading...</div>
<div *ngIf="status == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
<div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
<li *ngFor="let result of results">
<h4 [class] = result.title.accessMode [title] = result.title.accessMode >

26
portal-2/src/app/test/test.component.ts
View File

@ -17,7 +17,7 @@ import {SearchFields} from '../utils/properties/searchFields';
template: `
<div>Ready:{{ready}}</div>
<div *ngIf="ready">
<i-frame [url]=url width="30%" height="250"></i-frame>
<!--i-frame [url]=url width="30%" height="250"></i-frame-->
</div>
<div style ="width:80%; height:250px;" >
@ -652,12 +652,30 @@ import {SearchFields} from '../utils/properties/searchFields';
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div>
</div> </div>
<div class="uk-accordion" data-uk-accordion="{collapse: false}">
<h3 class="uk-accordion-title">Heading 1</h3>
<div data-wrapper="true" style="height: 0px; position: relative; overflow: hidden;" aria-expanded="false"><div class="uk-accordion-content">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div></div>
<h3 class="uk-accordion-title">Heading 2</h3>
<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;" aria-expanded="false"><div class="uk-accordion-content">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div></div>
<h3 class="uk-accordion-title">Heading 3</h3>
<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;" aria-expanded="false"><div class="uk-accordion-content">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div></div>
</div>
`
})
export class TestComponent {
public lan;
public lan; public countries;
public types;
public projectId:string = "arc_________::000dc863f894b1664a9d5f868b7bde9f";
public url =('http://vaggelas.athenarc.gr/stats/merge.php?com=query&data=[{"table":"project_stats_monthly","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"id","agg":"sum"},"group":"month","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":0,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"untitled","yaxisheaders":["sum of views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"id","values":["'+this.projectId+'"],"to":"-1"}]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true');
@ -676,8 +694,8 @@ ngAfterViewChecked(){
}
ngOnInit() {
// this.lan = this._vocabulariesService.getLanguages();
// this.lan = this._vocabulariesService.getVocabularyFromService("dnet:languages.json");
// this.countries = this._vocabulariesService.getVocabularyFromService("dnet:countries.json");
this.lan = this._vocabulariesService.getVocabularyFromService("dnet:languages.json");
this.countries = this._vocabulariesService.getVocabularyFromService("dnet:countries.json");
var year ="1000";
console.info(year+" "+ Dates.isValidYear(year));
year ="600a.j";

2
portal-2/src/app/utils/entitiesAutoComplete.component.ts
View File

@ -18,7 +18,7 @@ import {EntitiesSearchService} from '../services/entitySearch.service';
<div *ngIf = "showSelected && selectedValue != ''">
<div class="row-fluid show-grid auto-complete-choice" *ngFor="let item of selected" >
<span >{{showItem(item)}} </span>
<span (click)="remove(item)" aria-hidden="true" title="Remove selection" class=" remove glyphicon glyphicon-remove"></span>
<span (click)="remove(item)" aria-hidden="true" title="Remove selection" ><i class="uk-icon-remove"></i></span>
</div>
</div>
<input *ngIf = "showInput" type="text" class="auto-complete-input validate filter-input input-sm form-control " [placeholder]=placeHolderMessage [(ngModel)]=keyword (keyup)=search() >

12
portal-2/src/app/utils/pagingFormatter.component.ts
View File

@ -7,29 +7,27 @@ import {DomSanitizer} from '@angular/platform-browser';
selector: 'paging',
template: `
<div *ngIf=" ( getTotalPages() > 0 ) && (getTotalPages() > 1) && ( 0 < currentPage && currentPage <= getTotalPages() ) " >
<ul class="uk-pagination">
<ul *ngIf=" ( getTotalPages() > 0 ) && (getTotalPages() > 1) && ( 0 < currentPage && currentPage <= getTotalPages() ) " class="uk-pagination">
<li *ngIf=" currentPage > 1" ><a [href]="onPage((1))" aria-label="Previous">
<span aria-hidden="true">&laquo;</span></a></li>
<span><i class="uk-icon-angle-double-left"></i></span></a></li>
<!--<li *ngIf=" currentPage > 1"><a [href]="onPage((currentPage -1))">\<</a></li>-->
<li *ngIf=" currentPage -2 > 0"><a [href]="onPage((currentPage -2))">{{currentPage -2}}</a></li>
<li *ngIf=" currentPage -1 > 0 "><a [href]="onPage((currentPage -1))">{{currentPage -1}}</a></li>
<li class="uk-active"><a >{{currentPage}}</a></li>
<li class="uk-active"><span >{{currentPage}}</span></li>
<li *ngIf=" currentPage +1 <= getTotalPages() "><a [href]="onPage((currentPage +1))">{{currentPage +1}}</a></li>
<li *ngIf=" currentPage +2 <= getTotalPages() "><a [href]="onPage((currentPage +2))">{{currentPage +2}}</a></li>
<li *ngIf=" (currentPage -2 <= 0)&&(currentPage +3 <= getTotalPages()) "><a [href]="onPage((currentPage +3))">{{currentPage +3}}</a></li>
<li *ngIf=" (currentPage -1 <= 0)&&(currentPage +4 <= getTotalPages()) "><a [href]="onPage((currentPage +4))">{{currentPage +4}}</a></li>
<li *ngIf="getTotalPages() > currentPage"><a [href]="onPage((getTotalPages()))" aria-label="Next">
<span aria-hidden="true">&raquo;</span>
<i class="uk-icon-angle-double-right"></i>
</a></li>
</ul>
</div>
`
})

11
portal-2/src/app/utils/pagingFormatterNoLoad.component.ts
View File

@ -6,26 +6,25 @@ import {Component, Input, Output, EventEmitter} from '@angular/core';
@Component({
selector: 'paging-no-load',
template: `
<div *ngIf=" ( getTotalPages() > 0 ) && (getTotalPages() > 1) && ( 0 < currentPage && currentPage <= getTotalPages() ) " >
<ul class="uk-pagination">
<ul *ngIf=" ( getTotalPages() > 0 ) && (getTotalPages() > 1) && ( 0 < currentPage && currentPage <= getTotalPages() ) " class="uk-pagination">
<li *ngIf=" currentPage > 1" ><a (click)="onPage((1))" aria-label="Previous">
<span aria-hidden="true">&laquo;</span></a></li>
<span><i class="uk-icon-angle-double-left"></i></span></a></li>
<li *ngIf=" currentPage -2 > 0"><a (click)="onPage((currentPage -2))">{{currentPage -2}}</a></li>
<li *ngIf=" currentPage -1 > 0 "><a (click)="onPage((currentPage -1))">{{currentPage -1}}</a></li>
<li class="uk-active"><a >{{currentPage}}</a></li>
<li class="uk-active"><span >{{currentPage}}</span></li>
<li *ngIf=" currentPage +1 <= getTotalPages() "><a (click)="onPage((currentPage +1))">{{currentPage +1}}</a></li>
<li *ngIf=" currentPage +2 <= getTotalPages() "><a (click)="onPage((currentPage +2))">{{currentPage +2}}</a></li>
<li *ngIf=" (currentPage -2 <= 0)&&(currentPage +3 <= getTotalPages()) "><a (click)="onPage((currentPage +3))">{{currentPage +3}}</a></li>
<li *ngIf=" (currentPage -1 <= 0)&&(currentPage +4 <= getTotalPages()) "><a (click)="onPage((currentPage +4))">{{currentPage +4}}</a></li>
<li *ngIf="getTotalPages() > currentPage"><a (click)="onPage((getTotalPages()))" aria-label="Next">
<span aria-hidden="true">&raquo;</span>
<i class="uk-icon-angle-double-right"></i>
</a>
</li>
</ul>
</div>
`
})

2
portal-2/src/app/utils/staticAutoComplete.component.ts
View File

@ -16,7 +16,7 @@ import {RefineFieldResultsService} from '../services/refineFieldResults.service'
<div *ngIf = "showSelected && selectedValue != ''">
<div class="row-fluid show-grid auto-complete-choice" *ngFor="let item of selected" >
<span >{{showItem(item)}} </span>
<span (click)="remove(item)" aria-hidden="true" title="Remove selection" class=" remove glyphicon glyphicon-remove"></span>
<span (click)="remove(item)" aria-hidden="true" title="Remove selection" class=" remove "><i class="uk-icon-remove"></i></span>
</div>
</div>
<input *ngIf = "showInput" type="text" class="auto-complete-input validate filter-input input-sm form-control " [placeholder]=placeHolderMessage [(ngModel)]=keyword (keyup)=filter() >

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

@ -28,8 +28,8 @@
<script src="http://scoobydoo.di.uoa.gr:8083/joomlaNew/media/jui/js/jquery.min.js" type="text/javascript"></script>
<!--uikit-->
<script src="assets/uikit-2.27.2/js/uikit.min.js" type="text/javascript"></script>
<link href="assets/uikit-2.27.2/css/uikit.min.css" rel="stylesheet" type="text/css" />
<link href="assets/uikit.flat.min.css" rel="stylesheet" type="text/css" />
<link href="assets/uikit-2.27.2/css/uikit.almost-flat.min.css" rel="stylesheet" type="text/css" />
<!--link href="assets/uikit.flat.min.css" rel="stylesheet" type="text/css" /-->
<!-- Drop down -->
<script src="assets/uikit-2.27.2/js/core/dropdown.min.js" type="text/javascript"></script>
@ -37,8 +37,12 @@
<!-- Datepicker -->
<link href="assets/uikit-2.27.2/css/components/datepicker.css" rel="stylesheet" type="text/css" />
<script src="assets/uikit-2.27.2/js/components/datepicker.min.js" type="text/javascript"></script>
<!-- Accordion -->
<link href="assets/uikit-2.27.2/css/components/accordion.almost-flat.min.css" rel="stylesheet" type="text/css" />
<script src="assets/uikit-2.27.2/js/components/accordion.min.js" type="text/javascript"></script>
<!-- tabs/switcher -->
<script src="assets/uikit-2.27.2/js/core/tab.min.js" type="text/javascript"></script>
<script src="assets/uikit-2.27.2/js/core/switcher.min.js" type="text/javascript"></script>
<!--script src="assets/uikit-2.27.2/js/core/dropdown.min.js" type="text/javascript"></script-->
<!--script src="http://scoobydoo.di.uoa.gr:8083/joomlaNew/templates/yootheme/vendor/assets/uikit/src/js/core/dropdown.js" type="text/javascript"></script-->
@ -69,11 +73,14 @@
<!-- End of Google sitelinks search markup-->
<style>
.custom-hidden-dropdown-menu {position:static !important;}
.searchFilterBox .values {overflow:auto; max-height:200px; }
.searchFilterBoxValues {overflow:auto; max-height:200px; }
.selected-filters-box {margin:5px; background-color:#F8F8F8; }
.search-form {margin:5px; }
.clickable { cursor:pointer; }
.search-filters .uk-accordion-title{
font-size: 14px;
line-height: 18px;
}
.OPEN {
background: rgba(0, 0, 0, 0) url("/assets/openAccess.png") no-repeat scroll right center;
padding-right: 18px;