MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

[develop]: Fix margins in all pages.

This commit is contained in:
Konstantinos Triantafyllou 2024-06-18 14:05:37 +03:00
parent a512f80cb1
commit 7fde26d414
13 changed files with 109 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/national/national.component.ts
View File

@ -60,7 +60,7 @@ import {UserManagementService} from "../openaireLibrary/services/user-management
</div>
</div>
</div>
<div class="uk-margin-medium-top uk-margin-medium-bottom">
<div>
<router-outlet></router-outlet>
</div>
</div>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 00724378a86009f91e4f81c5a24987d0a00276e9
Subproject commit 56b597231634016bd4bb0043019f91d481aaf746

2
src/app/repository/browse-repositories/browse-repositories.component.html
View File

@ -3,7 +3,7 @@
<loading></loading>
</div>
</ng-container>
<div *ngIf="!showLoading" class="uk-container uk-container-large">
<div *ngIf="!showLoading" class="uk-container uk-container-large uk-section-small">
<div class="uk-flex uk-flex-middle uk-flex-center">
<div search-input *ngIf="keywordControl" [searchControl]="keywordControl" [searchInputClass]="'flat'" [iconPosition]="'left'"
placeholder="Search for {{typeAsLabel}} {{entities.stakeholders}}" [disabled]="stakeholders.length === 0" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1">

2
src/app/repository/repository.component.ts
View File

@ -124,7 +124,7 @@ import {properties as beta} from "../../environments/environment.beta";
</div>
</div>
</div>
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
<div *ngIf="!this.alias || this.stakeholder">
<router-outlet></router-outlet>
</div>
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name"

2
src/app/researcher/researcher.component.ts
View File

@ -73,7 +73,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
</div>
</div>
</div>
<div class="uk-container uk-container-large uk-margin-medium-top uk-margin-medium-bottom">
<div class="uk-container uk-container-large">
<router-outlet></router-outlet>
</div>
</div>

119
src/app/researcher/search-researcher/search-researcher.component.html
View File

