upd 19.12

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'

themes/modern2/meta/menus/new-top-menui.yaml

@@ -101,24 +101,69 @@ items:
                     cssClass: ''
                     isExternal: '0'
             -
-                title: События
+                title: Культура
-                nesting: 0
+                type: url
-                type: blog-category
+                url: /ru/new/posts/news/culture
                 code: ''
-                reference: '9'
-                cmsPage: new/category
-                replace: 0
                 viewBag:
                     locale:
                         en:
-                            title: ''
+                            title: Culture
-                            url: ''
+                            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: ''

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 %}
+
+
+
 <!-- HEAD end ======== -->
   <main class="rubric-main">
     <div class="container">
       <div class="rubric-inner">
         <div class="trending-head">
-          <h2>{% if category.name != "" %}{{category.name}}{% else %} {{ groupName.name }} {% endif %}</h2>
+          <h2 style="text-transform: capitalize;">{% if category.name != "" %}{{category.name}}{% else %} {% if group == 'media' %} {{ group }} {% else %}{{ groupName.name }}{% endif %} {% endif %}</h2>
           <span></span>
         </div>
         
         
-        <div class="rubric-items">
+            {% if group == 'media' %}
+            
+                <div class="video-main-top {% if categorySlug == 'photo' %} photo-main-top {% endif %}">
+                    {% for post in mediaPostsFilter %}
+                        {% partial 'newHome/video-item' post=post %}
+                    {% else %}
+                        <li class="no-data">{{ 'no Records' }}</li>
+                    {% endfor %}
+               </div>
+            
+            {% else %}
+                <div class="rubric-items">
+                    {% for post in blogPosts.posts %}
+                        {% partial 'new/post_list_item' post = post %}
+                    {% else %}
+                        <p>No posts found</p>
+                    {% endfor %}
+                 </div>
+            {% endif %}
         
-         {% for post in blogPosts.posts %}
+       
-            {% partial 'new/post_list_item' post = post %}
-        {% else %}
-            <p>No posts found</p>
-        {% endfor %}
-        
-        </div>
         
        {% partial 'new/pagination' items = blogPosts.posts %}
         

themes/modern2/pages/new/home.htm

@@ -103,17 +103,17 @@ pageNumber = "{{ :page }}"
 </div>
 </section>
 
-{% partial 'newHome/poleznoe' header="Полезное" header2="Новости медиа партнеров" %}
+{% partial 'newHome/poleznoe' %}
 
   <section class="media">
     <div class="container">
       <div class="media-inner">
         <div class="media-videos">
-             {% partial 'newHome/video' header="Видеоархив" %}
+             {% partial 'newHome/video' %}
         </div>
        
         <div class="media-videos media-photos">
-             {% partial 'newHome/photo' header="Фотоархив" %}
+             {% partial 'newHome/photo' %}
         </div>
         
             {% partial 'newHome/partners' header="" %}

themes/modern2/partials/new/footer.htm

@@ -4,8 +4,8 @@
 <div class="container">
   <div class="footer-inner">
     <p>
-      Copyright 2012-<span id="year"></span> ORIENT - ИНФОРМАЦИОННОЕ
+<!--      Copyright 2012-{{ 'now' | date('Y')}} {{'footer.copyright'|_}} |<a href="" style="color: white !important;">{{'Пользовательское соглашение'|_}} </a> -->
-      АГЕНТСТВО | Пользовательское соглашение
+      Copyright 2012-<span id="year"></span> {{'footer.copyright'|_}} | {{'Пользовательское соглашение'|_}}
     </p>
   </div>
 </div>

themes/modern2/partials/new/menu.htm

@@ -27,12 +27,10 @@ code = "event_menu"
           <div class="nav-right">
           
            {% for item2 in staticMenu2.menuItems %}
-                {% if not item2.isHidden %}
+                
-                 
+                  <a href="{{ item2.url }}" class="nav-right-link" style="{% if item2.viewBag.isHidden %} display:none; {% endif %}">{{ item2.title }}</a>
-                  <a href="{{ item2.url }}" class="nav-right-link">{{ item2.title }}</a>
+                
-                 
+           {% endfor %}
-                {% endif %}
-            {% endfor %}
             
             
             

themes/modern2/partials/new/mobile-menu.htm

@@ -2,6 +2,9 @@
 
 [staticMenu]
 code = "new-top-menui"
+
+[staticMenu staticMenu2]
+code = "event_menu"
 ==
 <div class="burger-wrapper">
   <div class="burger-close">
