From 6a5d1e7c22806b14b177ea2278bed0c11eeedbdf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 19 Dec 2022 12:53:46 +0000 Subject: [PATCH] upd 19.12 --- plugins/tps/tps/models/media/fields.yaml | 5 + themes/modern2/meta/menus/new-top-menui.yaml | 121 ++++++++++++------ themes/modern2/pages/new/group.htm | 46 +++++-- themes/modern2/pages/new/home.htm | 6 +- themes/modern2/partials/new/footer.htm | 4 +- themes/modern2/partials/new/menu.htm | 10 +- themes/modern2/partials/new/mobile-menu.htm | 80 +++++------- themes/modern2/partials/new/post-featured.htm | 2 +- .../modern2/partials/newHome/main-popular.htm | 2 +- themes/modern2/partials/newHome/partners.htm | 2 +- themes/modern2/partials/newHome/photo.htm | 6 +- themes/modern2/partials/newHome/poleznoe.htm | 4 +- .../modern2/partials/newHome/popular-item.htm | 2 +- .../modern2/partials/newHome/video-item.htm | 17 ++- themes/modern2/partials/newHome/video.htm | 32 +++-- themes/modern2/partials/newMenu/menu.htm | 10 +- 16 files changed, 216 insertions(+), 133 deletions(-) diff --git a/plugins/tps/tps/models/media/fields.yaml b/plugins/tps/tps/models/media/fields.yaml index 7135adc92..e7f9311ef 100644 --- a/plugins/tps/tps/models/media/fields.yaml +++ b/plugins/tps/tps/models/media/fields.yaml @@ -15,6 +15,11 @@ fields: mode: file span: auto type: mediafinder + published_at: + label: 'Published At' + span: auto + mode: datetime + type: datepicker media_file: label: 'Media Files' prompt: 'Add new media file' diff --git a/themes/modern2/meta/menus/new-top-menui.yaml b/themes/modern2/meta/menus/new-top-menui.yaml index 816140c0a..469edfbca 100644 --- a/themes/modern2/meta/menus/new-top-menui.yaml +++ b/themes/modern2/meta/menus/new-top-menui.yaml @@ -101,24 +101,69 @@ items: cssClass: '' isExternal: '0' - - title: События - nesting: 0 - type: blog-category + title: Культура + type: url + url: /ru/new/posts/news/culture code: '' - reference: '9' - cmsPage: new/category - replace: 0 viewBag: locale: en: - title: '' - url: '' + title: Culture + url: /en/new/posts/news/culture tm: - title: '' + title: Medeniýet + url: /tm/new/posts/news/culture + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Спорт + type: url + url: /ru/new/posts/news/sport + code: '' + viewBag: + locale: + en: + title: Sport + url: /en/new/posts/news/sport + tm: + title: Sport + url: /tm/new/posts/news/sport + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Экомир + type: url + url: /ru/new/posts/news/eco-world + code: '' + viewBag: + locale: + en: + title: Eco-world + url: /en/new/posts/news/eco-world + tm: + title: Ekodünýä url: '' isHidden: '0' cssClass: '' isExternal: '0' + - + title: Технологии + type: url + url: /ru/new/posts/news/technology + code: '' + viewBag: + locale: + en: + title: Technology + url: /en/new/posts/news/technology + tm: + title: Tehnologiýalar + url: /tm/new/posts/news/tehnologiyalar + isHidden: '0' + cssClass: '' + isExternal: '0' - title: Статьи nesting: null @@ -140,6 +185,26 @@ items: cssClass: '' isExternal: '0' items: + - + title: События + nesting: null + type: url + url: /ru/new/posts/stati/events + code: '' + reference: null + cmsPage: null + replace: null + viewBag: + locale: + en: + title: '' + url: '' + tm: + title: '' + url: '' + isHidden: '0' + cssClass: '' + isExternal: '0' - title: Экономика nesting: null @@ -220,26 +285,6 @@ items: isHidden: '0' cssClass: '' isExternal: '0' - - - title: События - nesting: null - type: url - url: /ru/new/posts/stati/events - code: '' - reference: null - cmsPage: null - replace: null - viewBag: - locale: - en: - title: '' - url: '' - tm: - title: '' - url: '' - isHidden: '0' - cssClass: '' - isExternal: '0' - title: Полезное nesting: null @@ -261,7 +306,7 @@ items: cssClass: '' isExternal: '0' - - title: Media + title: Медиа nesting: null type: url url: /ru/new/posts/media @@ -272,17 +317,17 @@ items: viewBag: locale: en: - title: '' + title: Media url: '' tm: - title: '' + title: Media url: '' isHidden: '0' cssClass: '' isExternal: '0' items: - - title: Photo + title: Фото nesting: null type: url url: /ru/new/posts/media/photo @@ -293,16 +338,16 @@ items: viewBag: locale: en: - title: '' + title: Photo url: '' tm: - title: '' + title: Surat url: '' isHidden: '0' cssClass: '' isExternal: '0' - - title: Video + title: Видео nesting: null type: url url: /ru/new/posts/media/video @@ -313,10 +358,10 @@ items: viewBag: locale: en: - title: '' + title: Video url: '' tm: - title: '' + title: Wideo url: '' isHidden: '0' cssClass: '' diff --git a/themes/modern2/pages/new/group.htm b/themes/modern2/pages/new/group.htm index db1c915dc..ec46f20ce 100644 --- a/themes/modern2/pages/new/group.htm +++ b/themes/modern2/pages/new/group.htm @@ -19,30 +19,58 @@ postPage = "new/newPost" function onStart(){ //$this['backendUsers'] = Backend\Models\User::all(); $this['group'] = $this->param('categoryGroup'); + $this['categorySlug'] = $this->param('slug'); $this['groupName'] = RainLab\Blog\Models\CategoryGroup::where('slug', $this['group'])->first(); + + if($this['categorySlug']){ + $this['mediaPostsFilter'] = Tps\Tps\Models\Media::where('type', $this['categorySlug'])->get(); + }else{ + $this['mediaPostsFilter'] = Tps\Tps\Models\Media::all(); + } //dd( $this['groupName']); } ?> == +{% set records = media.records %} +{% set displayColumn = media.displayColumn %} +{% set noRecordsMessage = media.noRecordsMessage %} +{% set detailsPage = media.detailsPage %} +{% set detailsKeyColumn = media.detailsKeyColumn %} +{% set detailsUrlParameter = media.detailsUrlParameter %} + + +
-

{% if category.name != "" %}{{category.name}}{% else %} {{ groupName.name }} {% endif %}

+

{% if category.name != "" %}{{category.name}}{% else %} {% if group == 'media' %} {{ group }} {% else %}{{ groupName.name }}{% endif %} {% endif %}

-
+ {% if group == 'media' %} + +
+ {% for post in mediaPostsFilter %} + {% partial 'newHome/video-item' post=post %} + {% else %} +
  • {{ 'no Records' }}
    • + {% endfor %} +
    + + {% else %} +
    + {% for post in blogPosts.posts %} + {% partial 'new/post_list_item' post = post %} + {% else %} +

    No posts found

    + {% endfor %} +
    + {% endif %} - {% for post in blogPosts.posts %} - {% partial 'new/post_list_item' post = post %} - {% else %} -

    No posts found

    - {% endfor %} - -
    + {% partial 'new/pagination' items = blogPosts.posts %} diff --git a/themes/modern2/pages/new/home.htm b/themes/modern2/pages/new/home.htm index efc92587f..8ed0319fb 100644 --- a/themes/modern2/pages/new/home.htm +++ b/themes/modern2/pages/new/home.htm @@ -103,17 +103,17 @@ pageNumber = "{{ :page }}"
    -{% partial 'newHome/poleznoe' header="Полезное" header2="Новости медиа партнеров" %} +{% partial 'newHome/poleznoe' %}
    - {% partial 'newHome/video' header="Видеоархив" %} + {% partial 'newHome/video' %}
    - {% partial 'newHome/photo' header="Фотоархив" %} + {% partial 'newHome/photo' %}
    {% partial 'newHome/partners' header="" %} diff --git a/themes/modern2/partials/new/footer.htm b/themes/modern2/partials/new/footer.htm index 54fab1239..dabba181c 100644 --- a/themes/modern2/partials/new/footer.htm +++ b/themes/modern2/partials/new/footer.htm @@ -4,8 +4,8 @@

    - Copyright 2012- ORIENT - ИНФОРМАЦИОННОЕ - АГЕНТСТВО | Пользовательское соглашение + + Copyright 2012- {{'footer.copyright'|_}} | {{'Пользовательское соглашение'|_}}

    diff --git a/themes/modern2/partials/new/menu.htm b/themes/modern2/partials/new/menu.htm index a3075b82e..bb6a53316 100644 --- a/themes/modern2/partials/new/menu.htm +++ b/themes/modern2/partials/new/menu.htm @@ -27,12 +27,10 @@ code = "event_menu"
    {% for item2 in staticMenu2.menuItems %} - {% if not item2.isHidden %} - - {{ item2.title }} - - {% endif %} - {% endfor %} + + {{ item2.title }} + + {% endfor %} diff --git a/themes/modern2/partials/new/mobile-menu.htm b/themes/modern2/partials/new/mobile-menu.htm index 9239342fb..44e15bf76 100644 --- a/themes/modern2/partials/new/mobile-menu.htm +++ b/themes/modern2/partials/new/mobile-menu.htm @@ -2,6 +2,9 @@ [staticMenu] code = "new-top-menui" + +[staticMenu staticMenu2] +code = "event_menu" ==
    @@ -10,63 +13,50 @@ code = "new-top-menui"
    • -
    • -
    • -
      • diff --git a/themes/modern2/partials/new/post-featured.htm b/themes/modern2/partials/new/post-featured.htm index 34ca19216..e51169b28 100644 --- a/themes/modern2/partials/new/post-featured.htm +++ b/themes/modern2/partials/new/post-featured.htm @@ -12,7 +12,7 @@ postPage = 404 {% set posts = blogPosts.posts %}
      -

      Читайте также

      +

      {{'new.post.page.chitayte.takzhe'|_}}

      diff --git a/themes/modern2/partials/newHome/main-popular.htm b/themes/modern2/partials/newHome/main-popular.htm index 11efb0768..5e47b828f 100644 --- a/themes/modern2/partials/newHome/main-popular.htm +++ b/themes/modern2/partials/newHome/main-popular.htm @@ -35,7 +35,7 @@ pageNumber = "{{ :page }}"
      -

      От редактора

      +

      {{ 'new.home.ot.redaktora'|_ }}

      diff --git a/themes/modern2/partials/newHome/partners.htm b/themes/modern2/partials/newHome/partners.htm index a81a42d27..d4f824dea 100644 --- a/themes/modern2/partials/newHome/partners.htm +++ b/themes/modern2/partials/newHome/partners.htm @@ -26,7 +26,7 @@ pageNumber = "{{ :page }}"
      -

      Наши партнеры

      +

      {{ 'new.home.partner.header'|_ }}

      diff --git a/themes/modern2/partials/newHome/photo.htm b/themes/modern2/partials/newHome/photo.htm index 3a488872c..af67679d6 100644 --- a/themes/modern2/partials/newHome/photo.htm +++ b/themes/modern2/partials/newHome/photo.htm @@ -1,3 +1,5 @@ +[viewBag] + [blogPosts photo] pageNumber = "{{ :page }}" categoryFilter = "photo" @@ -6,13 +8,11 @@ noPostsMessage = "No posts found" sortOrder = "published_at desc" categoryPage = 404 postPage = 404 - -[viewBag] == {% set posts = photo.posts %}
      -

      {{ header }}

      +

      {{ 'new.page.photo.archive'|_ }}

      diff --git a/themes/modern2/partials/newHome/poleznoe.htm b/themes/modern2/partials/newHome/poleznoe.htm index f69773a25..5faf3bc55 100644 --- a/themes/modern2/partials/newHome/poleznoe.htm +++ b/themes/modern2/partials/newHome/poleznoe.htm @@ -26,7 +26,7 @@ postPage = 404
      -

      {{ header }}

      +

      {{ 'new.page.poleznoe'|_ }}

      @@ -43,7 +43,7 @@ postPage = 404
      -

      {{ header2 }}

      +

      {{ 'new.page.media.partner'|_ }}

      diff --git a/themes/modern2/partials/newHome/popular-item.htm b/themes/modern2/partials/newHome/popular-item.htm index 95a1bb3db..d4b4b00e8 100644 --- a/themes/modern2/partials/newHome/popular-item.htm +++ b/themes/modern2/partials/newHome/popular-item.htm @@ -11,7 +11,7 @@ postPage = "new/newPost"
      -

      Cамое читаемое

      +

      {{ 'new.page.samoe.chitaemoe'|_ }}

      diff --git a/themes/modern2/partials/newHome/video-item.htm b/themes/modern2/partials/newHome/video-item.htm index 084d73d81..392162d6d 100644 --- a/themes/modern2/partials/newHome/video-item.htm +++ b/themes/modern2/partials/newHome/video-item.htm @@ -1,9 +1,13 @@ [viewBag] == -
      -
      -
      - +
      +
      + {% if post.type == 'photo' %} + + {% else %} + + {% endif %} +
      @@ -12,8 +16,7 @@

      {{post.published_at|date('H:i')}}

      - {{post.title}} + {{post.name}}

      -
      -
      \ No newline at end of file +
      \ No newline at end of file diff --git a/themes/modern2/partials/newHome/video.htm b/themes/modern2/partials/newHome/video.htm index 51b798d35..0e322561a 100644 --- a/themes/modern2/partials/newHome/video.htm +++ b/themes/modern2/partials/newHome/video.htm @@ -1,30 +1,36 @@ [viewBag] -[blogPosts videos] +[builderList] +modelClass = "Tps\Tps\Models\Media" +scope = "-" +scopeValue = "{{ :scope }}" +displayColumn = "id" +noRecordsMessage = "No records found" +detailsPage = "-" +detailsUrlParameter = "id" pageNumber = "{{ :page }}" -categoryFilter = "video" -postsPerPage = 10 -noPostsMessage = "No posts found" -sortOrder = "published_at desc" -categoryPage = 404 -postPage = 404 == -{% set posts = videos.posts %} +{% set records = builderList.records %} +{% set displayColumn = builderList.displayColumn %} +{% set noRecordsMessage = builderList.noRecordsMessage %} +{% set detailsPage = builderList.detailsPage %} +{% set detailsKeyColumn = builderList.detailsKeyColumn %} +{% set detailsUrlParameter = builderList.detailsUrlParameter %}
      -

      {{ header }}

      +

      {{ 'new.page.video.archive'|_ }}

      - {% for post in posts %} - - {% partial 'newHome/video-item' post=post %} - + {% for post in records if post.type == 'video' %} +
      + {% partial 'newHome/video-item' post=post %} +
      {% endfor %} diff --git a/themes/modern2/partials/newMenu/menu.htm b/themes/modern2/partials/newMenu/menu.htm index 15decb134..98272ccb5 100644 --- a/themes/modern2/partials/newMenu/menu.htm +++ b/themes/modern2/partials/newMenu/menu.htm @@ -2,6 +2,9 @@ [staticMenu] code = "new-top-menui" + +[staticMenu staticMenu2] +code = "event_menu" ==
    - OGT + + {% for item2 in staticMenu2.menuItems %} + + {{ item2.title }} + + {% endfor %}