from server 19.12

plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php

@@ -32,7 +32,7 @@ class postsController extends Controller
             'category'         => input('category'),
             'date'             => input('date'),
             'typePost'             => input('typePost'),
-            'group'             => input('group'),
+            'postGroup'             => input('group'),
             'published'        => true,
             'featured'        => input('featured'),
             'select'   => ['id','title','slug','published_at',DB::raw("IF(featured_image<>'',concat('$path',featured_image),featured_image) as main_image")]

plugins/rainlab/blog/components/Posts.php

@@ -229,7 +229,7 @@ class Posts extends ComponentBase
             'perPage'          => $this->property('postsPerPage'),
             'featured'         => $featured,
             'typePost'         => empty($this->property('typePost')) ? null : $this->property('typePost'),
-            'group'         => empty($this->property('categoryGroup')) ? null : $this->property('categoryGroup'),
+            'postGroup'         => empty($this->property('categoryGroup')) ? null : $this->property('categoryGroup'),
             'search'           => trim(input('q')),
             'category'         => $category,
             'date'             => input('date'),

plugins/rainlab/blog/models/Post.php

@@ -373,7 +373,7 @@ class Post extends Model
             'select'           => null,
             'featured'         => null,
             'typePost'         => null,
-            'group'          => null,
+            'postGroup'          => null,
         ], $options));
 
         $searchableFields = ['title', 'slug', 'excerpt'];
@@ -479,11 +479,11 @@ class Post extends Model
         /*
          * Category, including children
          */