@@ -10,63 +13,50 @@ code = "new-top-menui"
   
   <div class="burger-content">
     <ul class="burger-list">
-      <li class="burger-list-li">
+    
-        <h4 class="burger-item burger-news">Новости</h4>
+    {% for item in staticMenu.menuItems %}
-        <ul class="burger-nested-list burger-news-items">
+        {% if not item.viewBag.isHidden and item.items|length %}
-          <li><a href="#">Cобытия</a></li>
+        
-          <li><a href="#">Общество</a></li>
+           <li class="burger-list-li">
-          <li><a href="#">Экономика</a></li>
+            <h4 class="burger-item burger-news">{{ item.title }}</h4>
-          <li><a href="#">Культура</a></li>
+            <ul class="burger-nested-list burger-news-items">
-          <li><a href="#">Экомир</a></li>
+             
-          <li><a href="#">Спорт</a></li>
+              {% for item in item.items %}
-          <li><a href="#">Технологии</a></li>
+                  <li><a href="{{ item.url }}">{{ item.title }}</a></li>
-          <li><a href="#">Выборы-2022</a></li>
+              {% endfor %}
-        </ul>
+            </ul>
-      </li>
+          </li>
-      <li class="burger-list-li burger-affiche">
+          
-        <h4 class="burger-item">Афиша</h4>
+        {% elseif not item.viewBag.isHidden %}
-        <ul class="burger-nested-list burger-affiche-items">
+
-          <li><a href="#">Концерты</a></li>
+          <li class="burger-list-li">
-          <li><a href="#">Театры</a></li>
+            <a href="{{ item.url }}" class="burger-item">{{ item.title }}</a>
-          <li><a href="#">Кинотеатры</a></li>
+          </li>
-          <li><a href="#">Выставки</a></li>
+        {% endif %}
-          <li><a href="#">Объявления</a></li>
+    {% endfor %}
-          <li><a href="#">Спорт</a></li>
+     
-        </ul>
+      
-      </li>
+       {% for item2 in staticMenu2.menuItems %}
-      <li class="burger-list-li">
+             <li class="burger-list-li green" style="{% if item2.viewBag.isHidden %} display:none; {% endif %}">
-        <a href="#" class="burger-item">Публикации</a>
+                <a href="{{ item2.url }}" class="burger-item">{{ item2.title }}</a>
-      </li>
+              </li>
-      <li class="burger-list-li">
+       {% endfor %}
-        <a href="#" class="burger-item">Спецпроекты</a>
+     
-      </li>
-      <li class="burger-list-li">
-        <a href="#" class="burger-item">Справочник</a>
-      </li>
-      <li class="burger-list-li">
-        <a href="#" class="burger-item">О нас</a>
-      </li>
-      <li class="burger-list-li">
-        <a href="#" class="burger-item">Контакты</a>
-      </li>
-      <li class="burger-list-li green">
-        <a href="https://ogt-turkmenistan.com" target="_blank" class="burger-item">OGT</a>
-      </li>
     </ul>
     <div class="burger-lang">
       <ul>
         <li>
-          <button>
+          <button data-request="onSwitchLocale" data-request-data="locale: 'ru'">
             <img src="{{ 'assets/new/icons/ruflag.svg'|theme}}" alt="" />
           </button>
         </li>
         <li>
-          <button>
+          <button data-request="onSwitchLocale" data-request-data="locale: 'en'">
             <img src="{{ 'assets/new/icons/ukflag.svg'|theme}}" alt="" />
           </button>
         </li>
         <li>
-          <button>
+          <button data-request="onSwitchLocale" data-request-data="locale: 'tm'">
             <img src="{{ 'assets/new/icons/tmflag.svg'|theme}}" alt="" />
           </button>
         </li>

themes/modern2/partials/new/post-featured.htm

@@ -12,7 +12,7 @@ postPage = 404
 {% set posts = blogPosts.posts %}
 
 <div class="article-content-bottom">
-  <h3>Читайте также</h3>
+  <h3>{{'new.post.page.chitayte.takzhe'|_}}</h3>
   <div class="article-swiper-wrapper-lower">
     <div class="swiper articleBottomSwiper">
       <div class="swiper-wrapper">

themes/modern2/partials/newHome/main-popular.htm

@@ -35,7 +35,7 @@ pageNumber = "{{ :page }}"
       <div class="trending-inner">
         <div class="trending-aside">
           <div class="trending-head">
