@@ -47,7 +47,7 @@
-
+
diff --git a/src/core/features/courses/pages/categories/categories.scss b/src/core/features/courses/pages/categories/categories.scss
new file mode 100644
index 000000000..b78cfbc5a
--- /dev/null
+++ b/src/core/features/courses/pages/categories/categories.scss
@@ -0,0 +1,7 @@
+ion-icon{
+ --webkit-margin-end: 16px !important;
+ margin-inline-end: 16px !important;
+ margin-block: 0 !important;
+ font-size: 2em;
+}
+
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index 225077261..e03815576 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -34,6 +34,7 @@ import { CoreAlerts } from '@services/overlays/alerts';
@Component({
selector: 'page-core-courses-categories',
templateUrl: 'categories.html',
+ styleUrl:'categories.scss',
})
export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
diff --git a/src/core/features/mainmenu/mainmenu-lazy.module.ts b/src/core/features/mainmenu/mainmenu-lazy.module.ts
index c4f027e96..46cfa5c8d 100644
--- a/src/core/features/mainmenu/mainmenu-lazy.module.ts
+++ b/src/core/features/mainmenu/mainmenu-lazy.module.ts
@@ -21,6 +21,7 @@ import { CoreMainMenuPage } from './pages/menu/menu';
import { CoreMainMenuHomeHandlerService } from './services/handlers/mainmenu';
import { CoreMainMenuComponentsModule } from './components/components.module';
import { MAIN_MENU_MORE_PAGE_NAME } from './constants';
+import { CoreSiteHomeMaterialPage } from '@features/mainmenu/pages/materials/materials';
/**
* Build module routes.
@@ -47,6 +48,10 @@ function buildRoutes(injector: Injector): Routes {
...mainMenuRoutes.children,
],
},
+ {
+ path: 'home/materials',
+ component: CoreSiteHomeMaterialPage,
+ },
...mainMenuRoutes.siblings,
];
}
@@ -58,6 +63,7 @@ function buildRoutes(injector: Injector): Routes {
],
declarations: [
CoreMainMenuPage,
+ CoreSiteHomeMaterialPage,
],
providers: [
{ provide: ROUTES, multi: true, useFactory: buildRoutes, deps: [Injector] },
diff --git a/src/core/features/mainmenu/pages/materials/materials.html b/src/core/features/mainmenu/pages/materials/materials.html
new file mode 100644
index 000000000..976e68e15
--- /dev/null
+++ b/src/core/features/mainmenu/pages/materials/materials.html
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Первая помощь
+
+ Скачать
+
+
+
+
+
+
+
+
+
+
+ Справочник тактической медицины
+
+ Скачать
+
+
+
+
+
+
+
+
+
+
+ Методические рекомендации по этапному лечению пораженных с боевой терапевтической патологией
+
+
+ Скачать
+
+
+
+
+
+
+
+
+
+ Указания по военно-полевой терапии
+
+ Скачать
+
+
+
+
+
+
+
+
+
+ Методические рекомендации по лечению боевой хирургической травмы
+
+ Скачать
+
+
+
+
+
diff --git a/src/core/features/mainmenu/pages/materials/materials.scss b/src/core/features/mainmenu/pages/materials/materials.scss
new file mode 100644
index 000000000..fec0c0ee8
--- /dev/null
+++ b/src/core/features/mainmenu/pages/materials/materials.scss
@@ -0,0 +1,40 @@
+.book-cell{
+ display: flex;
+ justify-content: space-around;
+ padding: 0.5em;
+}
+.book-img img{
+ max-height: 12vh;
+
+ border-radius: 10px;
+}
+
+.book-img{
+ display: flex;
+ min-width: fit-content;
+}
+
+.book-title{
+ color: white;
+}
+
+.book-see{
+ --background: white;
+ --color: #0031f3;
+ --border-radius: 50px !important;
+ margin: 0;
+ width: 100%;
+ min-height: 0;
+ padding: 5px;
+
+}
+
+.book-content{
+ width: -webkit-fill-available;
+ max-width: 400px;
+}
+
+ion-list, ion-item{
+ background: none;
+ --background: none;
+}
diff --git a/src/core/features/mainmenu/pages/materials/materials.ts b/src/core/features/mainmenu/pages/materials/materials.ts
new file mode 100644
index 000000000..a7f274750
--- /dev/null
+++ b/src/core/features/mainmenu/pages/materials/materials.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit} from '@angular/core';
+import {CoreViewer} from "@features/viewer/services/viewer";
+
+@Component({
+ selector: 'app-materials',
+ templateUrl: './materials.html',
+ styleUrls: ['./materials.scss'],
+})
+export class CoreSiteHomeMaterialPage implements OnInit {
+ title: string | undefined;
+
+ constructor() {
+
+ }
+
+ ngOnInit() {
+ this.title = "Материалы для скачивания";
+ }
+
+
+}
diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index fd46cbcf2..9a4e5e073 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -17,14 +17,15 @@
-
-
- {{ 'core.more' | translate }}
- {{ 'core.more' | translate }}
-
+
+
+ {{ 'core.settings' | translate }}
+ {{ 'core.settings' | translate }}
+
+
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 8f59e6d8f..c8dbc3ebe 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -385,6 +385,7 @@ class CoreMainMenuRoleTab extends CoreAriaRoleTab
{
id: tab.id || tab.page,
findIndex: tab.page,
}));
+ console.log(allTabs);
allTabs.push({
id: this.componentInstance.morePageName,
diff --git a/src/core/features/mainmenu/services/handlers/mainmenu.ts b/src/core/features/mainmenu/services/handlers/mainmenu.ts
index 44e9b186b..f48b0e022 100644
--- a/src/core/features/mainmenu/services/handlers/mainmenu.ts
+++ b/src/core/features/mainmenu/services/handlers/mainmenu.ts
@@ -42,7 +42,7 @@ export class CoreMainMenuHomeHandlerService implements CoreMainMenuHandler {
*/
getDisplayData(): CoreMainMenuHandlerData {
return {
- icon: 'fas-gauge-high',
+ icon: 'fas-home',
title: 'core.mainmenu.home',
page: CoreMainMenuHomeHandlerService.PAGE_NAME,
class: 'core-home-handler',
diff --git a/src/core/features/settings/classes/settings-sections-source.ts b/src/core/features/settings/classes/settings-sections-source.ts
index 7008d6c7e..df61353e5 100644
--- a/src/core/features/settings/classes/settings-sections-source.ts
+++ b/src/core/features/settings/classes/settings-sections-source.ts
@@ -54,11 +54,11 @@ export class CoreSettingsSectionsSource extends CoreRoutedItemsManagerSource
- 0">
+
{{ 'core.settings.enablerichtexteditor' | translate }}
@@ -65,12 +65,12 @@
-
+
{{ 'core.settings.enableanalytics' | translate }}
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index a4660153e..0bcbc07ad 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -50,7 +50,43 @@
-
+
+
+
+
+ Подача заявки на обучение по программам ДПО онлайн
+
+
+
+
+
+
+
+
+ Перечень программ и прейскурант стоимости обучения ДПО
+
+
+
+
+
+
+
+
+ Обратная связь
+
+
+
+
+
+
+
+
+
+
+ Скачать материалы
+
+
+
+
+
+
+
@@ -94,10 +146,12 @@
+
+
-
+
{{ 'core.courses.categories' | translate}}
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index f28b3f94d..c8e59d093 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -1,12 +1,36 @@
@use "theme/globals" as *;
+ion-item img{
+ max-width: 5em;
+ display: inline-block;
+ border-radius: 10px;
+ margin-block: 0.8em;
+ color: var(--text-color);
+ line-height: var(--size);
+ --margin-end: 8px;
+ @include margin-horizontal(null, var(--margin-end));
+}
+
+core-loading{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ justify-items: self-end;
+ height: 100%;
+}
+
+.list-item-limited-width{
+ margin: 0 !important;
+}
+
ion-item ion-icon {
display: inline-block;
+ font-size: 3em;
border-radius: var(--mdl-shape-borderRadius-xs);
padding: 4px;
color: var(--text-color);
line-height: var(--size);
- --margin-end: 8px;
+ --margin-inline: 0.32em;
@include margin-horizontal(null, var(--margin-end));
}
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 73b1cc46e..06bba0a8d 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -33,6 +33,8 @@ import { ContextLevel } from '@/core/constants';
import { CoreModals } from '@services/overlays/modals';
import { CoreAlerts } from '@services/overlays/alerts';
import { Translate } from '@singletons';
+import {CoreMainMenuCustomItem} from "@features/mainmenu/services/mainmenu";
+import {CoreViewer} from "@features/viewer/services/viewer";
/**
* Page that displays site home index.
@@ -222,6 +224,14 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
CoreNavigator.navigateToSitePath('courses/categories');
}
+ openMaterialsDownload(): void {
+ CoreNavigator.navigateToSitePath('materials');
+ }
+
+ openItem(label: string, url: string): void {
+ CoreViewer.openIframeViewer(label, url);
+ }
+
/**
* @inheritdoc
*/
diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index f9f2eda82..f37cb4529 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -33,9 +33,9 @@ body:not(.core-iframe-fullscreen) .collapsible-header-page {
&:not(.collapsible-header-page-is-collapsed) .collapsible-header-collapsed {
--core-header-toolbar-border-width: 0;
- --core-header-buttons-color: var(--text-color);
+ --core-header-buttons-color: var(--core-header-toolbar-color);
ion-toolbar {
- --background: transparent;
+ --background: -webkit-linear-gradient(135deg,#039615 0%,#3452ff 100%);
}
h1 {
diff --git a/src/theme/components/ion-header.scss b/src/theme/components/ion-header.scss
index 85ec1bf02..ef6fc61c2 100644
--- a/src/theme/components/ion-header.scss
+++ b/src/theme/components/ion-header.scss
@@ -125,7 +125,7 @@ ion-header.header-md {
--core-header-toolbar-border-width: 0;
--core-header-toolbar-background: transparent;
--core-header-shadow: none !important;
- --core-header-buttons-color: var(--text-color);
+ --core-header-buttons-color: var(--core-header-toolbar-color);
--core-header-buttons-background: var(--background);
}
}
diff --git a/tsconfig.json b/tsconfig.json
index 5d9f61597..3920ef9c9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
"downlevelIteration": true,
"experimentalDecorators": true,
"strictNullChecks": true,
- "strictPropertyInitialization": true,
+ "strictPropertyInitialization": false,
"forceConsistentCasingInFileNames": true,
"useDefineForClassFields": false,
"module": "esnext",