[master] all pages: add correct margins for all router-outlets, register OA icon on modules

This commit is contained in:
Alex Martzios 2023-12-12 09:51:30 +02:00
parent 28ccef5ec7
commit 4c8792b509
10 changed files with 35 additions and 6 deletions

View File

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

View File

@ -5,6 +5,9 @@ import {NationalComponent} from "./national.component";
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module"; import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
import {open_access} from "../openaireLibrary/utils/icons/icons";
const routes: Route[] = [ const routes: Route[] = [
{ {
path: '', component: NationalComponent, children: [ path: '', component: NationalComponent, children: [
@ -20,4 +23,7 @@ const routes: Route[] = [
exports: [NationalComponent], exports: [NationalComponent],
}) })
export class NationalModule { export class NationalModule {
constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([open_access]);
}
} }

View File

@ -90,7 +90,7 @@ import {SearchDataprovidersService} from "../openaireLibrary/services/searchData
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-large-top uk-margin-large-bottom"> <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type"></role-verification> <role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type"></role-verification>

View File

@ -7,6 +7,8 @@ import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-
import {SearchDataprovidersService} from "../openaireLibrary/services/searchDataproviders.service"; import {SearchDataprovidersService} from "../openaireLibrary/services/searchDataproviders.service";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {EntityMetadataModule} from "../openaireLibrary/landingPages/landing-utils/entity-metadata.module"; import {EntityMetadataModule} from "../openaireLibrary/landingPages/landing-utils/entity-metadata.module";
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
import {open_access} from "../openaireLibrary/utils/icons/icons";
const routes: Route[] = [ const routes: Route[] = [
{ {
@ -25,4 +27,7 @@ const routes: Route[] = [
exports: [RepositoryComponent], exports: [RepositoryComponent],
}) })
export class RepositoryModule { export class RepositoryModule {
constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([open_access]);
}
} }

View File

@ -57,7 +57,7 @@ import {properties} from "../../environments/environment";
</div> </div>
</div> </div>
</div> </div>
<div class="uk-section uk-container"> <div class="uk-margin-medium-top uk-margin-medium-bottom">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
</div> </div>

View File

@ -6,6 +6,8 @@ import {SearchOrcidServiceModule} from "../openaireLibrary/claims/claim-utils/se
import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
import {IconsService} from '../openaireLibrary/utils/icons/icons.service';
import {open_access} from '../openaireLibrary/utils/icons/icons';
const routes: Route[] = [ const routes: Route[] = [
{ {
@ -22,6 +24,10 @@ const routes: Route[] = [
declarations: [ResearcherComponent], declarations: [ResearcherComponent],
exports: [ResearcherComponent], exports: [ResearcherComponent],
}) })
export class ResearcherModule { } export class ResearcherModule {
constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([open_access]);
}
}

View File

@ -63,7 +63,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-large-top uk-margin-large-bottom"> <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
</div> </div>

View File

@ -6,6 +6,9 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module"; import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
import {open_access} from "../openaireLibrary/utils/icons/icons";
const routes: Route[] = [ const routes: Route[] = [
{ {
path: '', component: RfoComponent, children: [ path: '', component: RfoComponent, children: [
@ -22,4 +25,7 @@ const routes: Route[] = [
exports: [RfoComponent], exports: [RfoComponent],
}) })
export class RfoModule { export class RfoModule {
constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([open_access]);
}
} }

View File

@ -63,7 +63,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-large-top uk-margin-large-bottom"> <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
</div> </div>

View File

@ -6,6 +6,9 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module"; import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
import {open_access} from "../openaireLibrary/utils/icons/icons";
const routes: Route[] = [ const routes: Route[] = [
{ {
path: '', component: RpoComponent, children: [ path: '', component: RpoComponent, children: [
@ -22,4 +25,7 @@ const routes: Route[] = [
exports: [RpoComponent], exports: [RpoComponent],
}) })
export class RpoModule { export class RpoModule {
constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([open_access]);
}
} }