Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: renaming of the slots #266

Merged
merged 2 commits into from
Jun 4, 2024
Merged

feat: renaming of the slots #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab28814
feat: renaming of the slots
anninowak Jun 4, 2024
b28777a
feat: adapted slot names
anninowak Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions libs/shell-core/src/lib/components/portal-footer/portal-footer.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
<div class="ml-3 py-2 lg:ml-5 flex flex-wrap align-items-center justify-content-between row-gap-1">
<div class="flex flex-wrap align-items-center justify-content-start gap-3 row-gap-1">
<img *ngIf="logoUrl$ | async" alt="logo" class="max-h-1rem" [ocxSrc]="(logoUrl$ | async) ?? ''" (error)="onErrorHandleSrc()" />
<img
*ngIf="logoUrl$ | async"
alt="logo"
class="max-h-1rem"
[ocxSrc]="(logoUrl$ | async) ?? ''"
(error)="onErrorHandleSrc()"
/>
<div class="flex-none text-sm">&copy; {{copyrightMsg$ | async}}</div>
<ocx-slot name="footer"></ocx-slot>
<ocx-slot name="onecx-shell-footer"></ocx-slot>
</div>
<div class="mr-5 text-sm">{{versionInfo$ | async}}</div>
</div>
12 changes: 6 additions & 6 deletions libs/shell-core/src/lib/components/portal-header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<ng-content></ng-content>
</div>
<div class="layout-topbar-actions-right">
<ocx-slot name="headerRight" class="layout-topbar-items">
<ng-template #skeleton>
<div class="flex align-items-center h-full justify-content-center" style="width: 56px;">
<p-skeleton shape="circle" size="2.5rem" class="h-full flex align-items-center"></p-skeleton>
</div>
</ng-template>
<ocx-slot name="onecx-shell-headerRight" class="layout-topbar-items">
<ng-template #skeleton>
<div class="flex align-items-center h-full justify-content-center" style="width: 56px">
<p-skeleton shape="circle" size="2.5rem" class="h-full flex align-items-center"></p-skeleton>
</div>
</ng-template>
</ocx-slot>
<ul class="layout-topbar-items">
<!-- Only desktop: Actions (favorites, support, search, ...) as icon buttons -->
Expand Down
10 changes: 5 additions & 5 deletions libs/shell-core/src/lib/components/portal-viewport/portal-viewport.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
>
<ocx-shell-header [menuButtonTitle]="menuButtonTitle" (menuButtonClick)="onMenuButtonClick($event)">
<div *ngIf="isHorizontalMenuVisible()">
<ocx-slot name="horizontalMenu">
<ocx-slot name="onecx-shell-horizontalMenu">
<ng-template #skeleton>
<div class="ml-4 flex flex-row gap-4">
<p-skeleton class="w-full h-full inline-block" height="35px" width="120px"></p-skeleton>
<p-skeleton class="w-full h-full inline-block" height="35px" width="120px"></p-skeleton>
</div>
</ng-template>
</ng-template>
</ocx-slot>
</div>
</ocx-shell-header>
Expand All @@ -26,17 +26,17 @@

<div class="menu-wrapper">
<div class="layout-menu-container" *ngIf="isStaticalMenuVisible()">
<ocx-slot name="menu">
<ocx-slot name="onecx-shell-verticalMenu">
<ng-template #skeleton>
<p-skeleton class="w-full h-full mb-4 inline-block" height="35px" width="120px"></p-skeleton>
<p-skeleton class="w-full h-full mb-4 inline-block" height="35px" width="120px"></p-skeleton>
</ng-template>
</ocx-slot>
</div>
</div>

<div class="layout-main">
<div class="layout-content relative">
<ocx-slot name="subHeader"></ocx-slot>
<ocx-slot name="onecx-shell-subHeader"></ocx-slot>
<ng-container *ngIf="!showContentProvider || (showContentProvider.showContent$ | async)">
<ng-content></ng-content>
<router-outlet></router-outlet>
Expand Down
Loading