[Library | new-theme]: Added scrolling in links and my links | set 403 on errorPage when private data | Show pid re3data lowercase.
1. displayClaims.component.ts & searchMyOrcidResults.component.ts: Added scrolling in my/all claims page and in my orcid links page. 2. errorPage.component.ts: Set statusMessage and statusCode to 403 when page is private. 3. showIdentifiers.component.ts: Do not add uk-text-uppercase for "re3data" pid. 4. myOrcidLinks.component.ts: In "No ORCID links found" added classes "uk-text-meta uk-text-large uk-text-center" instead of alert. 5. searchMyOrcidResults.component.html: Added condition if totalResults > 0 and previewResults > 0 for <no-load-paging>.
This commit is contained in:
parent
5e1fde7841
commit
4d520d71fe
|
@ -21,6 +21,7 @@ import {FormArray, FormBuilder, FormControl, FormGroup} from '@angular/forms';
|
|||
import {Option} from '../../../sharedComponents/input/input.component';
|
||||
import {SearchInputComponent} from '../../../sharedComponents/search-input/search-input.component';
|
||||
import {OpenaireEntities} from "../../../utils/properties/searchFields";
|
||||
import {HelperFunctions} from "../../../utils/HelperFunctions.class";
|
||||
|
||||
declare var UIkit;
|
||||
@Component({
|
||||
|
@ -293,6 +294,7 @@ export class DisplayClaimsComponent {
|
|||
goTo(page: number = 1) {
|
||||
this.page = page;
|
||||
this.location.go(location.pathname, this.getParametersString());
|
||||
HelperFunctions.scroll();
|
||||
this.getClaims();
|
||||
}
|
||||
|
||||
|
|
|
@ -62,18 +62,22 @@ export class ErrorPageComponent {
|
|||
if (!this.page) {
|
||||
this.page = this._location.path(true);
|
||||
}
|
||||
if(this.response) {
|
||||
this.response.statusCode = 404;
|
||||
this.response.statusMessage = '404 - Page not found';
|
||||
}
|
||||
if(this.page != "-1") {
|
||||
let title = "OpenAIRE | Error page";
|
||||
this._meta.updateTag({content:title},"property='og:title'");
|
||||
this._title.setTitle(title);
|
||||
if(this.response) {
|
||||
this.response.statusCode = 404;
|
||||
this.response.statusMessage = '404 - Page not found';
|
||||
}
|
||||
} else{
|
||||
let title = "OpenAIRE | Private data";
|
||||
this._meta.updateTag({content:title},"property='og:title'");
|
||||
this._title.setTitle(title);
|
||||
if(this.response) {
|
||||
this.response.statusCode = 403;
|
||||
this.response.statusMessage = '403 - Private data';
|
||||
}
|
||||
}
|
||||
this.page_type = data['page_type'];
|
||||
if(this.page_type) {
|
||||
|
|
|
@ -23,7 +23,7 @@ import {properties} from "../../../../environments/environment";
|
|||
[class.uk-margin-bottom]="modal">
|
||||
<p class="uk-margin-remove">
|
||||
<span #content [id]="key" [class.uk-flex]="modal">
|
||||
<span class="uk-text-meta uk-text-small uk-text-uppercase">{{key}}: </span>
|
||||
<span class="uk-text-meta uk-text-small" [class.uk-text-uppercase]="key != 're3data'">{{key}}: </span>
|
||||
<span [class.uk-margin-small-left]="modal">
|
||||
<ng-container *ngFor="let item of identifiers.get(key) let j=index">
|
||||
<a *ngIf="key == 'doi' || key == 'pmc' || key == 'pmid' || key == 'handle' || key == 're3data'"
|
||||
|
|
|
@ -57,7 +57,7 @@ declare var UIkit: any;
|
|||
An Error Occurred
|
||||
</div>
|
||||
<div *ngIf="!showLoading && !orcidQuery && !requestGrant && !showErrorMessage"
|
||||
class="uk-animation-fade uk-alert uk-alert-primary uk-margin-large-top" role="alert">
|
||||
class="uk-animation-fade uk-text-meta uk-text-large uk-text-center uk-margin-large-top">
|
||||
No ORCID links found
|
||||
</div>
|
||||
<div *ngIf="requestGrant" class="uk-margin-large-top">
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
<div class="uk-margin-medium-top uk-margin">
|
||||
<no-load-paging *ngIf="totalResults > 0" [type]="openaireEntities.RESULTS"
|
||||
<no-load-paging *ngIf="totalResults > 0 && previewResults && previewResults.length > 0" [type]="openaireEntities.RESULTS"
|
||||
(pageChange)="pageChanged($event)"
|
||||
[page]="currentPage" [pageSize]="resultsPerPage"
|
||||
[totalResults]="totalResults">
|
||||
</no-load-paging>
|
||||
|
||||
<ul class="uk-list search-results uk-margin-remove-top">
|
||||
<errorMessages *ngIf="status != errorCodes.NONE" [status]="[status]" [type]="'results'"></errorMessages>
|
||||
<ul class="uk-list search-results uk-margin-medium-top">
|
||||
<errorMessages [status]="[status]" [type]="'results'"></errorMessages>
|
||||
|
||||
<li *ngFor="let result of previewResults">
|
||||
<div class="uk-card uk-card-default uk-padding">
|
||||
|
@ -38,7 +37,7 @@
|
|||
<!-- [page]="currentPage" [pageSize]="resultsPerPage"-->
|
||||
<!-- [totalResults]="totalResults">-->
|
||||
<!-- </no-load-paging>-->
|
||||
<paging-no-load *ngIf="totalResults > 0 && previewResults && previewResults.length"
|
||||
<paging-no-load *ngIf="totalResults > 0 && previewResults && previewResults.length > 0"
|
||||
[totalResults]="totalResults" [currentPage]="currentPage" [size]="resultsPerPage"
|
||||
(pageChange)="pageChanged($event)" class="uk-float-right"></paging-no-load>
|
||||
</div>
|
|
@ -10,6 +10,7 @@ import {properties} from "../../../../environments/environment";
|
|||
import {Session} from "../../login/utils/helper.class";
|
||||
import {OrcidService} from "../orcid.service";
|
||||
import {OpenaireEntities} from "../../utils/properties/searchFields";
|
||||
import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
||||
|
||||
@Component({
|
||||
selector: 'my-orcid-result',
|
||||
|
@ -115,6 +116,7 @@ export class searcMyOrcidResultsComponent {
|
|||
|
||||
public pageChanged($event) {
|
||||
this.pageChange.emit($event);
|
||||
HelperFunctions.scroll();
|
||||
}
|
||||
|
||||
public totalPages(totalResults: number): number {
|
||||
|
|
Loading…
Reference in New Issue