diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index 3e5086a..4147cef 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -32,15 +32,15 @@ export class PageComponent { get permissions() { return this.page?.permissions; } + get isEditable() { return this.permissions?.edit || this.permissions?.anything; } + get pageTopName(){ - return this.page?.parents?.data[2]?.name; + return this.page?.parents?.data[1]?.name; } - - ngOnInit() { this.listsService.controls().subscribe(res => { this.inited ? this.fetch() : this.inited = true; @@ -51,7 +51,6 @@ export class PageComponent { this.routeSubscription?.unsubscribe(); } - onNavigationEnd(event: NavigationEnd) { let url = event.url.split('(')[0]; url = url.split('?')[0]; diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html index 5890e18..8296117 100644 --- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html @@ -1,9 +1,9 @@
-
+
-

+
-
+
diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss index 6231e34..2260564 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss @@ -168,6 +168,7 @@ width: auto; height: 100%; max-height: calc(100vh - 2 * 24px); + background-color: #fff; } } .right { diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss index 90de881..328718f 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -157,6 +157,7 @@ height: 100vh; object-fit: contain; cursor: pointer; + } .modal{ position: fixed;