diff --git a/src/app/_modules/widjet/cms-modal/cms-modal.component.ts b/src/app/_modules/widjet/cms-modal/cms-modal.component.ts
index 8bb76b8..ea14631 100644
--- a/src/app/_modules/widjet/cms-modal/cms-modal.component.ts
+++ b/src/app/_modules/widjet/cms-modal/cms-modal.component.ts
@@ -1,4 +1,4 @@
-import { Component, Output, EventEmitter } from '@angular/core';
+import { Component, Input, Output, EventEmitter } from '@angular/core';
import {WindowScrollingService} from "@app/_services/window-scrolling.service";
@Component({
@@ -8,6 +8,7 @@ import {WindowScrollingService} from "@app/_services/window-scrolling.service";
})
export class CmsModalComponent {
@Output() close = new EventEmitter();
+ @Input() blocked:boolean;
constructor( private windowScrollingService: WindowScrollingService ){}
diff --git a/src/app/_services/dialog.service.ts b/src/app/_services/dialog.service.ts
index 7a869ad..90684c3 100644
--- a/src/app/_services/dialog.service.ts
+++ b/src/app/_services/dialog.service.ts
@@ -8,6 +8,7 @@ export class DialogService {
public modalAllertSubject = new BehaviorSubject(null)
public modalPromptSubject = new BehaviorSubject(null);
+ public modalWaitingSubject = new BehaviorSubject(null);
public modalRespSubject = new BehaviorSubject(null);
private userResp: BehaviorSubject
@@ -26,10 +27,15 @@ export class DialogService {
alert(txt:string){
this.modalAllertSubject.next(txt)
}
+
confirm(txt:string){
this.modalPromptSubject.next(txt);
this.userResp = new BehaviorSubject(null)
return this.userResp;
}
+ waiting(txt:string){
+ this.modalWaitingSubject.next(txt);
+ }
+
}
\ No newline at end of file
diff --git a/src/app/_services/licence.service.ts b/src/app/_services/licence.service.ts
index c0296f6..f4cf84f 100644
--- a/src/app/_services/licence.service.ts
+++ b/src/app/_services/licence.service.ts
@@ -58,7 +58,7 @@ export class LicenceService {
}
public checkEditAvailability(page?: any) {
- if (!this.isActive) return this.error('Licence not active');
+ if (!this.isActive) return this.error('Срок действия лицензии истек. Режим редактирования не доступен. Продлите лицензию или обратитесь в службу поддержки НИР (+7 499 490 04 65, help@nirgroup.ru)');
if ((page?.type?.name === 'registry') && !this.hasOption('registries')) return this.error('Срок действия лицензии истек. Режим редактирования не доступен. Продлите лицензию или обратитесь в службу поддержки НИР (+7 499 490 04 65, help@nirgroup.ru)');
if ((page?.type?.name === 'publications') && !this.hasOption('publications')) return this.error('Данная опция не входит в Вашу лицензию. Для включения опции обратитесь в службу поддержки НИР (+7 499 490 04 65, help@nirgroup.ru)');
return null;
diff --git a/src/assets/css/_basics.scss b/src/assets/css/_basics.scss
index c438a1a..c8e2ad8 100644
--- a/src/assets/css/_basics.scss
+++ b/src/assets/css/_basics.scss
@@ -172,6 +172,24 @@ button.mat-calendar-body-cell{
font-weight: 400;
}
+.mat-calendar-body-cell-content{
+ font-family: PT Sans;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 24px;
+ width: 32px !important;
+ height: 32px !important;
+}
+
+.mat-calendar-body-cell-preview{
+ font-family: PT Sans;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 24px;
+}
+
.tox-promotion, .tox-statusbar__branding {
display: none!important;
}
diff --git a/src/nir/css/_basics.scss b/src/nir/css/_basics.scss
index 8e5c301..5547ccd 100644
--- a/src/nir/css/_basics.scss
+++ b/src/nir/css/_basics.scss
@@ -161,6 +161,17 @@ button.mat-calendar-body-cell{
font-weight: 400;
}
+
+.mat-calendar-body-cell-content{
+ font-family: PT Sans;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 24px;
+ width: 32px !important;
+ height: 32px !important;
+}
+
.tox-promotion, .tox-statusbar__branding {
display: none!important;
}
diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss
index c4544e7..f15618a 100644
--- a/src/vniigaz-v2/css/_basics.scss
+++ b/src/vniigaz-v2/css/_basics.scss
@@ -157,6 +157,16 @@ button.mat-calendar-body-cell{
font-weight: 400;
}
+.mat-calendar-body-cell-content{
+ font-family: PT Sans;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 24px;
+ width: 32px !important;
+ height: 32px !important;
+}
+
.tox-promotion, .tox-statusbar__branding {
display: none!important;
}