From cb22cc8afb43385323be9a2007b8e2554bad9fe1 Mon Sep 17 00:00:00 2001
From: root <merdan.m@gmail.com>
Date: Mon, 10 May 2021 06:43:50 +0000
Subject: [PATCH] server before new theme

---
 .../tps/reklama/components/Advertisement.php  |  4 +-
 .../components/advertisement/default.htm      |  1 -
 storage/framework/classes.php                 |  1 +
 themes/modern/meta/menus/top-menu.yaml        | 18 ++++++++-
 themes/modern/pages/index.htm                 | 39 +++++++++----------
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/plugins/tps/reklama/components/Advertisement.php b/plugins/tps/reklama/components/Advertisement.php
index 78a55d6b9..fdbe7acd3 100644
--- a/plugins/tps/reklama/components/Advertisement.php
+++ b/plugins/tps/reklama/components/Advertisement.php
@@ -11,7 +11,8 @@ use Tps\Reklama\Models\Statistika;
 
 class Advertisement extends ComponentBase
 {
-    public $group, $css_class;
+    public $random, $group, $css_class;
+    
     public function componentDetails()
     {
         return [
@@ -68,6 +69,7 @@ class Advertisement extends ComponentBase
         ];
     }
 
+    
     public function onDisplay(){
         $random = input('random');
         $this->page['group'] = $group = Group::where('code',$this->property('code'))
diff --git a/plugins/tps/reklama/components/advertisement/default.htm b/plugins/tps/reklama/components/advertisement/default.htm
index eb7ee093f..ed2046733 100644
--- a/plugins/tps/reklama/components/advertisement/default.htm
+++ b/plugins/tps/reklama/components/advertisement/default.htm
@@ -1,4 +1,3 @@
-
 <div id="{{__SELF__}}" class="{{__SELF__.property('css_class')}}"></div>
 {% put scripts %}
 <script>
diff --git a/storage/framework/classes.php b/storage/framework/classes.php
index 5dd6ba6fe..71cd40376 100644
--- a/storage/framework/classes.php
+++ b/storage/framework/classes.php
@@ -442,4 +442,5 @@
   'Backend\\Widgets\\Table\\ClientMemoryDataSource' => 'modules/backend/widgets/table/ClientMemoryDataSource.php',
   'Indikator\\DevTools\\FormWidgets\\Help' => 'plugins/indikator/devtools/formwidgets/Help.php',
   'Backend\\Traits\\SearchableWidget' => 'modules/backend/traits/SearchableWidget.php',
+  'Backend\\Widgets\\Table\\ServerEventDataSource' => 'modules/backend/widgets/table/ServerEventDataSource.php',
 );
\ No newline at end of file
diff --git a/themes/modern/meta/menus/top-menu.yaml b/themes/modern/meta/menus/top-menu.yaml
index c445282e1..74de2edd2 100644
--- a/themes/modern/meta/menus/top-menu.yaml
+++ b/themes/modern/meta/menus/top-menu.yaml
@@ -52,7 +52,7 @@ items:
                     cssClass: ''
                     isExternal: '0'
     -
-        title: 'New menu item'
+        title: Фото
         nesting: 0
         type: blog-category
         code: ''
@@ -67,6 +67,22 @@ items:
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
+    -
+        title: Видео
+        nesting: 0
+        type: blog-category
+        code: ''
+        reference: '7'
+        cmsPage: category
+        replace: 0
+        viewBag:
+            locale:
+                en:
+                    title: Video
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
     -
         title: 'Static Pages(About and Contact)'
         nesting: null
diff --git a/themes/modern/pages/index.htm b/themes/modern/pages/index.htm
index b6605422f..c51abbeef 100644
--- a/themes/modern/pages/index.htm
+++ b/themes/modern/pages/index.htm
@@ -18,44 +18,44 @@ code = "media"
 type = "carousel"
 random = 0
 
-[adverts adv_bank]
-code = "bank"
-type = "slider"
-random = 0
-
 [adverts samsung]
 code = "samsung"
 type = "single"
 random = 0
 
-[adverts adv_bottom]
+[adverts adv_center_1]
+code = "bank"
+type = "slider"
+random = 0
+
+[adverts adv_center_2]
 code = "bottom"
 type = "slider"
 random = 0
 
-[adverts adv_bottom_2]
+[adverts adv_center_3]
 code = "cnpc"
 type = "slider"
 random = 0
 
-[adverts adv_bottom_3]
+[adverts adv_center_4]
 code = "china-daily"
-type = "single"
+type = "slider"
 random = 0
 
 [adverts right_top]
 code = "right-top"
-type = "single"
+type = "slider"
 random = 0
 
 [adverts right_middle]
 code = "right-middle"
-type = "single"
+type = "slider"
 random = 0
 
 [adverts right_bottom]
 code = "right-bottom"
-type = "single"
+type = "slider"
 random = 0
 ==
 {% partial 'slider' %}
@@ -82,7 +82,7 @@ random = 0
         <div class="main__inner">
             <div class="main__content">
                 <div class="main__banner">
-                    {% component 'adv_bank' %}
+                    {% component 'adv_center_1' %}
                 </div>
                 <div class="main__body">
                     <div class="main__body-row">
@@ -91,7 +91,7 @@ random = 0
                     </div>
                 </div>
                 <div class="main__banner">
-                    {% component 'adv_bottom' %}
+                    {% component 'adv_center_2' %}
                 </div>
                 <div class="main__body">
                     <div class="main__body-row">
@@ -100,7 +100,7 @@ random = 0
                     </div>
                 </div>
                 <div class="main__banner">
-                    {% component 'adv_bottom_2' %}
+                    {% component 'adv_center_3' %}
                 </div>
                 <div class="main__body">
                     <div class="main__body-row">
@@ -109,17 +109,14 @@ random = 0
                     </div>
                 </div>
                 <div class="main__banner">
-                    {% component 'adv_bottom_3' %}
+                    {% component 'adv_center_4' %}
                 </div>
                 {% partial 'index/partner_news'%}
             </div>
             <div class="main__sidebar">
-                <div class="main__sidebar-title">
-                    ИНТЕРЕСНЫЕ ССЫЛКИ
-                </div>
-                {% component 'right_top' css_class = 'primary progressive replace' %}
+                {% component 'right_top' %}
                 {% component 'right_middle' css_class = 'primary progressive replace' %}
-                {% component 'right_bottom' css_class = 'primary progressive replace' %}
+                {% component 'right_bottom' %}
                 {% partial 'tags' %}
                 {% partial 'calendar' %}
             </div>