From 8cd156e36284704072930b6f71105af904dc5e1f Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Dec 2022 14:05:40 +0000 Subject: [PATCH] from server 17.12 --- themes/modern2/meta/menus/new-top-menui.yaml | 191 +++++++++++++++--- .../modern2/partials/newHome/main-popular.htm | 2 +- .../modern2/partials/newHome/main-tender.htm | 2 +- themes/modern2/partials/newHome/poleznoe.htm | 3 +- .../modern2/partials/newHome/popular-item.htm | 8 +- themes/modern2/partials/newMenu/menu.htm | 8 +- 6 files changed, 177 insertions(+), 37 deletions(-) diff --git a/themes/modern2/meta/menus/new-top-menui.yaml b/themes/modern2/meta/menus/new-top-menui.yaml index 410cee67d..8356e1d0c 100644 --- a/themes/modern2/meta/menus/new-top-menui.yaml +++ b/themes/modern2/meta/menus/new-top-menui.yaml @@ -3,6 +3,7 @@ items: title: Новости nesting: 0 type: blog-category + url: null code: '' reference: '9' cmsPage: new/category @@ -39,15 +40,93 @@ items: isHidden: '0' cssClass: '' isExternal: '0' + - + title: Watan + nesting: 0 + type: blog-category + code: '' + reference: '804' + cmsPage: new/category + replace: 0 + viewBag: + locale: + en: + title: Watan + url: '' + tm: + title: Watan + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' - title: Экономика nesting: 0 type: blog-category - url: null code: '' reference: '5' cmsPage: new/category replace: 0 + viewBag: + locale: + en: + title: Economy + url: '' + tm: + title: Ykdysadyýet + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Общество + nesting: 0 + type: blog-category + code: '' + reference: '12' + cmsPage: new/category + replace: 0 + viewBag: + locale: + en: + title: Society + url: '' + tm: + title: Jemgyýet + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Статьи + nesting: 0 + type: blog-category + url: null + code: '' + reference: '5' + cmsPage: new/category + replace: 0 + viewBag: + locale: + en: + title: '' + url: '' + tm: + title: '' + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + items: + - + title: Экономика + nesting: null + type: category-blog-posts + url: null + code: '' + reference: '5' + cmsPage: new/newPost + replace: 0 viewBag: locale: en: @@ -60,13 +139,93 @@ items: cssClass: '' isExternal: '0' - - title: Культура - nesting: 0 - type: blog-category + title: Экомир + nesting: null + type: category-blog-posts url: null code: '' - reference: '8' - cmsPage: new/category + reference: '13' + cmsPage: new/newPost + replace: 0 + viewBag: + locale: + en: + title: '' + url: '' + tm: + title: '' + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Технологии + nesting: null + type: category-blog-posts + url: null + code: '' + reference: '11' + cmsPage: new/newPost + replace: 0 + viewBag: + locale: + en: + title: '' + url: '' + tm: + title: '' + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Спорт + nesting: null + type: category-blog-posts + url: null + code: '' + reference: '10' + cmsPage: new/newPost + replace: 0 + viewBag: + locale: + en: + title: '' + url: '' + tm: + title: '' + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: События + nesting: null + type: category-blog-posts + url: null + code: '' + reference: '9' + cmsPage: new/newPost + replace: 0 + viewBag: + locale: + en: + title: '' + url: '' + tm: + title: '' + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Полезное + nesting: null + type: category-blog-posts + url: null + code: '' + reference: '803' + cmsPage: new/newPost replace: 0 viewBag: locale: @@ -79,26 +238,6 @@ items: isHidden: '0' cssClass: '' isExternal: '0' - - - title: Статьи - nesting: null - type: url - url: / - code: '' - reference: null - cmsPage: null - replace: null - viewBag: - locale: - en: - title: '' - url: '' - tm: - title: '' - url: '' - isHidden: '0' - cssClass: '' - isExternal: '0' - title: Media nesting: null diff --git a/themes/modern2/partials/newHome/main-popular.htm b/themes/modern2/partials/newHome/main-popular.htm index 12b3c42b4..7a377c77c 100644 --- a/themes/modern2/partials/newHome/main-popular.htm +++ b/themes/modern2/partials/newHome/main-popular.htm @@ -2,7 +2,7 @@ [blogPosts byEditor] pageNumber = "{{ :page }}" -categoryFilter = "technology" +categoryFilter = "ot-redaktora" postsPerPage = 1 noPostsMessage = "No posts found" sortOrder = "published_at desc" diff --git a/themes/modern2/partials/newHome/main-tender.htm b/themes/modern2/partials/newHome/main-tender.htm index 4ecd6e017..272392e18 100644 --- a/themes/modern2/partials/newHome/main-tender.htm +++ b/themes/modern2/partials/newHome/main-tender.htm @@ -10,7 +10,7 @@ $this['afisha'] = RainLab\Blog\Models\CategoryGroup::where('slug', 'afisha')->wi ==
-

Тендеры

+

Watan

{% for post in categoryPosts %} diff --git a/themes/modern2/partials/newHome/poleznoe.htm b/themes/modern2/partials/newHome/poleznoe.htm index 66118e16b..619610152 100644 --- a/themes/modern2/partials/newHome/poleznoe.htm +++ b/themes/modern2/partials/newHome/poleznoe.htm @@ -2,7 +2,8 @@ [blogPosts poleznoe] pageNumber = "{{ :page }}" -postsPerPage = 5 +categoryFilter = "poleznoe" +postsPerPage = 8 noPostsMessage = "No posts found" sortOrder = "published_at desc" categoryPage = 404 diff --git a/themes/modern2/partials/newHome/popular-item.htm b/themes/modern2/partials/newHome/popular-item.htm index 002ac7481..95a1bb3db 100644 --- a/themes/modern2/partials/newHome/popular-item.htm +++ b/themes/modern2/partials/newHome/popular-item.htm @@ -1,10 +1,10 @@ +[viewBag] + [popularPosts] category = "{{ :category }}" -postsLimit = 4 +postsLimit = 5 noPostsMessage = "No posts found" -postPage = 404 - -[viewBag] +postPage = "new/newPost" == {% set posts = popularPosts.posts %} diff --git a/themes/modern2/partials/newMenu/menu.htm b/themes/modern2/partials/newMenu/menu.htm index 973218292..13f80ac3f 100644 --- a/themes/modern2/partials/newMenu/menu.htm +++ b/themes/modern2/partials/newMenu/menu.htm @@ -14,12 +14,12 @@ code = "new-top-menui"
  • - {{ item.title }} -