-        if ($group !== null) {
+        if ($postGroup !== null) {
 
 //            dd($categories);
-            $query->whereHas('category_groups', function($q) use ($group) {
-                $q->where('rainlab_blog_post_cat_group.category_group_id', $group);
+            $query->whereHas('category_groups', function($q) use ($postGroup) {
+                $q->where('slug', $postGroup);
             });
         }
 

plugins/tps/reklama/models/group/columns.yaml

@@ -15,3 +15,7 @@ columns:
         sortable: true
         relation: adds_count
         valueFrom: count
+    id:
+        label: ID
+        type: number
+        sortable: true

plugins/tps/tps/controllers/Media.php

@@ -0,0 +1,18 @@
+<?php namespace Tps\Tps\Controllers;
+
+use Backend\Classes\Controller;
+use BackendMenu;
+
+class Media extends Controller
+{
+    public $implement = [        'Backend\Behaviors\ListController',        'Backend\Behaviors\FormController'    ];
+    
+    public $listConfig = 'config_list.yaml';
+    public $formConfig = 'config_form.yaml';
+
+    public function __construct()
+    {
+        parent::__construct();
+        BackendMenu::setContext('Tps.Tps', 'main-menu-item');
+    }
+}

plugins/tps/tps/controllers/media/_list_toolbar.htm

@@ -0,0 +1,18 @@
+<div data-control="toolbar">
+        <a href="<?= Backend::url('tps/tps/media/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
+            <button
+        class="btn btn-default oc-icon-trash-o"
+        disabled="disabled"
+        onclick="$(this).data('request-data', {
+            checked: $('.control-list').listWidget('getChecked')
+        })"
+        data-request="onDelete"
+        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
+        data-trigger-action="enable"
+        data-trigger=".control-list input[type=checkbox]"
+        data-trigger-condition="checked"
+        data-request-success="$(this).prop('disabled', true)"
+        data-stripe-load-indicator>
+        <?= e(trans('backend::lang.list.delete_selected')) ?>
+    </button>
+</div>

plugins/tps/tps/controllers/media/config_form.yaml

@@ -0,0 +1,10 @@
+name: Media
+form: $/tps/tps/models/media/fields.yaml
+modelClass: Tps\Tps\Models\Media
+defaultRedirect: tps/tps/media
+create:
+    redirect: 'tps/tps/media/update/:id'
+    redirectClose: tps/tps/media
+update:
+    redirect: tps/tps/media
+    redirectClose: tps/tps/media

plugins/tps/tps/controllers/media/config_list.yaml

@@ -0,0 +1,12 @@
+list: $/tps/tps/models/media/columns.yaml
+modelClass: Tps\Tps\Models\Media
+title: Media
+noRecordsMessage: 'backend::lang.list.no_records'
+showSetup: true
+showCheckboxes: true
+recordsPerPage: 20
+toolbar:
+    buttons: list_toolbar
+    search:
+        prompt: 'backend::lang.list.search_prompt'
+recordUrl: 'tps/tps/media/update/:id'

plugins/tps/tps/controllers/media/create.htm

@@ -0,0 +1,46 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('tps/tps/media') ?>">Media</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?= Form::open(['class' => 'layout']) ?>
+
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="submit"
+                    data-request="onSave"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.create')) ?>
+                </button>
+                <button 
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.create_and_close')) ?>
+                </button>
+                <span class="btn-text">
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('tps/tps/media') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+                </span>
+            </div>
+        </div>
+
+    <?= Form::close() ?>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+    <p><a href="<?= Backend::url('tps/tps/media') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
+<?php endif ?>

plugins/tps/tps/controllers/media/index.htm

@@ -0,0 +1 @@
+<?= $this->listRender() ?>

plugins/tps/tps/controllers/media/preview.htm

@@ -0,0 +1,22 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('tps/tps/media') ?>">Media</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <div class="form-preview">
+        <?= $this->formRenderPreview() ?>
+    </div>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+<?php endif ?>
+
+<p>
+    <a href="<?= Backend::url('tps/tps/media') ?>" class="btn btn-default oc-icon-chevron-left">
+        <?= e(trans('backend::lang.form.return_to_list')) ?>
+    </a>
+</p>

plugins/tps/tps/controllers/media/update.htm

@@ -0,0 +1,54 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('tps/tps/media') ?>">Media</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?= Form::open(['class' => 'layout']) ?>
+
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="submit"
+                    data-request="onSave"
+                    data-request-data="redirect:0"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.save')) ?>
+                </button>
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.save_and_close')) ?>
+                </button>
+                <button
+                    type="button"
+                    class="oc-icon-trash-o btn-icon danger pull-right"
+                    data-request="onDelete"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
+                </button>
+
+                <span class="btn-text">
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('tps/tps/media') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+                </span>
+            </div>
+        </div>
+    <?= Form::close() ?>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+    <p><a href="<?= Backend::url('tps/tps/media') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
+<?php endif ?>

plugins/tps/tps/models/Media.php

@@ -0,0 +1,30 @@
+<?php namespace Tps\Tps\Models;
+
+use Model;
+
+/**
+ * Model
+ */
+class Media extends Model
+{
+    use \October\Rain\Database\Traits\Validation;
+    public $implement = ['@RainLab.Translate.Behaviors.TranslatableModel'];
+    
+
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'tps_tps_media';
+    
+    public $jsonable = ['media_file'];
+    
+        public $translatable = [
+           'name',
+        ];
+
+    /**
+     * @var array Validation rules
+     */
+    public $rules = [
+    ];
+}

plugins/tps/tps/models/media/columns.yaml

@@ -0,0 +1,24 @@
+columns:
+    id:
+        label: id
+        type: number
+    name:
+        label: name
+        type: text
+        searchable: true
+        sortable: true
+    type:
+        label: type
+        type: text
+        searchable: true
+        sortable: true
+    note:
+        label: note
+        type: text
+        searchable: true
+        sortable: true
+    published_at:
+        label: published_at
+        type: datetime
+        searchable: true
+        sortable: true

plugins/tps/tps/models/media/fields.yaml

@@ -0,0 +1,34 @@
+fields:
+    name:
+        label: Name
+        span: auto
+        type: text
+    type:
+        label: Type
+        options:
+            photo: Photo
+            video: Video
+        span: auto
+        type: balloon-selector
+    poster_file:
+        label: 'Poster File'
+        mode: file
+        span: auto
+        type: mediafinder
+    media_file:
+        label: 'Media Files'
+        prompt: 'Add new media file'
+        style: default
+        span: left
+        type: repeater
+        form:
+            fields:
+                media:
+                    label: Media
+                    mode: file
+                    span: left
+                    type: mediafinder
+                media_title:
+                    label: 'Media Title'
+                    span: auto
+                    type: text

plugins/tps/tps/plugin.yaml

@@ -6,6 +6,6 @@ plugin:
     homepage: ''
 navigation:
     main-menu-item:
-        label: Afisha
-        url: tps/tps/afisha
-        icon: icon-life-ring
+        label: 'Media Category'
+        url: tps/tps/media
+        icon: icon-film

plugins/tps/tps/updates/builder_table_create_tps_tps_media.php

@@ -0,0 +1,29 @@
+<?php namespace Tps\Tps\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableCreateTpsTpsMedia extends Migration
+{
+    public function up()
+    {
+        Schema::create('tps_tps_media', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id')->unsigned();
+            $table->timestamp('created_at')->nullable();
+            $table->timestamp('updated_at')->nullable();
+            $table->string('name')->nullable();
+            $table->string('type')->nullable();
+            $table->text('media_file')->nullable();
+            $table->string('poster_file')->nullable();
+            $table->text('note')->nullable();
+            $table->timestamp('published_at')->nullable();
+        });
+    }
+    
+    public function down()
+    {
+        Schema::dropIfExists('tps_tps_media');
+    }
+}