@ -1,66 +1,67 @@
<div class="uk-flex uk-flex-center">
<div search-input [(value)]="keyword" [placeholder]="'Search for author or ORCID...'" [disabled]="orcidStatus ==errorCodes.LOADING"
[searchInputClass]="'flat'" [iconPosition]="'left'" (searchEmitter)="searchByKeyword()" (valueChange)="checkForReset()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div>
<div class="uk-margin-large-top">
<div *ngIf="orcidStatus == errorCodes.ERROR" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-warning uk-text-center uk-width-2-3@m uk-width-1-1" role="alert">
An error occured
<div class="uk-section-small">
<div class="uk-flex uk-flex-center">
<div search-input [(value)]="keyword" [placeholder]="'Search for author or ORCID...'" [disabled]="orcidStatus ==errorCodes.LOADING"
[searchInputClass]="'flat'" [iconPosition]="'left'" (searchEmitter)="searchByKeyword()" (valueChange)="checkForReset()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div>
</div>
<div *ngIf="orcidStatus == errorCodes.NOT_AVAILABLE" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-danger uk-text-center uk-width-2-3@m uk-width-1-1" role="alert">
Service not available
</div>
</div>
<div *ngIf="orcidStatus == errorCodes.NONE" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-primary uk-text-center uk-width-2-3@m uk-width-1-1">
No results found
</div>
</div>
<div *ngIf="!(orcidStatus == errorCodes.NONE ||
orcidStatus == errorCodes.ERROR || orcidStatus == errorCodes.NOT_AVAILABLE)">
<!-- Debug info -->
<!--<div>
Orcid found:{{authors.length}} <br>
check for results: {{authorsRendered}} <br>
Authors found (with OpenAIRE results):{{authorsToShow.length}} <br>
page: {{page}}<br>
</div>-->
<div class="uk-grid uk-grid-small uk-child-width-1-3@l uk-child-width-1-2@m" uk-grid>
<div *ngFor=" let author of authorsToShow.slice(0,page*size>authorsToShow.length?authorsToShow.length:page*size)">
<div *ngIf="author.resultsCount > 0" class="uk-card uk-card-default uk-card-hover uk-padding-small clickable"
[routerLink]="'./'+author.id+''">
<div class="uk-margin-bottom uk-grid uk-flex-middle" uk-grid>
<div>
<div class="uk-border uk-border-circle uk-text-meta uk-padding-xsmall uk-margin-small-right">
<icon [name]="'person'" [ratio]="2" [flex]="true"></icon>
</div>
<div class="uk-margin-large-top">
<div *ngIf="orcidStatus == errorCodes.ERROR" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-warning uk-text-center uk-width-2-3@m uk-width-1-1" role="alert">
An error occured
</div>
<div class="uk-padding-remove-left uk-width-expand">
<div class="uk-h6 uk-margin-xsmall-bottom uk-text-truncate">{{author.authorGivenName}} {{author.authorFamilyName}}</div>
<div class="uk-text-primary uk-text-xsmall uk-text-bold">
<!-- <div *ngIf="author.resultsCount && author.resultsCount > 0">{{author.resultsCount}} {{openaireEntities.RESULTS}}</div></div>-->
<div class="uk-text-truncate" *ngIf="author.institutions">{{author.institutions.join(", ")}}</div>
</div>
<div *ngIf="orcidStatus == errorCodes.NOT_AVAILABLE" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-danger uk-text-center uk-width-2-3@m uk-width-1-1" role="alert">
Service not available
</div>
</div>
<div *ngIf="orcidStatus == errorCodes.NONE" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-primary uk-text-center uk-width-2-3@m uk-width-1-1">
No results found
</div>
</div>
<div *ngIf="!(orcidStatus == errorCodes.NONE ||
orcidStatus == errorCodes.ERROR || orcidStatus == errorCodes.NOT_AVAILABLE)">
<!-- Debug info -->
<!--<div>
Orcid found:{{authors.length}} <br>
check for results: {{authorsRendered}} <br>
Authors found (with OpenAIRE results):{{authorsToShow.length}} <br>
page: {{page}}<br>
</div>-->
<div class="uk-grid uk-grid-small uk-child-width-1-3@l uk-child-width-1-2@m" uk-grid>
<div *ngFor=" let author of authorsToShow.slice(0,page*size>authorsToShow.length?authorsToShow.length:page*size)">
<div *ngIf="author.resultsCount > 0" class="uk-card uk-card-default uk-card-hover uk-padding-small clickable"
[routerLink]="'./'+author.id+''">
<div class="uk-margin-bottom uk-grid uk-flex-middle" uk-grid>
<div>
<div class="uk-border uk-border-circle uk-text-meta uk-padding-xsmall uk-margin-small-right">
<icon [name]="'person'" [ratio]="2" [flex]="true"></icon>
</div>
</div>
<div class="uk-padding-remove-left uk-width-expand">
<div class="uk-h6 uk-margin-xsmall-bottom uk-text-truncate">{{author.authorGivenName}} {{author.authorFamilyName}}</div>
<div class="uk-text-primary uk-text-xsmall uk-text-bold">
<!-- <div *ngIf="author.resultsCount && author.resultsCount > 0">{{author.resultsCount}} {{openaireEntities.RESULTS}}</div></div>-->
<div class="uk-text-truncate" *ngIf="author.institutions">{{author.institutions.join(", ")}}</div>
</div>
</div>
</div>
<div class="uk-margin-top uk-text-small uk-text-italic">
<img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="orcid"
loading="lazy" style="width:16px; height:16px; margin-right: 3px;">
<a [href]="properties.orcidURL + author.id" target="_blank" class="uk-link-text">
{{properties.orcidURL + author.id}}</a></div>
<!-- <div>Research outcomes:{{author.resultsCount}}</div>-->
</div>
</div>
</div>
</div>
<div class="uk-margin-top uk-text-small uk-text-italic">
<img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="orcid"
loading="lazy" style="width:16px; height:16px; margin-right: 3px;">
<a [href]="properties.orcidURL + author.id" target="_blank" class="uk-link-text">
{{properties.orcidURL + author.id}}</a></div>
<!-- <div>Research outcomes:{{author.resultsCount}}</div>-->
<div *ngIf="orcidStatus == errorCodes.LOADING" class="uk-height-medium uk-position-relative" role="alert">
<loading class="uk-position-center"></loading>
</div>
<div class="uk-flex uk-flex-center uk-margin-medium-top">
<button *ngIf="authorsToShow.length > 0 && orcidStatus != errorCodes.LOADING && (authorsToShow.length > page*size || authors.length > authorsRendered)" class="uk-button uk-button-default" [class.uk-disabled]="orcidStatus == errorCodes.LOADING" (click)="loadMore()" >Load more</button>
</div>
</div>
</div>
</div>
<div *ngIf="orcidStatus == errorCodes.LOADING" class="uk-height-medium uk-position-relative" role="alert">
<loading class="uk-position-center"></loading>
</div>
<div class="uk-flex uk-flex-center uk-margin-medium-top">
<button *ngIf="authorsToShow.length > 0 && orcidStatus != errorCodes.LOADING && (authorsToShow.length > page*size || authors.length > authorsRendered)" class="uk-button uk-button-default" [class.uk-disabled]="orcidStatus == errorCodes.LOADING" (click)="loadMore()" >Load more</button>
</div>
</div>
</div>