-            <h2>От редактора</h2>
+            <h2>{{ 'new.home.ot.redaktora'|_ }}</h2>
             <span></span>
           </div>
           

themes/modern2/partials/newHome/partners.htm

@@ -26,7 +26,7 @@ pageNumber = "{{ :page }}"
    
 
 <div class="partners">
-  <h2 class="partners-head">Наши партнеры</h2>
+  <h2 class="partners-head">{{ 'new.home.partner.header'|_ }}</h2>
   <div class="partners-content">
     <div class="swiper partnerSwiper">
       <div class="swiper-wrapper">

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 %}
 
 <div class="trending-head media-head">
-<h2>{{ header }}</h2>
+<h2>{{ 'new.page.photo.archive'|_ }}</h2>
 <span></span>
 </div>
 <div class="trending-content">

themes/modern2/partials/newHome/poleznoe.htm

@@ -26,7 +26,7 @@ postPage = 404
       <div class="useful-inner">
         <div class="trending-main useful-main">
           <div class="trending-head">
-            <h2>{{ header }}</h2>
+            <h2>{{ 'new.page.poleznoe'|_ }}</h2>
             <span></span>
           </div>
           <div class="useful-main-content trending-main-content">
@@ -43,7 +43,7 @@ postPage = 404
         
         <div class="useful-aside">
           <div class="trending-head">
-            <h2>{{ header2 }}</h2>
+            <h2>{{ 'new.page.media.partner'|_ }}</h2>
             <span></span>
           </div>
           <div class="useful-aside-content">

themes/modern2/partials/newHome/popular-item.htm

@@ -11,7 +11,7 @@ postPage = "new/newPost"
 
 <div class="trending-main">
   <div class="trending-head">
-    <h2>Cамое читаемое</h2>
+    <h2>{{ 'new.page.samoe.chitaemoe'|_ }}</h2>
     <span></span>
   </div>
   <div class="trending-main-content">

themes/modern2/partials/newHome/video-item.htm

@@ -1,9 +1,13 @@
 [viewBag]
 ==
-<div class="swiper-slide">
+<div class="video-item {% if post.type == 'photo' %} photo-item {% endif %}">
-  <div class="video-item">
+    <div class="video {% if post.type == 'photo' %} photo {% endif %}">
-    <div class="video">
+      {% if post.type == 'photo' %} 
-      <video src="{{'assets/new/videos/placeholder.mp4'|theme}}" controls></video>
+          <img src="{{post.poster_file|media|resize(683, 385, )}}">
+      {% else %}
+          <video src="{{post.media_file[0].media|media}}" controls poster="{{post.poster_file|media}}" ></video>
+      {% endif %}
+      
     </div>
     <div class="sub-news-left-content-item-content video-info">
       <div class="sub-news-left-content-item-date-content-head">
@@ -12,8 +16,7 @@
         <h4> {{post.published_at|date('H:i')}}</h4>
       </div>
       <p class="sub-news-left-content-item-date-content-info">
-         {{post.title}}
+         {{post.name}}
       </p>
     </div>
-  </div>
+  </div>
-</div>

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 %}
 
 
 
 <div class="trending-head media-head">
-    <h2>{{ header }}</h2>
+    <h2>{{ 'new.page.video.archive'|_ }}</h2>
     <span></span>
 </div>
 <div class="trending-content">
     <div class="swiper videoSwiper">
           <div class="swiper-wrapper">
         
-            {% for post in posts %}
+            {% for post in records if post.type == 'video' %}
-                
+                <div class="swiper-slide">
-                {% partial 'newHome/video-item' post=post %}
+                    {% partial 'newHome/video-item' post=post %}
-                
+                </div>
             {% endfor %}
             
             

themes/modern2/partials/newMenu/menu.htm

@@ -2,6 +2,9 @@
 
 [staticMenu]
 code = "new-top-menui"
+
+[staticMenu staticMenu2]
+code = "event_menu"
 ==
 <nav class="nav">
     <section class="nav-top">
@@ -38,7 +41,12 @@ code = "new-top-menui"
             </ul>
           </div>
           <div class="nav-right">
-            <a class="nav-right-link">OGT</a>
+            
+            {% for item2 in staticMenu2.menuItems %}
+                
+                  <a href="{{ item2.url }}" class="nav-right-link" style="{% if item2.viewBag.isHidden %} display:none; {% endif %}">{{ item2.title }}</a>
+                
+           {% endfor %}
             
             <ul class="nav-lang">
               <li>