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

Minor Changes, fixes for user menu | comment linking box in publication landing | set Logout url 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48849 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2017-08-29 10:05:48 +00:00
parent 0b8fb9da6f
commit 55db83bae2
6 changed files with 27 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
portal-2/src/app/app.module.ts
View File

@ -1,11 +1,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { SharedModule } from './shared/shared.module';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AppComponent, XLargeDirective } from './app.component'; import { AppComponent } from './app.component';
import {SharedComponentsModule} from './sharedComponents/sharedComponents.module'; //navbar import {SharedComponentsModule} from './sharedComponents/sharedComponents.module'; //navbar
import { ErrorModule } from './error/error.module'; import { ErrorModule } from './error/error.module';
import { CacheService } from './shared/cache.service'; import { CacheService } from './shared/cache.service';

3
portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts
View File

@ -297,8 +297,7 @@ getCommunities () {
} }
} }
communityChanged(communityId:string, communityLabel:string){ communityChanged(){
console.log(communityId +" "+communityLabel);
console.log(this.selectedCommunityId +" "); console.log(this.selectedCommunityId +" ");
this.warningMessage = ""; this.warningMessage = "";
this.infoMessage = ""; this.infoMessage = "";

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

@ -636,59 +636,6 @@
</ul> </ul>
<!--a class="uk-button uk-button-default" uk-toggle="target: #linkingBox; 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="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span> Link this publication to</a>
<div id="linkingBox" class="uk-card uk-card-default uk-card- uk-padding-small uk-margin" hidden>
<div class="uk-clearfix">
<a uk-toggle="target: #linkingBox; 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-float-left " uk-tooltip="pos:right; delay:5"
title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
<p>Do you think that information is missing about a project, a community or other research results related to this publication?</p>
<p>You are able to enhance it! Please follow the links and create the missing relations.</p>
</div>'><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="question" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle><circle cx="10.44" cy="14.42" r="1.05"></circle><path fill="none" stroke="#000" stroke-width="1.2" d="M8.17,7.79 C8.17,4.75 12.72,4.73 12.72,7.72 C12.72,8.67 11.81,9.15 11.23,9.75 C10.75,10.24 10.51,10.73 10.45,11.4 C10.44,11.53 10.43,11.64 10.43,11.75"></path></svg></span>
</div>
</div>
<div class="uk-clearfix">
<a class="uk-clearfix uk-button uk-button-default uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span> Projects</a>
<a class="uk-clearfix uk-button uk-button-default uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg>
</span> Communities</a>
<a class="uk-clearfix uk-button uk-button-default uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" > <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Other research results</a>
</div>
</div-->
<div class="uk-card uk-card-default uk-padding-small uk-card-body">
<div class="uk-card-title">
<span class="" uk-tooltip="pos:right; delay:5"
title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
<p>Do you think that information is missing about a project, a community or other research results related to this publication?</p>
<p>You are able to enhance it! Please follow the links and create the missing relations.</p>
</div>'>
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
Link this publication to</div>
<div>
<div class="uk-clearfix">
<div><a class="uk-button-text uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Projects</a></div>
<div><a class=" uk-button-text uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Communities</a></div>
<div><a class=" uk-button-text uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])" routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
Other research results</a></div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

22
portal-2/src/app/login/userMini.component.ts
View File

@ -13,15 +13,13 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
<ul *ngIf="!mobileView" class="uk-navbar-nav"> <ul *ngIf="!mobileView" class="uk-navbar-nav">
<li class="uk-parent"> <li class="uk-parent">
<a class="" aria-expanded="false"> <a *ngIf="loggedIn" >
<span *ngIf="loggedIn" > <span>{{user.fullname+" "}} <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span></span>
<span>{{user.fullname}}</span>
</span>
<span *ngIf="!loggedIn">
<a class="loginLink" [href]="loginUrl" >Sign in | Register</a>
</span>
<span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span>
</a> </a>
<a *ngIf="!loggedIn" class="loginLink" [href]="loginUrl" >Sign in | Register <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg> </span>
</a>
<div *ngIf="loggedIn" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" id="userMenu" (click)="onClick('userMenu')" > <div *ngIf="loggedIn" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" id="userMenu" (click)="onClick('userMenu')" >
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
@ -39,12 +37,12 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
<li *ngIf="mobileView" class="uk-nav-header uk-parent " > <li *ngIf="mobileView" class="uk-nav-header uk-parent " >
<span *ngIf="loggedIn" > <span *ngIf="loggedIn" >
<span>{{user.fullname}}</span> <span>{{user.fullname+" "}}<span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span></span>
</span> </span>
<span *ngIf="!loggedIn"> <span *ngIf="!loggedIn">
<a class="loginLink" [href]="loginUrl" >Sign in | Register</a> <a class="loginLink" [href]="loginUrl" >Sign in | Register <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span>
</a>
</span> </span>
<span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span>
<ul *ngIf="loggedIn" class="uk-nav-sub"> <ul *ngIf="loggedIn" class="uk-nav-sub">
<li><a href="" >My profile</a></li> <li><a href="" >My profile</a></li>
@ -118,6 +116,8 @@ export class UserMiniComponent {
logOut(){ logOut(){
if(Session.isLoggedIn()){ if(Session.isLoggedIn()){
Session.removeUser(); Session.removeUser();
window.location.href = OpenaireProperties.getLogoutURL()+ location.href;
} }
this.loggedIn = false; this.loggedIn = false;
this.isAuthorized = false; this.isAuthorized = false;

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

@ -96,6 +96,9 @@ export class OpenaireProperties {
private static loginUrl ="http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/openid_connect_login"; private static loginUrl ="http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/openid_connect_login";
private static loginUrl_pm ="https://beta.services.openaire.eu/uoa-user-management/openid_connect_login"; private static loginUrl_pm ="https://beta.services.openaire.eu/uoa-user-management/openid_connect_login";
private static logoutUrl ="https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=";
private static logoutUrl_pm ="https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=";
private static cookieDomain =".di.uoa.gr"; private static cookieDomain =".di.uoa.gr";
private static cookieDomain_pm =".openaire.eu"; private static cookieDomain_pm =".openaire.eu";
@ -336,6 +339,13 @@ export class OpenaireProperties {
return this.loginUrl; return this.loginUrl;
} }
} }
public static getLogoutURL():string{
if(this.productionMode){
return this.logoutUrl_pm;
}else{
return this.logoutUrl;
}
}
public static getCookieDomain():string{ public static getCookieDomain():string{
if(this.productionMode){ if(this.productionMode){
return this.cookieDomain_pm; return this.cookieDomain_pm;

3
portal-2/src/assets/discover-custom.css
View File

@ -315,6 +315,9 @@ color: #414141}
right: 0; right: 0;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
.uk-tab-left::before {
border-bottom: none !important;
}
.mainPageSearchForm{ .mainPageSearchForm{
background-image: url("./home2.jpeg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px); background-image: url("./home2.jpeg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
} }