plugins/tps/tps/updates/version.yaml

@@ -3,3 +3,6 @@
 1.0.2:
     - 'Created table tps_tps_afisha'
     - builder_table_create_tps_tps_afisha.php
+1.0.3:
+    - 'Created table tps_tps_media'
+    - builder_table_create_tps_tps_media.php

themes/modern2/layouts/new/master-inside.htm

@@ -84,14 +84,7 @@ random = 0
                 </li>
                 {% endif %}
           </ul>
-          <form class="header-search">
-            <input type="text" placeholder="Поиск..." />
-            <button type="button">
-              <div class="search-icon">
-                <img src="{{ 'assets/new/icons/loop.svg'|theme}}" alt="" />
-              </div>
-            </button>
-          </form>
+          {% partial 'new/searchForm' %}
         </div>
         
         <div class="header-burger">

themes/modern2/layouts/new/master.htm

@@ -84,14 +84,8 @@ random = 0
                 </li>
                 {% endif %}
           </ul>
-          <form class="header-search">
-            <input type="text" placeholder="Поиск..." />
-            <button type="button">
-              <div class="search-icon">
-                <img src="{{ 'assets/new/icons/loop.svg'|theme}}" alt="" />
-              </div>
-            </button>
-          </form>
+         
+         {% partial 'new/searchForm' %}
         </div>
         
         <div class="header-burger">

themes/modern2/meta/menus/event_menu.yaml

@@ -0,0 +1,18 @@
+items:
+    -
+        title: OGT
+        type: url
+        url: /
+        code: ''
+        viewBag:
+            locale:
+                en:
+                    title: ''
+                    url: ''
+                tm:
+                    title: ''
+                    url: ''
+            isHidden: '1'
+            cssClass: ''
+            isExternal: '0'
+name: event_menu

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

@@ -100,6 +100,25 @@ items:
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
+            -
+                title: События
+                nesting: 0
+                type: blog-category
+                code: ''
+                reference: '9'
+                cmsPage: new/category
+                replace: 0
+                viewBag:
+                    locale:
+                        en:
+                            title: ''
+                            url: ''
+                        tm:
+                            title: ''
+                            url: ''
+                    isHidden: '0'
+                    cssClass: ''
+                    isExternal: '0'
     -
         title: Статьи
         nesting: null
@@ -245,7 +264,7 @@ items:
         title: Media
         nesting: null
         type: url
-        url: /
+        url: /ru/new/posts/media
         code: ''
         reference: null
         cmsPage: null
@@ -261,11 +280,56 @@ items:
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
+        items:
+            -
+                title: Photo
+                nesting: null
+                type: url
+                url: /ru/new/posts/media/photo
+                code: ''
+                reference: null
+                cmsPage: null
+                replace: null
+                viewBag:
+                    locale:
+                        en:
+                            title: ''
+                            url: ''
+                        tm:
+                            title: ''
+                            url: ''
+                    isHidden: '0'
+                    cssClass: ''
+                    isExternal: '0'
+            -
+                title: Video
+                nesting: null
+                type: url
+                url: /ru/new/posts/media/video
+                code: ''
+                reference: null
+                cmsPage: null
+                replace: null
+                viewBag:
+                    locale:
+                        en:
+                            title: ''
+                            url: ''
+                        tm:
+                            title: ''
+                            url: ''
+                    isHidden: '0'
+                    cssClass: ''
+                    isExternal: '0'
     -
         title: Афиша
