diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html index f1de0f12..a417d5ed 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/claims/claim-utils/displayClaims/displayClaims.component.html @@ -62,14 +62,16 @@
-
- {{resultsNum|number}} links, page {{page | number}} of {{totalPages(resultsNum)|number}} -
- + + + + + + + + + +
@@ -134,36 +136,39 @@
-
-
- {{resultsNum|number}} links, page {{page | number}} of {{totalPages(resultsNum)|number}} + + + + + + + + + + + + + + +
+
+
+ -
- -
- - - - - + + +

Are you sure?

+

+ You are about to delete {{this.selected.length}} link(s) you selected.
+ + Usually it takes 2-4 weeks for the links to permanently disappear from the Openaire platfrom. + +

- - - -

Are you sure?

-

- You are about to delete {{this.selected.length}} link(s) you selected.
- - Usually it takes 2-4 weeks for the links to permanently disappear from the Openaire platfrom. - -

- -

Do you want to delete the link(s)?

- - +

Do you want to delete the link(s)?

+ + diff --git a/claims/claim-utils/displayClaims/displayClaims.module.ts b/claims/claim-utils/displayClaims/displayClaims.module.ts index 197d42e5..ec5d411b 100644 --- a/claims/claim-utils/displayClaims/displayClaims.module.ts +++ b/claims/claim-utils/displayClaims/displayClaims.module.ts @@ -21,12 +21,13 @@ import {PiwikServiceModule} from "../../../utils/piwik/piwikService.module"; import {SearchInputModule} from '../../../sharedComponents/search-input/search-input.module'; import {InputModule} from '../../../sharedComponents/input/input.module'; import {LoadingModule} from '../../../utils/loading/loading.module'; +import {NoLoadPaging} from "../../../searchPages/searchUtils/no-load-paging.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ClaimServiceModule, LoadingModalModule, AlertModalModule, ClaimEntityFormatterModule, PagingModule, HelperModule, Schema2jsonldModule, SEOServiceModule, PiwikServiceModule, - IndexInfoServiceModule, MatSelectModule, SearchInputModule, MatAutocompleteModule, MatChipsModule, MatFormFieldModule, MatSlideToggleModule, InputModule, LoadingModule + IndexInfoServiceModule, MatSelectModule, SearchInputModule, MatAutocompleteModule, MatChipsModule, MatFormFieldModule, MatSlideToggleModule, InputModule, LoadingModule, NoLoadPaging ], declarations: [ diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 3b86e354..81abd174 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -222,7 +222,7 @@ export class DataProviderComponent { } ngAfterContentChecked() { - if(this.graph_and_feedback && window) { + if(this.graph_and_feedback && typeof document !== 'undefined') { this.graph_offset = this.calcGraphOffset(this.graph_and_feedback.nativeElement); } } diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts index b8deb782..ab6f237e 100644 --- a/landingPages/dataProvider/dataProvider.service.ts +++ b/landingPages/dataProvider/dataProvider.service.ts @@ -155,11 +155,13 @@ export class DataProviderService { } this.dataProviderInfo.subjects = []; - length = Array.isArray(data[0]['subjects']) ? data[0]['subjects'].length : 1; - for(let i=0; i - - + + + + + + \ No newline at end of file diff --git a/orcid/my-orcid-links/searchMyOrcidResults.module.ts b/orcid/my-orcid-links/searchMyOrcidResults.module.ts index 0ab16a2b..87ce11d0 100644 --- a/orcid/my-orcid-links/searchMyOrcidResults.module.ts +++ b/orcid/my-orcid-links/searchMyOrcidResults.module.ts @@ -8,12 +8,13 @@ import {ErrorMessagesModule} from "../../utils/errorMessages.module"; import {searcMyOrcidResultsComponent} from "./searchMyOrcidResults.component"; import {OrcidModule} from "../orcid.module"; import {NoLoadPaging} from "../../searchPages/searchUtils/no-load-paging.module"; +import {PagingModule} from "../../utils/paging.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, - ResultPreviewModule, OrcidModule, NoLoadPaging + ResultPreviewModule, OrcidModule, NoLoadPaging, PagingModule ], declarations: [ searcMyOrcidResultsComponent diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts index adc1c9f5..57c0c90f 100644 --- a/orcid/orcid-work.component.ts +++ b/orcid/orcid-work.component.ts @@ -26,7 +26,7 @@ declare var UIkit: any; class="uk-align-right uk-margin-remove-bottom"> + [class]="'uk-button uk-button-link uk-flex uk-flex-middle uk-flex-right uk-margin-right '+ ((showLoading || !isLoggedIn) ? 'uk-disabled ' : '') + (!isLoggedIn ? 'half-opacity' : '')"> Add to  @@ -42,7 +42,7 @@ declare var UIkit: any; [attr.uk-tooltip]="(!isLoggedIn) ? tooltipNoLoggedInUser : tooltipDelete" class="uk-align-right uk-margin-remove-bottom"> + [class]="'uk-button uk-button-link uk-flex uk-flex-middle uk-flex-right uk-margin-right '+ (showLoading ? 'uk-disabled' : '')"> Delete from  diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 8b194ece..bf15377f 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -940,7 +940,6 @@ export class NewSearchPageComponent { if (types.indexOf("datasources") == -1 || types.indexOf("services") == -1) { for (let type of types) { - console.log("add type: " + type); params += (params ? ' and ' : '') + ("eosctype exact " + (types.indexOf("datasources") != -1 ? "\"Data Source\"" : "\"Service\"")); // allFqs += "&type=" + StringUtils.unquote(StringUtils.URIDecode(type)); } @@ -1366,7 +1365,6 @@ export class NewSearchPageComponent { //this.parameterValues.push(this.searchUtils.sortBy); this.parameterValues.push(this.sortedByChanged); } - console.log(this.resultTypes); if (this.resultTypes && ( (this.entityType == 'publication' || this.entityType == 'dataset' || this.entityType == 'software' || this.entityType == 'other' || this.entityType == "result")