Authors remove uk-box-no-shadow from button. Fix typos in guards. Sidebar: Fix second menu items subnav
This commit is contained in:
parent
d12138bc2a
commit
38f3e7656f
|
@ -22,7 +22,7 @@ export class ConnectCommunityGuard implements CanActivate, CanActivateChild {
|
|||
check(community: string, url: string): Observable<boolean> | boolean {
|
||||
return this.communityService.isCommunityType(community).pipe(take(1), tap(isCommunity => {
|
||||
if (!isCommunity) {
|
||||
this.router.navigate([this.properties.errorLink], {queryParams: {'page': url}});
|
||||
this.router.navigate([properties.errorLink], {queryParams: {'page': url}});
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
|
|
@ -10,6 +10,7 @@ import {
|
|||
} from '@angular/router';
|
||||
import {Observable, Subscription} from 'rxjs';
|
||||
import {CommunityService} from '../community/community.service';
|
||||
import {properties} from "../../../../environments/environment";
|
||||
|
||||
@Injectable()
|
||||
export class ConnectRIGuard implements CanActivate, CanActivateChild {
|
||||
|
@ -22,7 +23,7 @@ export class ConnectRIGuard implements CanActivate, CanActivateChild {
|
|||
check(community: string, url: string): Observable<boolean> | boolean {
|
||||
return this.communityService.isRIType(community).pipe(tap(authorized => {
|
||||
if (!authorized) {
|
||||
this.router.navigate([this.properties.errorLink], {queryParams: {'page': url}});
|
||||
this.router.navigate([properties.errorLink], {queryParams: {'page': url}});
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
</div>
|
||||
<ng-template [ngIf]="specialMenuItem">
|
||||
<div class="menu_section uk-margin-large-top">
|
||||
<ul class="uk-list uk-nav-parent-icon uk-nav" uk-nav>
|
||||
<ul class="uk-list uk-nav uk-nav-default" uk-nav>
|
||||
<li [class.uk-active]="isTheActiveUrl(specialMenuItem.route)">
|
||||
<a [routerLink]="specialMenuItem.route" [queryParams]="specialMenuItem.params"
|
||||
[queryParamsHandling]="queryParamsHandling">
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import {Component, EventEmitter, Inject, Input, Output, PLATFORM_ID, ViewChild} from '@angular/core';
|
||||
import {Component, Inject, Input, PLATFORM_ID, ViewChild} from '@angular/core';
|
||||
import {ActivatedRoute} from "@angular/router";
|
||||
import {HelperFunctions} from '../HelperFunctions.class';
|
||||
import {RouterHelper} from "../routerHelper.class";
|
||||
import {EnvProperties} from '../properties/env-properties';
|
||||
import {isPlatformBrowser} from "@angular/common";
|
||||
|
@ -61,7 +60,7 @@ import {properties} from "../../../../environments/environment";
|
|||
{{author.fullName}} in OpenAIRE
|
||||
</div>
|
||||
<div class="uk-text-center uk-margin-top uk-margin-large-left uk-margin-large-right">
|
||||
<a class="uk-button uk-button-primary uk-box-no-shadow uk-text-bold uk-padding-remove-top uk-padding-remove-bottom"
|
||||
<a class="uk-button uk-button-primary uk-text-bold uk-padding-remove-top uk-padding-remove-bottom"
|
||||
(click)="onClick()"
|
||||
[queryParams]="routerHelper.createQueryParams(['orcid','oc'],[(author['orcid'] ? author['orcid'] : author['orcid_pending']),'and'])"
|
||||
routerLinkActive="router-link-active" [routerLink]="properties.searchLinkToAdvancedResults">
|
||||
|
|
Loading…
Reference in New Issue