+        nesting: null
         type: url
         url: /ru/new/posts/poster
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 en:
@@ -280,9 +344,13 @@ items:
         items:
             -
                 title: Театры
+                nesting: null
                 type: url
                 url: /ru/new/posts/poster/teatry
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         en:
@@ -296,9 +364,13 @@ items:
                     isExternal: '0'
             -
                 title: Спорт
+                nesting: null
                 type: url
                 url: /ru/new/posts/poster/sport
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         en:
@@ -312,9 +384,13 @@ items:
                     isExternal: '0'
             -
                 title: Объявления
+                nesting: null
                 type: url
                 url: /ru/new/posts/poster/obyavleniya
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         en:
@@ -328,9 +404,13 @@ items:
                     isExternal: '0'
             -
                 title: Концерты
+                nesting: null
                 type: url
                 url: /ru/new/posts/poster/koncerty
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         en:
@@ -344,9 +424,13 @@ items:
                     isExternal: '0'
             -
                 title: Кинотеатры
+                nesting: null
                 type: url
                 url: /ru/new/posts/poster/kinoteatry
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         en:
@@ -360,9 +444,13 @@ items:
                     isExternal: '0'
             -
                 title: Выставки
+                nesting: null
                 type: url
                 url: /ru/new/posts/poster/vystavki
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         en:

themes/modern2/pages/new/home.htm

@@ -4,34 +4,101 @@ layout = "new/master"
 is_hidden = 0
 robot_index = "index"
 robot_follow = "follow"
+
+[builderList adv4]
+modelClass = "Tps\Reklama\Models\Reklama"
+scope = "-"
+scopeValue = "{{ :scope }}"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
+
+[builderList adv5]
+modelClass = "Tps\Reklama\Models\Reklama"
+scope = "-"
+scopeValue = "{{ :scope }}"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
 ==
+{% set records = adv4.records %}
+{% set displayColumn = adv4.displayColumn %}
+{% set noRecordsMessage = adv4.noRecordsMessage %}
+{% set detailsPage = adv4.detailsPage %}
+{% set detailsKeyColumn = adv4.detailsKeyColumn %}
+{% set detailsUrlParameter = adv4.detailsUrlParameter %}
+
+ 
+
 {% partial 'newHome/main' %}
 {% partial 'newHome/main-popular' %}
 
 <section class="banners">
 <div class="container banner-container">
   <div class="banners-inner">
-    <div class="banner">
-      <img src="{{'assets/new/images/banner.jpg'|theme}}" alt="" />
-    </div>
-    <div class="banner">
-      <img src="{{'assets/new/images/banner.jpg'|theme}}" alt="" />
-    </div>
+    
+    {% for record in records if record.group_id == 4 %}
+        
+        {% if record.id == 78 %}
+            <div class="banner">
+              <img src="{{record.media|media}}" alt="" />
+            </div>
+        {% endif %}
+        
+        {% if record.id == 88 %}
+            <div class="banner">
+              <img src="{{record.media|media}}" alt="" />
+            </div>
+        {% endif %}
+        
+    {% else %}
+        <li class="no-data">{{ noRecordsMessage }}</li>
+    {% endfor %}
+    
+    
   </div>
 </div>
 </section>
 
 {% partial 'newHome/publication' %}
 
+
+
+{% set records = adv5.records %}
+{% set displayColumn = adv5.displayColumn %}
+{% set noRecordsMessage = adv5.noRecordsMessage %}
+{% set detailsPage = adv5.detailsPage %}
+{% set detailsKeyColumn = adv5.detailsKeyColumn %}
+{% set detailsUrlParameter = adv5.detailsUrlParameter %}
+
+
+
 <section class="banners">
 <div class="container banner-container">
   <div class="banners-inner">
-    <div class="banner">
-      <img src="{{'assets/new/images/banner.jpg'|theme}}" alt="" />
-    </div>
-    <div class="banner">
-      <img src="{{'assets/new/images/banner.jpg'|theme}}" alt="" />
-    </div>
+  
+   {% for recordq in records if recordq.group_id == 5 %}
+
+        {% if recordq.id == 15 %}
+            <div class="banner">
+              <img src="{{recordq.media|media}}" alt="" style="object-fit: scale-down !important;" />
+            </div>
+        {% endif %}
+        
+        {% if recordq.id == 16 %}
+            <div class="banner">
+              <img src="{{recordq.media|media}}" alt="" style="object-fit: scale-down !important;" />
+            </div>
+        {% endif %}
+        
+    {% else %}
+        <li class="no-data">{{ noRecordsMessage }}</li>
+    {% endfor %}
+    
   </div>
 </div>
 </section>

