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

menu drop down close after click | mobile menu closes on click | menu, footer, cookie message show only in client | scroll up for search pages 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47466 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2017-06-12 09:03:44 +00:00
parent a0098892b6
commit df7c2e965d
9 changed files with 108 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
portal-2/src/app/app.component.ts
View File

@ -51,16 +51,25 @@ export class XLargeDirective {
</div>
</div>
</div>
<cookie-law position="bottom">
<cookie-law *ngIf= "isClient" position="bottom">
OpenAIRE uses cookies in order to function properly.<br>
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible.
By using the OpenAIRE portal you accept our use of cookies. <a href="//ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span uk-icon="icon: chevron-right"></span></a>
</cookie-law>
<bottom></bottom>
<bottom *ngIf= "isClient"></bottom>
`
})
export class AppComponent {
title = 'ftw';
isClient:boolean = false;
ngOnInit() {
if (typeof document !== 'undefined') {
try{
this.isClient = true;
}catch (e) {
}
}
}
}

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

@ -67,7 +67,7 @@ export class BulkClaimComponent {
type : string = "publication";
resultsFromSearch:number;
@Input() public select:boolean = true ;
@Input() public publications;
@Input() public results;
allIds:string[] = [];
foundIds:string[] = [];
@ -104,11 +104,12 @@ export class BulkClaimComponent {
this.allIds = [];
this.foundIds = [];
this.noValidIds = [];
this.publications.slice(0,this.publications.length);
this.results.slice(0,this.results.length);
this.notFoundIds = [];
for(i=0;i<rows.length;i++){
if(rows[i] && rows[i] != null ){
console.log("Row is:" + rows[i]);
var values = rows[i].split(',');
var id=this.removeDoubleQuotes(values[0]);
@ -190,7 +191,7 @@ export class BulkClaimComponent {
this.foundIds.push(id);
var result = {id: id, type :'publication', source : 'crossref',
title: crossrefResult.title,url: crossrefResult.URL, result: crossrefResult, accessRights: accessMode, embargoEndDate: date, date : crossrefResult.created['date-time']};
this.publications.push(result);
this.results.push(result);
}else{
@ -205,7 +206,30 @@ export class BulkClaimComponent {
}
);
}
searchInDatacite(id:string,accessMode:string,date:string){
this._searchCrossrefService.searchCrossrefByDOIs([id]).subscribe(
data => {
var crossrefResult = data.items[0];
if(data.items.length > 0){
this.foundIds.push(id);
var result = {id: id, type :'dataset', source : 'datacite',
title: crossrefResult.title,url: crossrefResult.URL, result: crossrefResult, accessRights: accessMode, embargoEndDate: date, date : crossrefResult.created['date-time']};
this.results.push(result);
}else{
this.notFoundIds.push(id);
}
this.endOfFetching();
},
err => {
console.log(err);
this.notFoundIds.push(id);
this.endOfFetching();
}
);
}
endOfFetching(){
if(this.allIds.length == this.foundIds.length+this.notFoundIds.length+ this.duplicateIds.length ){
this.showReport = true;

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

@ -19,7 +19,7 @@ import {Dates} from '../../../utils/string-utils.class';
<span *ngIf="bulkMode">Search mode <i uk-icon="icon: search"></i></span>
</button></div><!-- (resultsChange)="resultsChanged($event)" -->
<claim-result-search-form *ngIf="!bulkMode" [selectedResults]="results" > </claim-result-search-form>
<bulk-claim *ngIf="bulkMode" [publications]="results" > </bulk-claim>
<bulk-claim *ngIf="bulkMode" [results]="results" > </bulk-claim>
</div>
<div [ngClass]="showAccessRights && !showSearch?'uk-width-1-1':'uk-width-1-2'">
<!--div class="uk-clearfix"><button *ngIf=" !showSearch " (click)="showSearch = true;" class="uk-button-default uk-float-right uk-animation ">Add more <span uk-icon="icon: plus"></span></button></div-->

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

@ -44,7 +44,7 @@ export class DataProviderComponent {
public reloadDatasets: boolean = true;
public reloadProjects: boolean = true;
public reloadDataproviders: boolean = true;
public reloadRelatedDatasources: boolean = true;
public reloadRelatedDatasources: boolean = true;
public metricsClicked: boolean;
private viewsFrameUrl: string;
private downloadsFrameUrl: string;

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

@ -1,4 +1,4 @@
import {Component, Input, ViewChild, Output, EventEmitter} from '@angular/core';
import {Component, Input, ViewChild, Output, EventEmitter,ElementRef} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {Location} from '@angular/common';
import { Filter, Value} from './searchHelperClasses.class';
@ -141,10 +141,13 @@ export class SearchPageComponent {
@ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ;
public currentFilter: Filter;
constructor (private location: Location , private _meta: Meta) {
constructor (private location: Location , private _meta: Meta,private element: ElementRef) {
}
ngOnInit() {
if (typeof document !== 'undefined') {
this.element.nativeElement.scrollIntoView();
}
this.updateBaseUrlWithParameters(this.filters);
this.defineUrlParam();
this.updateTitle(this.pageTitle);
@ -497,7 +500,9 @@ export class SearchPageComponent {
index:indexQuery
});
if (typeof document !== 'undefined') {
this.element.nativeElement.scrollIntoView();
}
}
filterChanged($event){
console.info("filter Changed");

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

@ -30,39 +30,39 @@ import {Session} from '../login/utils/helper.class';
<button class="uk-offcanvas-close uk-close uk-icon" type="button" uk-close=""></button>
<div class="uk-child-width-1-1 uk-grid" uk-grid="">
<div>
<div class="uk-panel" id="module-0">
<div *ngIf= "isClient" class="uk-panel" id="module-0">
<ul class="uk-nav uk-nav-default">
<li class="uk-nav-header uk-parent">
Search
<ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/search/find/publications">Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/datasets">Datasets</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/projects">Projects</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/dataproviders">Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/organizations">Organizations</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/people">People</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/publications" class="uk-offcanvas-close custom-offcanvas-close">Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/datasets" class="uk-offcanvas-close custom-offcanvas-close">Datasets</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/projects" class="uk-offcanvas-close custom-offcanvas-close">Projects</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/dataproviders" class="uk-offcanvas-close custom-offcanvas-close">Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/organizations" class="uk-offcanvas-close custom-offcanvas-close">Organizations</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/people" class="uk-offcanvas-close custom-offcanvas-close">People</a></li>
</ul>
</li>
<li class="uk-nav-header uk-parent">
Data Providers
<ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/search/data-providers">Compatible Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/entity-registries">Entity Registries</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/data-providers" class="uk-offcanvas-close custom-offcanvas-close" >Compatible Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Entity Registries</a></li>
</ul>
</li>
<li class="uk-nav-header uk-parent">
Deposit
<ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-publications">Deposit Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-datasets">Deposit Research Data</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-publications" class="uk-offcanvas-close custom-offcanvas-close" >Deposit Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-datasets" class="uk-offcanvas-close custom-offcanvas-close" >Deposit Research Data</a></li>
</ul>
</li>
<li class="uk-nav-header uk-parent">
Linking
<ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/participate/claim">Linking</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/myclaims">My Claims</a></li>
<li *ngIf="isAuthorized"><a routerLinkActive="router-link-active" routerLink="/claims">Manage all Claims</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/participate/claim" class="uk-offcanvas-close custom-offcanvas-close" >Linking</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/myclaims" class="uk-offcanvas-close custom-offcanvas-close">My Claims</a></li>
<li *ngIf="isAuthorized"><a routerLinkActive="router-link-active" routerLink="/claims" class="uk-offcanvas-close custom-offcanvas-close">Manage all Claims</a></li>
</ul>
</li>
</ul>
@ -122,10 +122,10 @@ import {Session} from '../login/utils/helper.class';
<img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"></a>
</div>
<div class="uk-navbar-center">
<ul class="uk-navbar-nav">
<ul *ngIf= "isClient" class="uk-navbar-nav">
<li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/search/find" class="" aria-expanded="false">Search</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 0px;">
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 0px;" id="searchMenu" (click)="onClick('searchMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
@ -142,7 +142,7 @@ import {Session} from '../login/utils/helper.class';
</li>
<li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/search/data-providers" class="" aria-expanded="false">Data Providers</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;">
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
@ -155,7 +155,7 @@ import {Session} from '../login/utils/helper.class';
</li>
<li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/participate/deposit-publications" class="" aria-expanded="false">Deposit</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 240px;">
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 240px;" id="depositMenu" (click)="onClick('depositMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
@ -168,7 +168,7 @@ import {Session} from '../login/utils/helper.class';
</li>
<li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/participate/claim" class="" aria-expanded="false">Linking</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 358px;">
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 358px;" id="linkingMenu" (click)="onClick('linkingMenu')" >
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
@ -188,8 +188,8 @@ import {Session} from '../login/utils/helper.class';
</nav>
</div>
</div>
<div class="uk-sticky-placeholder" style="height: 80px; margin: 0px;" hidden="hidden"></div>
<div class="uk-sticky-placeholder" style="height: 84px; margin: 0px;" hidden="hidden"></div>
<!--div class="uk-sticky-placeholder" style="height: 80px; margin: 0px;" hidden="hidden"></div>
<div class="uk-sticky-placeholder" style="height: 84px; margin: 0px;" hidden="hidden"></div-->
</div>
<div class="first_page_section uk-section-default uk-section uk-padding-remove-vertical">
<div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid uk-grid-stack" uk-grid="">
@ -208,10 +208,18 @@ import {Session} from '../login/utils/helper.class';
export class NavigationBarComponent {
public isAuthorized: boolean = false;
sub:any;
isClient:boolean = false;
constructor( private router: Router, private route: ActivatedRoute) {}
ngOnInit() {
if (typeof document !== 'undefined') {
try{
this.isClient = true;
}catch (e) {
}
}
this.initialize();
this.sub = this.route.queryParams.subscribe(params => {
this.initialize();
@ -228,5 +236,9 @@ export class NavigationBarComponent {
}
}
onClick(id: string) {
var el: HTMLElement = document.getElementById(id);
el.classList.remove('uk-open');
}
}

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

@ -37,20 +37,24 @@ export class OpenaireProperties {
private static framesAPIURL = "https://beta.openaire.eu/stats3/";
private static loginAPIURL = "http://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";
private static loginAPIURL_pm = "https://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";
private static loginAPIURL_pm = "https://beta.services.openaire.eu/uoa-user-management/api/users/authenticates";
private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-connector-service-2.0.0-SNAPSHOT/rest/claimsService/";
private static claimsAPIURL_pm = "https://beta.services.openaire.eu/claims/rest/claimsService/";
private static searchAPIURLLAst_pm = "https://beta.services.openaire.eu/search/v2/api/";
private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
private static searchAPIURLLAst = "https://beta.services.openaire.eu/search/v2/api/";
// private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
private static searchResourcesAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/resources";
private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
private static searchResourcesAPIURL = "https://beta.services.openaire.eu/search/v2/api/resources";
// private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
private static csvAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv
private static csvAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv
private static csvAPIURL = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv
// private static csvAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv
private static searchCrossrefAPIURL = "https://api.crossref.org/works";
// private static searchDataciteAPIURL = "https://search.datacite.org/api";

12
portal-2/src/assets/custom.css
View File

@ -33,10 +33,9 @@
.custom-user-mini-panel a{
color:rgb(36, 91, 204);
}
/*.custom-main-content{
height: 100%;
min-height: 750px;
}*/
.custom-main-content{
min-height: 550px;
}
.custom-autocomplete .uk-nav-autocomplete > li > a:hover {
background: #00a8e6 none repeat scroll 0 0;
@ -143,3 +142,8 @@ overflow-y: auto;
overflow-x: hidden;
max-height:265px;
}
.custom-offcanvas-close {
position: relative;
right: 0;
top: 0;
}

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

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en-gb" dir="ltr" vocab="http://schema.org/">
<head>
<!--link href="http://demo.openaire.eu" rel="canonical" /-->
@ -31,7 +31,9 @@
<link rel="stylesheet" href="assets/custom.css">
<script src="assets/dl119_files/jquery.js"></script>
<script src="assets/dl119_files/uikit.js"></script>
<script src="node_modules/uikit/dist/js/uikit.min.js"></script>
<!-- <script async src="assets/dl119_files/theme.js"></script> -->
<!--script src="node_modules/uikit/dist/js/uikit.min.js"></script-->
<script src="assets/dl119_files/uikit-icons-max.js"></script>
<!-- Google sitename markup-->
@ -69,12 +71,14 @@
</head>
<body class="" cz-shortcut-listen="true" style="">
<body class="" style="">
<div class="uk-offcanvas-content uk-height-viewport">
<script async src="/main.bundle.js"></script>
<app>
Loading Universal ...
</app>