diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html index 534bc0a..2ce4d1a 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html @@ -5,6 +5,7 @@
{{position}}
{{phone}}
{{email}}
+
{{about}}
diff --git a/src/tk023/component/layout/right-content/right-content.component.html b/src/tk023/component/layout/right-content/right-content.component.html index e333607..b871571 100644 --- a/src/tk023/component/layout/right-content/right-content.component.html +++ b/src/tk023/component/layout/right-content/right-content.component.html @@ -1,4 +1,4 @@ -
+
Режим редактирования -
\ No newline at end of file +
\ No newline at end of file diff --git a/src/tk023/component/layout/right-content/right-content.component.ts b/src/tk023/component/layout/right-content/right-content.component.ts index 11e4b8e..e9c5fcf 100644 --- a/src/tk023/component/layout/right-content/right-content.component.ts +++ b/src/tk023/component/layout/right-content/right-content.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; import { PagesService } from '@app/_services/pages.service'; +import { AuthenticationService } from '@app/_services'; +import { Subscription } from 'rxjs'; @Component({ selector: 'right-content', @@ -7,10 +9,27 @@ import { PagesService } from '@app/_services/pages.service'; styleUrls: ['./right-content.component.scss'] }) export class RightContentComponent { + + private subscription:Subscription + public currentPage:any; + constructor( private pagesService: PagesService, + public authService: AuthenticationService, ){} + ngOnInit(){ + this.subscription = this.pagesService.currentPageSubject.subscribe( + resp=> { + this.currentPage = resp; + } + ) + } + + ngOnDestoy(){ + this.subscription.unsubscribe(); + } + get editMode(){ return this.pagesService.editMode; } @@ -18,6 +37,8 @@ export class RightContentComponent { toggleEditMode(){ this.pagesService.editMode = !this.pagesService.editMode; } - + get editable(){ + return this.currentPage&&(this.authService.privileges?.admin|| this.authService.privileges?.editor); + } } diff --git a/src/tk023/css/_grid.scss b/src/tk023/css/_grid.scss index 64ca583..bb5754f 100644 --- a/src/tk023/css/_grid.scss +++ b/src/tk023/css/_grid.scss @@ -38,7 +38,7 @@ margin-top: 50px; } right-content{ - + flex-basis: 272px; }; } diff --git a/src/tk023/css/_pages-section.scss b/src/tk023/css/_pages-section.scss index f5a639c..0f20647 100644 --- a/src/tk023/css/_pages-section.scss +++ b/src/tk023/css/_pages-section.scss @@ -205,17 +205,7 @@ cards-section-items{ flex-direction: column; gap: 16px; .image{ - width: 100%; - height: 338px; - border-radius: 12px; - border: 1px solid var(--second-dis); - background: url('../images/view-man.svg') var(--white) center / 65% no-repeat; - overflow: hidden; - img{ - object-fit: cover; - width: 100%; - height: 100%; - } + display: none; } .title{ font-family: PT Sans Narrow; diff --git a/src/tk023/css/_registry.scss b/src/tk023/css/_registry.scss index 066a1c0..536b060 100644 --- a/src/tk023/css/_registry.scss +++ b/src/tk023/css/_registry.scss @@ -171,7 +171,7 @@ registry-entry { display: inline-flex; gap: 24px; } - .toggle { + .toggle, drop-down { margin-left: auto; button { diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index de00b3a..db0812f 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -196,6 +196,9 @@ cards-section-items{ .email{ color:var(--prime) } + .html{ + display: none; + } .details a{ display: inline-flex; align-items: center;