themes/modern2/pages/new/search.htm

@@ -0,0 +1,41 @@
+title = "new/search"
+url = "/new/search"
+layout = "new/master-inside"
+is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
+
+[blogPosts]
+pageNumber = "{{ :page }}"
+postsPerPage = 10
+noPostsMessage = "No posts found"
+sortOrder = "published_at desc"
+categoryPage = "blog/category"
+postPage = "blog/post"
+==
+<!-- HEAD end ======== -->
+  <main class="rubric-main">
+    <div class="container">
+      <div class="rubric-inner">
+        <div class="trending-head">
+          <h2>{{'page.search'|_}}</h2>
+          <span></span>
+        </div>
+        
+        
+        <div class="rubric-items">
+        
+         {% 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 filter = ['q',input('q')] %}
+        
+        
+      </div>
+    </div>
+  </main>

themes/modern2/partials/new/menu.htm

@@ -2,6 +2,9 @@
 
 [staticMenu]
 code = "new-top-menui"
+
+[staticMenu staticMenu2]
+code = "event_menu"
 ==
 <nav class="nav" style="margin-bottom: 0px;">
     <section class="nav-top">
@@ -22,7 +25,17 @@ code = "new-top-menui"
             </ul>
           </div>
           <div class="nav-right">
-            <a class="nav-right-link">OGT</a>
+          
+           {% for item2 in staticMenu2.menuItems %}
+                {% if not item2.isHidden %}
+                 
+                  <a href="{{ item2.url }}" class="nav-right-link">{{ item2.title }}</a>
+                 
+                {% endif %}
+            {% endfor %}
+            
+            
+            
             <ul class="nav-lang">
               <li>
                 <a data-request="onSwitchLocale" data-request-data="locale: 'en'">

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

@@ -1,4 +1,7 @@
 [viewBag]
+
+[staticMenu]
+code = "new-top-menui"
 ==
 <div class="burger-wrapper">
   <div class="burger-close">

themes/modern2/partials/new/searchForm.htm

@@ -0,0 +1,10 @@
+[viewBag]
+==
+<form action="{{ 'new/search' | page }}" method="get" class="header-search">
+    <input type="text"  name="q" placeholder="{{'page.search'|_}}" />
+    <button type="button">
+      <div class="search-icon">
+        <img src="{{ 'assets/new/icons/loop.svg'|theme}}" alt="" />
+      </div>
+    </button>
+  </form>

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

@@ -1,7 +1,7 @@
 [viewBag]
 ==
 <div class="sub-news-left">
-    <h2>{{categoryPosts[0].categories.implode('name', ', ')}}</h2>
+    <h2>{{ 'new.home.page.left'|_ }}</h2>
     <div class="sub-news-left-content">
      
          {% for post in categoryPosts %}

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

@@ -8,7 +8,26 @@ noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = 404
 postPage = 404
+
+[builderList adv3]
+modelClass = "Tps\Reklama\Models\Reklama"
+scope = "-"
+scopeValue = "{{ :scope }}"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
 ==
+{% set records = adv3.records %}
+{% set displayColumn = adv3.displayColumn %}
+{% set noRecordsMessage = adv3.noRecordsMessage %}
+{% set detailsPage = adv3.detailsPage %}
+{% set detailsKeyColumn = adv3.detailsKeyColumn %}
+{% set detailsUrlParameter = adv3.detailsUrlParameter %}
+
+
+
 {% set post = byEditor.posts %}
 
 <section class="trending">
@@ -40,10 +59,22 @@ postPage = 404
           
         </div>
          {% partial 'newHome/popular-item' %}
+         
         <div class="trending-banner">
-          <a href="#">
-            <img src="{{'assets/new/images/read-banner.jpg'|theme}}" alt="" />
-          </a>
+            
+         
+            {% for record in records if record.group_id == 8 %}
+                {% if record.id == 71 %}
+                 <a href="#">
+                    <img src="{{record.media|media}}" alt="" />
+                  </a>
+                {% endif %}
+            {% else %}
+                <li class="no-data">{{ noRecordsMessage }}</li>
+            {% endfor %}
+            
+         
+          
         </div>
        
       

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