2
src/app/rfo/rfo.component.ts
View File

@ -84,7 +84,7 @@ import {properties as beta} from "../../environments/environment.beta";
</div>
</div>
</div>
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
<div *ngIf="!this.alias || this.stakeholder">
<router-outlet></router-outlet>
</div>
</div>

2
src/app/rpo/rpo.component.ts
View File

@ -73,7 +73,7 @@ import {UserManagementService} from "../openaireLibrary/services/user-management
</div>
</div>
</div>
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
<div *ngIf="!this.alias || this.stakeholder">
<router-outlet></router-outlet>
</div>
</div>

32
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -6,22 +6,24 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter.
@Component({
selector: 'monitor-search-dataproviders',
template: `
<div class="uk-flex uk-flex-center">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedDataProviders" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search by name, description, subject...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
<div class="uk-flex uk-flex-center uk-margin-medium-bottom uk-margin-medium-top">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedDataProviders" [queryParams]="parameters">Advanced
search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search by name, description, subject...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()"
class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div>
</div>
</div>
<search-dataproviders *ngIf="customFilters"
[customFilters]=customFilters
[hasPrefix]="false"
[includeOnlyResultsAndFilter]="true" [showBreadcrumb]="false"
[showSwitchSearchLink]="false"
[searchForm]="{dark: false, class: 'search-form'}">
</search-dataproviders>
<search-dataproviders *ngIf="customFilters"
[customFilters]=customFilters
[hasPrefix]="false"
[includeOnlyResultsAndFilter]="true" [showBreadcrumb]="false"
[showSwitchSearchLink]="false"
[searchForm]="{dark: false, class: 'search-form'}">
</search-dataproviders>
`
})
export class MonitorSearchDataprovidersComponent extends SearchBaseComponent{

18
src/app/search/searchPages/simple/searchOrganizations.component.ts
View File

@ -6,15 +6,17 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter.
@Component({
selector: 'monitor-search-organizations',
template: `
<div class=" uk-flex uk-flex-center ">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedOrganizations" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search by organization name...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
<div class="uk-flex uk-flex-center uk-margin-medium-bottom uk-margin-medium-top">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedOrganizations" [queryParams]="parameters">Advanced
search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search by organization name...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()"
class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div>
</div>
</div>
<search-organizations *ngIf="customFilters" [customFilters]="customFilters"
[hasPrefix]="false"
[includeOnlyResultsAndFilter]="true" [showBreadcrumb]="false"

22
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -6,21 +6,23 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter.
@Component({
selector: 'monitor-search-projects',
template: `
<div class=" uk-flex uk-flex-center ">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedProjects" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search by title, acronym, project code...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
<div class="uk-flex uk-flex-center uk-margin-medium-bottom uk-margin-medium-top">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedProjects" [queryParams]="parameters">Advanced
search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search by title, acronym, project code...'"
[searchInputClass]="'inner background'" (searchEmitter)="search()"
class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div>
</div>
</div>
<search-projects *ngIf="customFilters"
[customFilters]="customFilters" [hasPrefix]="false"
[customFilters]="customFilters" [hasPrefix]="false"
[includeOnlyResultsAndFilter]="true" [showBreadcrumb]="false"
[showSwitchSearchLink]="false"
[searchForm]="{dark: false, class: 'search-form'}"
>
>
</search-projects>
`

2
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -7,7 +7,7 @@ import {OpenaireEntities} from "../../../openaireLibrary/utils/properties/search
@Component({
selector: 'monitor-search-results',
template: `
<div class=" uk-flex uk-flex-center uk-margin-medium-bottom">
<div class="uk-flex uk-flex-center uk-margin-medium-bottom uk-margin-medium-top">
<div class="uk-width-1-1 uk-width-auto@s uk-padding uk-padding-remove-vertical">
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="parameters"

2
src/app/shared/browse-stakeholders/browse-stakeholders.component.html
View File

@ -3,7 +3,7 @@
<loading></loading>
</div>
</ng-container>
<div *ngIf="!showLoading" class="uk-container uk-container-large">
<div *ngIf="!showLoading" class="uk-container uk-container-large uk-section-small">
<div class="uk-flex uk-flex-middle uk-flex-between">
<div class="uk-visible@m uk-width-small">
</div>