@@ -10,7 +10,7 @@ $this['afisha'] = RainLab\Blog\Models\CategoryGroup::where('slug', 'poster')->wi
 ==
 <div class="sub-news-right">
 <div class="sub-news-right-top">
-  <h2>Watan</h2>
+  <h2>{{'new.home.page.right'|_ }}</h2>
   <div class="sub-news-right-top-content">
   
   {% for post in categoryPosts %}

themes/modern2/partials/newHome/main.htm

@@ -2,7 +2,7 @@
 
 [blogPosts postsMainLeft]
 pageNumber = "{{ :page }}"
-categoryFilter = "economy"
+categoryFilter = "novosti-biznesa"
 postsPerPage = 5
 noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
@@ -11,17 +11,22 @@ postPage = 404
 
 [blogPosts postsMainRight]
 pageNumber = "{{ :page }}"
-categoryFilter = "tendery"
+categoryFilter = "watan"
 postsPerPage = 4
 noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = 404
 postPage = 404
 
-[adverts adv_center_1]
-code = "bank"
-type = "slider"
-random = 0
+[builderList adv1]
+modelClass = "Tps\Reklama\Models\Reklama"
+scope = "-"
+scopeValue = "{{ :scope }}"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
 ==
 {% set postsMainLeft = postsMainLeft.posts %}
 {% set postsMainRight = postsMainRight.posts %}
@@ -36,13 +41,31 @@ random = 0
       
         {% partial 'newHome/main-slider' %}
         
+        {% set records = adv1.records %}
+        {% set displayColumn = adv1.displayColumn %}
+        {% set noRecordsMessage = adv1.noRecordsMessage %}
+        {% set detailsPage = adv1.detailsPage %}
+        {% set detailsKeyColumn = adv1.detailsKeyColumn %}
+        {% set detailsUrlParameter = adv1.detailsUrlParameter %}
+        
+
         
         <section class="main-advert">
           <div class="container main-news-container">
             <div class="main-advert-inner">
-              <a href="#">
-                <img src="{{'assets/new/images/main-advert.jpg'|theme}}" alt="" />
-              </a>
+           
+              
+                {% for key, record in records if record.group_id == 3 %}
+                  
+                  {% if record.id == 45 %}
+                   <a href="#">
+                      <img src="{{record.media|media}}" alt="" />
+                   </a>
+                  {% endif %}
+                {% else %}
+                    <li class="no-data">{{ noRecordsMessage }}</li>
+                {% endfor %}
+             
             </div>
           </div>
         </section>

themes/modern2/partials/newHome/partners.htm

@@ -1,50 +1,48 @@
+[viewBag]
+
 [adverts partners]
 code = "media"
 type = "slider"
 random = 0
 
-[viewBag]
+[builderList partners]
+modelClass = "Tps\Reklama\Models\Reklama"
+scope = "-"
+scopeValue = "{{ :scope }}"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
 ==
+{% set records = partners.records %}
+{% set displayColumn = partners.displayColumn %}
+{% set noRecordsMessage = partners.noRecordsMessage %}
+{% set detailsPage = partners.detailsPage %}
+{% set detailsKeyColumn = partners.detailsKeyColumn %}
+{% set detailsUrlParameter = partners.detailsUrlParameter %}
+
+
+   
+
 <div class="partners">
   <h2 class="partners-head">Наши партнеры</h2>
   <div class="partners-content">
     <div class="swiper partnerSwiper">
       <div class="swiper-wrapper">
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
-        <div class="swiper-slide">
-          <div class="partners-item">
-            <img src="{{'assets/new/images/partners.jpg'|theme}}" alt="" />
-          </div>
-        </div>
+        
+        {% for record in records if record.group_id == 1 %}
+        
+            <div class="swiper-slide">
+              <div class="partners-item">
+                <img src="{{record.media|media}}" alt="" />
+              </div>
+            </div>
+        
+        {% else %}
+            <li class="no-data">{{ noRecordsMessage }}</li>
+        {% endfor %}
+        
       </div>
       <div class="partner-prev photo-prev video-prev">
         <img src="{{'assets/new/icons/arrow-left-white.svg'|theme}}" alt="" />

themes/modern2/partials/newHome/publication.htm

@@ -2,8 +2,8 @@
 
 [blogPosts]
 pageNumber = "{{ :page }}"
-featured = "yes"
-postsPerPage = 14
+categoryGroup = "stati"
+postsPerPage = 9
 noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = 404
@@ -15,33 +15,33 @@ postPage = 404
 <div class="container">
   <div class="posts-inner">
     <div class="trending-head">
-      <h2>Публикации</h2>
+      <h2>{{'new.home.publication'|_}}</h2>
       <span></span>
     </div>
     <div class="posts-content">
     
     
-     <a href="{{'new/newPost'|page({id:posts[5].id,slug:posts[5].slug})}}" class="posts-item big">
+     <a href="{{'new/newPost'|page({id:posts[0].id,slug:posts[0].slug})}}" class="posts-item big">
         <div class="trending-aside-item">
           <div class="trending-img">
-            <img src="{{posts[5].featured_image|media|resize(818, 571, {mode: 'crop'})}}" alt="" />
+            <img src="{{posts[0].featured_image|media|resize(818, 571, {mode: 'crop'})}}" alt="" />
           </div>
           <div class="trending-aside-content">
             <div class="sub-news-left-content-item-date-content-head trending-aside-content-head">
-                <h3>{{posts[5].categories.implode('name', ', ')}}</h3>
+                <h3>{{posts[0].categories.implode('name', ', ')}}</h3>
                 <span>|</span>
-                <h4>{{posts[5].published_at|date('d.m.Y')}}</h4>
+                <h4>{{posts[0].published_at|date('d.m.Y')}}</h4>
                 <span>|</span>
-                <h4> {{posts[5].published_at|date('H:i')}}</h4>
+                <h4> {{posts[0].published_at|date('H:i')}}</h4>
             </div>
             <p class="sub-news-left-content-item-date-content-info">
-              {{posts[5].title}}
+              {{posts[0].title}}
             </p>
           </div>
         </div>
       </a>
       
-      {% for key, post in posts.slice(6,14) %}
+      {% for key, post in posts.slice(1,9) %}
       
       <a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="posts-item sm">
         <div class="trending-aside-item">

themes/modern2/partials/newHome/right-sidebar.htm

@@ -19,10 +19,28 @@ sortOrder = "published_at desc"
 categoryPage = 404
 postPage = 404
 exceptPost = "{{ :id }}"
+
+[builderList adv2]
+modelClass = "Tps\Reklama\Models\Reklama"
+scope = "-"
+scopeValue = "{{ :scope }}"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
 ==
 {% set turkmenPosts = turkmenistan.posts %}
 {% set worldPosts = world.posts %}
 
+{% set records = adv2.records %}
+{% set displayColumn = adv2.displayColumn %}
+{% set noRecordsMessage = adv2.noRecordsMessage %}
+{% set detailsPage = adv2.detailsPage %}
+{% set detailsKeyColumn = adv2.detailsKeyColumn %}
+{% set detailsUrlParameter = adv2.detailsUrlParameter %}
+
+
 
 <div class="container aside-container">
   <aside class="aside {{ class }}">
@@ -68,9 +86,18 @@ exceptPost = "{{ :id }}"
       </div>
     </div>
     <div class="aside-ad-wrapper">
-      <a href="#">
-        <img src="{{'assets/new/images/aside-ad.jpg'|theme}}" alt="" />
-      </a>
+        {% for record in records if record.group_id == 7 %}
+           
+          {% if record.id == 81 %}
+          <a href="#">
+            <img src="{{record.media|media}}" alt="" />
+          </a>
+          {% endif %}
+          
+        {% else %}
+            <li class="no-data">{{ noRecordsMessage }}</li>
+        {% endfor %}
+      
     </div>
   </aside>
 </div>

themes/modern2/partials/newHome/video.htm

@@ -1,3 +1,5 @@
+[viewBag]
+
 [blogPosts videos]
 pageNumber = "{{ :page }}"
 categoryFilter = "video"
@@ -6,11 +8,11 @@ noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = 404
 postPage = 404
-
-[viewBag]
 ==
 {% set posts = videos.posts %}
 
+
+
 <div class="trending-head media-head">
     <h2>{{ header }}</h2>
     <span></span>