Merge remote-tracking branch 'site/1.1' into 1.1

2021-05-10 13:26:00 +05:00 · 2021-05-10 13:26:00 +05:00 · 3a398c3236
parent 50cc7bcea3 cb22cc8afb
commit 3a398c3236
31 changed files with 2302 additions and 316 deletions
--- a/composer-setup.php
+++ b/composer-setup.php
--- a/config/app.php
+++ b/config/app.php
@ -81,7 +81,7 @@ return [
    |
    */

-    'locale' => 'ru',
+    'locale' => 'en',

    /*
    |--------------------------------------------------------------------------
--- a/plugins/rainlab/translate/components/LocalePicker.php
+++ b/plugins/rainlab/translate/components/LocalePicker.php
@ -1,5 +1,5 @@
 <?php namespace RainLab\Translate\Components;
-
+use Log;
 use Event;
 use Config;
 use Request;
@ -64,6 +64,7 @@ class LocalePicker extends ComponentBase
    public function onRun()
    {
        if ($redirect = $this->redirectForceUrl()) {
+            
            return $redirect;
        }

@ -75,6 +76,7 @@ class LocalePicker extends ComponentBase
    public function onSwitchLocale()
    {
        if (!$locale = post('locale')) {
+            
            return;
        }

@ -88,6 +90,8 @@ class LocalePicker extends ComponentBase
            return Redirect::to($this->translator->getPathInLocale($pageUrl, $locale));
        }

+        //Log::error($pageUrl);
+        //return $pageUrl;
        return Redirect::to($pageUrl);
    }

--- a/plugins/serenitynow/cacheroute/classes/RouteCacheMiddleware.php
+++ b/plugins/serenitynow/cacheroute/classes/RouteCacheMiddleware.php
@ -15,7 +15,7 @@ class RouteCacheMiddleware
        $cacheRow = $this->shouldBeCached($request);
        $ajaxRequest = $request->ajax();
 //dd($cacheRow);
-        if (!$hasTable || !$cacheRow || $ajaxRequest) {
+        if (!$hasTable || !$cacheRow || $ajaxRequest ||$request->post()) {
            return $next($request);
        }

--- 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'))
--- 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>
--- a/storage/framework/classes.php
+++ b/storage/framework/classes.php
@ -253,4 +253,194 @@
  'Tps\\Reklama\\Widgets\\Stats' => 'plugins/tps/reklama/widgets/Stats.php',
  'indikator\\devtools\\Plugin' => 'plugins/indikator/devtools/Plugin.php',
  'Indikator\\DevTools\\Models\\Settings' => 'plugins/indikator/devtools/models/Settings.php',
+  'System\\Classes\\PluginManager' => 'modules/system/classes/PluginManager.php',
+  'System\\Classes\\PluginBase' => 'modules/system/classes/PluginBase.php',
+  'System\\Classes\\ComposerManager' => 'modules/system/classes/ComposerManager.php',
+  'System\\Classes\\CombineAssets' => 'modules/system/classes/CombineAssets.php',
+  'Cms\\Contracts\\CmsObject' => 'modules/cms/contracts/CmsObject.php',
+  'Cms\\Classes\\CmsObject' => 'modules/cms/classes/CmsObject.php',
+  'Cms\\Classes\\CmsCompoundObject' => 'modules/cms/classes/CmsCompoundObject.php',
+  'Cms\\Classes\\Page' => 'modules/cms/classes/Page.php',
+  'System\\Models\\File' => 'modules/system/models/File.php',
+  'Cms\\Models\\ThemeData' => 'modules/cms/models/ThemeData.php',
+  'System\\Classes\\MailManager' => 'modules/system/classes/MailManager.php',
+  'System\\Classes\\MarkupManager' => 'modules/system/classes/MarkupManager.php',
+  'Cms\\Classes\\ComponentManager' => 'modules/cms/classes/ComponentManager.php',
+  'Backend\\Facades\\BackendMenu' => 'modules/backend/facades/BackendMenu.php',
+  'Backend\\Classes\\NavigationManager' => 'modules/backend/classes/NavigationManager.php',
+  'System\\Classes\\ModelBehavior' => 'modules/system/classes/ModelBehavior.php',
+  'System\\Traits\\ConfigMaker' => 'modules/system/traits/ConfigMaker.php',
+  'System\\Behaviors\\SettingsModel' => 'modules/system/behaviors/SettingsModel.php',
+  'Cms\\Classes\\CmsController' => 'modules/cms/classes/CmsController.php',
+  'System\\Traits\\AssetMaker' => 'modules/system/traits/AssetMaker.php',
+  'System\\Traits\\EventEmitter' => 'modules/system/traits/EventEmitter.php',
+  'System\\Traits\\PropertyContainer' => 'modules/system/traits/PropertyContainer.php',
+  'Cms\\Classes\\ComponentBase' => 'modules/cms/classes/ComponentBase.php',
+  'System\\Traits\\ViewMaker' => 'modules/system/traits/ViewMaker.php',
+  'System\\Traits\\ResponseMaker' => 'modules/system/traits/ResponseMaker.php',
+  'System\\Traits\\SecurityController' => 'modules/system/traits/SecurityController.php',
+  'Backend\\Traits\\ErrorMaker' => 'modules/backend/traits/ErrorMaker.php',
+  'Backend\\Traits\\WidgetMaker' => 'modules/backend/traits/WidgetMaker.php',
+  'Backend\\Classes\\Controller' => 'modules/backend/classes/Controller.php',
+  'Backend\\Traits\\SessionMaker' => 'modules/backend/traits/SessionMaker.php',
+  'Backend\\Classes\\ControllerBehavior' => 'modules/backend/classes/ControllerBehavior.php',
+  'Backend\\Traits\\FormModelSaver' => 'modules/backend/traits/FormModelSaver.php',
+  'Backend\\Behaviors\\FormController' => 'modules/backend/behaviors/FormController.php',
+  'Backend\\Behaviors\\ListController' => 'modules/backend/behaviors/ListController.php',
+  'Backend\\Behaviors\\ImportExportController' => 'modules/backend/behaviors/ImportExportController.php',
+  'Cms\\Classes\\Controller' => 'modules/cms/classes/Controller.php',
+  'Cms\\Classes\\Theme' => 'modules/cms/classes/Theme.php',
+  'Cms\\Classes\\Router' => 'modules/cms/classes/Router.php',
+  'Cms\\Classes\\PartialStack' => 'modules/cms/classes/PartialStack.php',
+  'System\\Twig\\Loader' => 'modules/system/twig/Loader.php',
+  'Cms\\Twig\\Loader' => 'modules/cms/twig/Loader.php',
+  'Cms\\Twig\\Extension' => 'modules/cms/twig/Extension.php',
+  'System\\Twig\\Extension' => 'modules/system/twig/Extension.php',
+  'System\\Twig\\SecurityPolicy' => 'modules/system/twig/SecurityPolicy.php',
+  'Cms\\Twig\\DebugExtension' => 'modules/cms/twig/DebugExtension.php',
+  'Cms\\Classes\\Content' => 'modules/cms/classes/Content.php',
+  'Cms\\Models\\ThemeLog' => 'modules/cms/models/ThemeLog.php',
+  'Cms\\Components\\ViewBag' => 'modules/cms/components/ViewBag.php',
+  'Cms\\Classes\\CodeBase' => 'modules/cms/classes/CodeBase.php',
+  'Cms\\Classes\\CmsObjectCollection' => 'modules/cms/classes/CmsObjectCollection.php',
+  'Cms\\Models\\MaintenanceSetting' => 'modules/cms/models/MaintenanceSetting.php',
+  'Cms\\Classes\\Layout' => 'modules/cms/classes/Layout.php',
+  'Cms\\Classes\\CmsException' => 'modules/cms/classes/CmsException.php',
+  'Cms\\Classes\\CodeParser' => 'modules/cms/classes/CodeParser.php',
+  'Cms\\Classes\\LayoutCode' => 'modules/cms/classes/LayoutCode.php',
+  'Cms\\Classes\\PageCode' => 'modules/cms/classes/PageCode.php',
+  'Cms\\Classes\\MediaViewHelper' => 'modules/cms/classes/MediaViewHelper.php',
+  'Backend\\Classes\\WidgetManager' => 'modules/backend/classes/WidgetManager.php',
+  'Backend\\Facades\\BackendAuth' => 'modules/backend/facades/BackendAuth.php',
+  'Backend\\Classes\\AuthManager' => 'modules/backend/classes/AuthManager.php',
+  'System\\Classes\\SettingsManager' => 'modules/system/classes/SettingsManager.php',
+  'Backend\\Classes\\BackendController' => 'modules/backend/classes/BackendController.php',
+  'Backend\\Classes\\Skin' => 'modules/backend/classes/Skin.php',
+  'Backend\\Skins\\Standard' => 'modules/backend/skins/Standard.php',
+  'Backend\\Models\\Preference' => 'modules/backend/models/Preference.php',
+  'Backend\\Models\\BrandSetting' => 'modules/backend/models/BrandSetting.php',
+  'Backend\\Facades\\Backend' => 'modules/backend/facades/Backend.php',
+  'Backend\\Helpers\\Backend' => 'modules/backend/helpers/Backend.php',
+  'System\\Models\\Parameter' => 'modules/system/models/Parameter.php',
+  'Backend\\Models\\EditorSetting' => 'modules/backend/models/EditorSetting.php',
+  'Backend\\Models\\User' => 'modules/backend/models/User.php',
+  'System\\Classes\\SystemController' => 'modules/system/classes/SystemController.php',
+  'System\\Models\\RequestLog' => 'modules/system/models/RequestLog.php',
+  'System\\Models\\LogSetting' => 'modules/system/models/LogSetting.php',
+  'Cms\\Classes\\ComponentPartial' => 'modules/cms/classes/ComponentPartial.php',
+  'Cms\\Classes\\Partial' => 'modules/cms/classes/Partial.php',
+  'Cms\\Helpers\\File' => 'modules/cms/helpers/File.php',
+  'Cms\\Twig\\PageTokenParser' => 'modules/cms/twig/PageTokenParser.php',
+  'Cms\\Twig\\PartialTokenParser' => 'modules/cms/twig/PartialTokenParser.php',
+  'Cms\\Twig\\ContentTokenParser' => 'modules/cms/twig/ContentTokenParser.php',
+  'Cms\\Twig\\PutTokenParser' => 'modules/cms/twig/PutTokenParser.php',
+  'Cms\\Twig\\PlaceholderTokenParser' => 'modules/cms/twig/PlaceholderTokenParser.php',
+  'Cms\\Twig\\DefaultTokenParser' => 'modules/cms/twig/DefaultTokenParser.php',
+  'Cms\\Twig\\FrameworkTokenParser' => 'modules/cms/twig/FrameworkTokenParser.php',
+  'Cms\\Twig\\ComponentTokenParser' => 'modules/cms/twig/ComponentTokenParser.php',
+  'Cms\\Twig\\FlashTokenParser' => 'modules/cms/twig/FlashTokenParser.php',
+  'Cms\\Twig\\ScriptsTokenParser' => 'modules/cms/twig/ScriptsTokenParser.php',
+  'Cms\\Twig\\StylesTokenParser' => 'modules/cms/twig/StylesTokenParser.php',
+  'System\\Helpers\\DateTime' => 'modules/system/helpers/DateTime.php',
+  'Cms\\Classes\\PartialCode' => 'modules/cms/classes/PartialCode.php',
+  'Cms\\Classes\\Meta' => 'modules/cms/classes/Meta.php',
+  'Cms\\Facades\\Cms' => 'modules/cms/facades/Cms.php',
+  'Cms\\Helpers\\Cms' => 'modules/cms/helpers/Cms.php',
+  'Cms\\Twig\\PartialNode' => 'modules/cms/twig/PartialNode.php',
+  'Cms\\Twig\\ComponentNode' => 'modules/cms/twig/ComponentNode.php',
+  'Cms\\Twig\\PutNode' => 'modules/cms/twig/PutNode.php',
+  'System\\Classes\\MediaLibrary' => 'modules/system/classes/MediaLibrary.php',
+  'System\\Models\\EventLog' => 'modules/system/models/EventLog.php',
+  'System\\Classes\\ErrorHandler' => 'modules/system/classes/ErrorHandler.php',
+  'Backend\\Traits\\InspectableContainer' => 'modules/backend/traits/InspectableContainer.php',
+  'Backend\\Models\\UserThrottle' => 'modules/backend/models/UserThrottle.php',
+  'Backend\\Classes\\WidgetBase' => 'modules/backend/classes/WidgetBase.php',
+  'Backend\\Traits\\UploadableWidget' => 'modules/backend/traits/UploadableWidget.php',
+  'Backend\\Widgets\\MediaManager' => 'modules/backend/widgets/MediaManager.php',
+  'Backend\\Widgets\\ReportContainer' => 'modules/backend/widgets/ReportContainer.php',
+  'Backend\\Models\\UserPreference' => 'modules/backend/models/UserPreference.php',
+  'Backend\\Classes\\ReportWidgetBase' => 'modules/backend/classes/ReportWidgetBase.php',
+  'System\\ReportWidgets\\Status' => 'modules/system/reportwidgets/Status.php',
+  'System\\Classes\\UpdateManager' => 'modules/system/classes/UpdateManager.php',
+  'Cms\\Classes\\ThemeManager' => 'modules/cms/classes/ThemeManager.php',
+  'System\\Classes\\VersionManager' => 'modules/system/classes/VersionManager.php',
+  'System\\Models\\PluginVersion' => 'modules/system/models/PluginVersion.php',
+  'Backend\\Models\\ExportModel' => 'modules/backend/models/ExportModel.php',
+  'Backend\\Widgets\\Form' => 'modules/backend/widgets/Form.php',
+  'Backend\\Classes\\FormTabs' => 'modules/backend/classes/FormTabs.php',
+  'Backend\\Classes\\FormField' => 'modules/backend/classes/FormField.php',
+  'Backend\\Traits\\PreferenceMaker' => 'modules/backend/traits/PreferenceMaker.php',
+  'Backend\\Widgets\\Lists' => 'modules/backend/widgets/Lists.php',
+  'Backend\\Widgets\\Toolbar' => 'modules/backend/widgets/Toolbar.php',
+  'Backend\\Widgets\\Search' => 'modules/backend/widgets/Search.php',
+  'Backend\\Widgets\\Filter' => 'modules/backend/widgets/Filter.php',
+  'Backend\\Classes\\FilterScope' => 'modules/backend/classes/FilterScope.php',
+  'Backend\\Classes\\ListColumn' => 'modules/backend/classes/ListColumn.php',
+  'Backend\\Behaviors\\UserPreferencesModel' => 'modules/backend/behaviors/UserPreferencesModel.php',
+  'Backend\\Classes\\MainMenuItem' => 'modules/backend/classes/MainMenuItem.php',
+  'Backend\\Classes\\SideMenuItem' => 'modules/backend/classes/SideMenuItem.php',
+  'Backend\\Classes\\FormWidgetBase' => 'modules/backend/classes/FormWidgetBase.php',
+  'Backend\\FormWidgets\\ColorPicker' => 'modules/backend/formwidgets/ColorPicker.php',
+  'Backend\\FormWidgets\\MediaFinder' => 'modules/backend/formwidgets/MediaFinder.php',
+  'Backend\\FormWidgets\\Repeater' => 'modules/backend/formwidgets/Repeater.php',
+  'System\\Classes\\MediaLibraryItem' => 'modules/system/classes/MediaLibraryItem.php',
+  'Cms\\Twig\\PageNode' => 'modules/cms/twig/PageNode.php',
+  'Cms\\Twig\\FrameworkNode' => 'modules/cms/twig/FrameworkNode.php',
+  'Cms\\Twig\\ScriptsNode' => 'modules/cms/twig/ScriptsNode.php',
+  'Cms\\Twig\\PlaceholderNode' => 'modules/cms/twig/PlaceholderNode.php',
+  'Cms\\Twig\\StylesNode' => 'modules/cms/twig/StylesNode.php',
+  'Backend\\Traits\\FormModelWidget' => 'modules/backend/traits/FormModelWidget.php',
+  'Backend\\FormWidgets\\Relation' => 'modules/backend/formwidgets/Relation.php',
+  'Backend\\FormWidgets\\DatePicker' => 'modules/backend/formwidgets/DatePicker.php',
+  'Backend\\Behaviors\\ReorderController' => 'modules/backend/behaviors/ReorderController.php',
+  'Cms\\Classes\\MediaLibrary' => 'modules/cms/classes/MediaLibrary.php',
+  'Backend\\FormWidgets\\CodeEditor' => 'modules/backend/formwidgets/CodeEditor.php',
+  'Backend\\FormWidgets\\RichEditor' => 'modules/backend/formwidgets/RichEditor.php',
+  'Backend\\Models\\UserRole' => 'modules/backend/models/UserRole.php',
+  'Backend\\Models\\UserGroup' => 'modules/backend/models/UserGroup.php',
+  'Backend\\FormWidgets\\FileUpload' => 'modules/backend/formwidgets/FileUpload.php',
+  'Backend\\FormWidgets\\PermissionEditor' => 'modules/backend/formwidgets/PermissionEditor.php',
+  'System\\Helpers\\Cache' => 'modules/system/helpers/Cache.php',
+  'Backend\\Models\\AccessLog' => 'modules/backend/models/AccessLog.php',
+  'Backend\\Models\\ImportModel' => 'modules/backend/models/ImportModel.php',
+  'System\\Helpers\\View' => 'modules/system/helpers/View.php',
+  'Cms\\Classes\\ComponentHelpers' => 'modules/cms/classes/ComponentHelpers.php',
+  'Cms\\Twig\\FlashNode' => 'modules/cms/twig/FlashNode.php',
+  'Backend\\Traits\\SelectableWidget' => 'modules/backend/traits/SelectableWidget.php',
+  'Backend\\Traits\\CollapsableWidget' => 'modules/backend/traits/CollapsableWidget.php',
+  'Cms\\Widgets\\TemplateList' => 'modules/cms/widgets/TemplateList.php',
+  'Cms\\Widgets\\ComponentList' => 'modules/cms/widgets/ComponentList.php',
+  'Cms\\Widgets\\AssetList' => 'modules/cms/widgets/AssetList.php',
+  'Cms\\Classes\\Asset' => 'modules/cms/classes/Asset.php',
+  'System\\Console\\OctoberUp' => 'modules/system/console/OctoberUp.php',
+  'System\\Console\\OctoberDown' => 'modules/system/console/OctoberDown.php',
+  'System\\Console\\OctoberUpdate' => 'modules/system/console/OctoberUpdate.php',
+  'System\\Console\\OctoberUtil' => 'modules/system/console/OctoberUtil.php',
+  'System\\Console\\OctoberMirror' => 'modules/system/console/OctoberMirror.php',
+  'System\\Console\\OctoberFresh' => 'modules/system/console/OctoberFresh.php',
+  'System\\Console\\OctoberEnv' => 'modules/system/console/OctoberEnv.php',
+  'System\\Console\\OctoberInstall' => 'modules/system/console/OctoberInstall.php',
+  'System\\Console\\OctoberPasswd' => 'modules/system/console/OctoberPasswd.php',
+  'System\\Console\\PluginInstall' => 'modules/system/console/PluginInstall.php',
+  'System\\Console\\PluginRemove' => 'modules/system/console/PluginRemove.php',
+  'System\\Console\\PluginDisable' => 'modules/system/console/PluginDisable.php',
+  'System\\Console\\PluginEnable' => 'modules/system/console/PluginEnable.php',
+  'System\\Console\\PluginRefresh' => 'modules/system/console/PluginRefresh.php',
+  'System\\Console\\PluginRollback' => 'modules/system/console/PluginRollback.php',
+  'System\\Console\\PluginList' => 'modules/system/console/PluginList.php',
+  'System\\Console\\ThemeInstall' => 'modules/system/console/ThemeInstall.php',
+  'System\\Console\\ThemeRemove' => 'modules/system/console/ThemeRemove.php',
+  'System\\Console\\ThemeList' => 'modules/system/console/ThemeList.php',
+  'System\\Console\\ThemeUse' => 'modules/system/console/ThemeUse.php',
+  'System\\Console\\ThemeSync' => 'modules/system/console/ThemeSync.php',
+  'Indikator\\DevTools\\Widgets\\AssetList' => 'plugins/indikator/devtools/widgets/AssetList.php',
+  'Indikator\\DevTools\\Classes\\Asset' => 'plugins/indikator/devtools/classes/Asset.php',
+  'Backend\\FormWidgets\\DataTable' => 'modules/backend/formwidgets/DataTable.php',
+  'Cms\\FormWidgets\\Components' => 'modules/cms/formwidgets/Components.php',
+  'Backend\\Widgets\\Table' => 'modules/backend/widgets/Table.php',
+  'Backend\\Widgets\\Table\\DataSourceBase' => 'modules/backend/widgets/table/DataSourceBase.php',
+  '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',
 );
--- a/storage/framework/config.php
+++ b/storage/framework/config.php
@ -2,12 +2,13 @@
  '*::app' => 
  array (
    'debug' => true,
-    'name' => 'October CMS',
+    'name' => 'Orient news',
    'url' => 'http://localhost',
-    'timezone' => 'UTC',
-    'locale' => 'en',
+    'cdn' => 'https://cdn.orient.tm',
+    'timezone' => 'Asia/Ashgabat',
+    'locale' => 'ru',
    'fallback_locale' => 'en',
-    'key' => '8o4ZwITaMYnMsYh2c4UCGvcgLLBzdODg',
+    'key' => 'eewJAqF0bRZuyNoSULErcjKkZWZKFeK6',
    'cipher' => 'AES-256-CBC',
    'providers' => 
    array (
@ -21,23 +22,23 @@
      7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
      8 => 'Illuminate\\Pipeline\\PipelineServiceProvider',
      9 => 'Illuminate\\Queue\\QueueServiceProvider',
-      10 => 'Illuminate\\Session\\SessionServiceProvider',
-      11 => 'Illuminate\\View\\ViewServiceProvider',
-      12 => 'Laravel\\Tinker\\TinkerServiceProvider',
-      13 => 'October\\Rain\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-      14 => 'October\\Rain\\Database\\DatabaseServiceProvider',
-      15 => 'October\\Rain\\Halcyon\\HalcyonServiceProvider',
-      16 => 'October\\Rain\\Filesystem\\FilesystemServiceProvider',
-      17 => 'October\\Rain\\Parse\\ParseServiceProvider',
-      18 => 'October\\Rain\\Html\\HtmlServiceProvider',
-      19 => 'October\\Rain\\Html\\UrlServiceProvider',
-      20 => 'October\\Rain\\Network\\NetworkServiceProvider',
-      21 => 'October\\Rain\\Scaffold\\ScaffoldServiceProvider',
-      22 => 'October\\Rain\\Flash\\FlashServiceProvider',
-      23 => 'October\\Rain\\Mail\\MailServiceProvider',
-      24 => 'October\\Rain\\Argon\\ArgonServiceProvider',
-      25 => 'October\\Rain\\Redis\\RedisServiceProvider',
-      26 => 'October\\Rain\\Validation\\ValidationServiceProvider',
+      10 => 'Illuminate\\Redis\\RedisServiceProvider',
+      11 => 'Illuminate\\Session\\SessionServiceProvider',
+      12 => 'Illuminate\\Validation\\ValidationServiceProvider',
+      13 => 'Illuminate\\View\\ViewServiceProvider',
+      14 => 'Laravel\\Tinker\\TinkerServiceProvider',
+      15 => 'October\\Rain\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+      16 => 'October\\Rain\\Database\\DatabaseServiceProvider',
+      17 => 'October\\Rain\\Halcyon\\HalcyonServiceProvider',
+      18 => 'October\\Rain\\Filesystem\\FilesystemServiceProvider',
+      19 => 'October\\Rain\\Parse\\ParseServiceProvider',
+      20 => 'October\\Rain\\Html\\HtmlServiceProvider',
+      21 => 'October\\Rain\\Html\\UrlServiceProvider',
+      22 => 'October\\Rain\\Network\\NetworkServiceProvider',
+      23 => 'October\\Rain\\Scaffold\\ScaffoldServiceProvider',
+      24 => 'October\\Rain\\Flash\\FlashServiceProvider',
+      25 => 'October\\Rain\\Mail\\MailServiceProvider',
+      26 => 'October\\Rain\\Argon\\ArgonServiceProvider',
      27 => 'System\\ServiceProvider',
    ),
    'loadDiscoveredPackages' => false,
@ -54,6 +55,7 @@
      'Eloquent' => 'Illuminate\\Database\\Eloquent\\Model',
      'Event' => 'Illuminate\\Support\\Facades\\Event',
      'Hash' => 'Illuminate\\Support\\Facades\\Hash',
+      'Input' => 'Illuminate\\Support\\Facades\\Input',
      'Lang' => 'Illuminate\\Support\\Facades\\Lang',
      'Log' => 'Illuminate\\Support\\Facades\\Log',
      'Mail' => 'Illuminate\\Support\\Facades\\Mail',
@ -67,6 +69,7 @@
      'Storage' => 'Illuminate\\Support\\Facades\\Storage',
      'Url' => 'Illuminate\\Support\\Facades\\URL',
      'URL' => 'Illuminate\\Support\\Facades\\URL',
+      'Validator' => 'Illuminate\\Support\\Facades\\Validator',
      'View' => 'Illuminate\\Support\\Facades\\View',
      'Model' => 'October\\Rain\\Database\\Model',
      'Block' => 'October\\Rain\\Support\\Facades\\Block',
@ -74,7 +77,6 @@
      'Config' => 'October\\Rain\\Support\\Facades\\Config',
      'Seeder' => 'October\\Rain\\Database\\Updates\\Seeder',
      'Flash' => 'October\\Rain\\Support\\Facades\\Flash',
-      'Input' => 'October\\Rain\\Support\\Facades\\Input',
      'Form' => 'October\\Rain\\Support\\Facades\\Form',
      'Html' => 'October\\Rain\\Support\\Facades\\Html',
      'Http' => 'October\\Rain\\Support\\Facades\\Http',
@ -85,7 +87,6 @@
      'Twig' => 'October\\Rain\\Support\\Facades\\Twig',
      'DbDongle' => 'October\\Rain\\Support\\Facades\\DbDongle',
      'Schema' => 'October\\Rain\\Support\\Facades\\Schema',
-      'Validator' => 'October\\Rain\\Support\\Facades\\Validator',
      'Cms' => 'Cms\\Facades\\Cms',
      'Backend' => 'Backend\\Facades\\Backend',
      'BackendMenu' => 'Backend\\Facades\\BackendMenu',
@ -94,8 +95,6 @@
      'SystemException' => 'October\\Rain\\Exception\\SystemException',
      'ApplicationException' => 'October\\Rain\\Exception\\ApplicationException',
      'ValidationException' => 'October\\Rain\\Exception\\ValidationException',
-      'Illuminate\\Support\\Facades\\Input' => 'October\\Rain\\Support\\Facades\\Input',
-      'Illuminate\\Support\\Debug\\HtmlDumper' => 'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper',
    ),
  ),
  '*::cms' => 
@ -105,7 +104,7 @@
    'backendUri' => 'howpsuzlyk',
    'backendForceSecure' => false,
    'backendForceRemember' => true,
-    'backendTimezone' => 'UTC',
+    'backendTimezone' => 'Asia/Ashgabat',
    'backendSkin' => 'Backend\\Skins\\Standard',
    'runMigrationsOnLogin' => NULL,
    'loadModules' => 
@ -157,7 +156,7 @@
      'folder' => '755',
    ),
    'enableSafeMode' => NULL,
-    'enableCsrfProtection' => true,
+    'enableCsrfProtection' => false,
    'forceBytecodeInvalidation' => true,
    'enableTwigStrictVariables' => false,
    'restrictBaseDir' => true,
@ -185,7 +184,7 @@
      'file' => 
      array (
        'driver' => 'file',
-        'path' => '/Users/tmstore/PhpstormProjects/orient/storage/framework/cache',
+        'path' => '/var/www/orient-site/storage/framework/cache',
      ),
      'memcached' => 
      array (
@ -215,75 +214,7 @@
    'paths' => 
    array (
    ),
-    'compiled' => '/Users/tmstore/PhpstormProjects/orient/storage/framework/views',
-  ),
-  '*::logging' => 
-  array (
-    'default' => 'single',
-    'channels' => 
-    array (
-      'stack' => 
-      array (
-        'driver' => 'stack',
-        'channels' => 
-        array (
-          0 => 'daily',
-        ),
-        'ignore_exceptions' => false,
-      ),
-      'single' => 
-      array (
-        'driver' => 'single',
-        'path' => '/Users/tmstore/PhpstormProjects/orient/storage/logs/system.log',
-        'level' => 'debug',
-      ),
-      'daily' => 
-      array (
-        'driver' => 'daily',
-        'path' => '/Users/tmstore/PhpstormProjects/orient/storage/logs/system.log',
-        'level' => 'debug',
-        'days' => 14,
-      ),
-      'slack' => 
-      array (
-        'driver' => 'slack',
-        'url' => NULL,
-        'username' => 'October CMS Log',
-        'emoji' => ':boom:',
-        'level' => 'critical',
-      ),
-      'papertrail' => 
-      array (
-        'driver' => 'monolog',
-        'level' => 'debug',
-        'handler' => 'Monolog\\Handler\\SyslogUdpHandler',
-        'handler_with' => 
-        array (
-          'host' => NULL,
-          'port' => NULL,
-        ),
-      ),
-      'stderr' => 
-      array (
-        'driver' => 'monolog',
-        'handler' => 'Monolog\\Handler\\StreamHandler',
-        'formatter' => NULL,
-        'with' => 
-        array (
-          'stream' => 'php://stderr',
-        ),
-      ),
-      'syslog' => 
-      array (
-        'driver' => 'syslog',
-        'level' => 'debug',
-      ),
-      'errorlog' => 
-      array (
-        'driver' => 'errorlog',
-        'level' => 'debug',
-      ),
-    ),
+    'compiled' => '/var/www/orient-site/storage/framework/views',
  ),
  '*::database' => 
  array (
@ -294,18 +225,18 @@
      'sqlite' => 
      array (
        'driver' => 'sqlite',
-        'database' => 'storage/database.sqlite',
+        'database' => 'oc_orient',
        'prefix' => '',
      ),
      'mysql' => 
      array (
        'driver' => 'mysql',
        'engine' => 'InnoDB',
-        'host' => '192.168.1.2',
+        'host' => 'localhost',
        'port' => '3306',
-        'database' => 'orient',
-        'username' => 'orient',
-        'password' => 'orient',
+        'database' => 'oc_orient',
+        'username' => 'merdan',
+        'password' => 'QAZwsx@12',
        'charset' => 'utf8mb4',
        'collation' => 'utf8mb4_unicode_ci',
        'prefix' => '',
@ -315,10 +246,10 @@
      array (
        'driver' => 'pgsql',
        'host' => 'localhost',
-        'port' => 5432,
-        'database' => 'database',
-        'username' => 'root',
-        'password' => '',
+        'port' => '3306',
+        'database' => 'oc_orient',
+        'username' => 'merdan',
+        'password' => 'QAZwsx@12',
        'charset' => 'utf8',
        'prefix' => '',
        'schema' => 'public',
@ -327,10 +258,10 @@
      array (
        'driver' => 'sqlsrv',
        'host' => 'localhost',
-        'port' => 1433,
-        'database' => 'database',
-        'username' => 'root',
-        'password' => '',
+        'port' => '3306',
+        'database' => 'oc_orient',
+        'username' => 'merdan',
+        'password' => 'QAZwsx@12',
        'prefix' => '',
      ),
    ),
@ -343,7 +274,7 @@
      array (
        'host' => '127.0.0.1',
        'password' => NULL,
-        'port' => 6379,
+        'port' => '6379',
        'database' => 0,
      ),
    ),
@ -358,7 +289,7 @@
      'local' => 
      array (
        'driver' => 'local',
-        'root' => '/Users/tmstore/PhpstormProjects/orient/storage/app',
+        'root' => '/var/www/orient-site/storage/app',
        'url' => '/storage/app',
      ),
      's3' => 
@ -380,35 +311,11 @@
      ),
    ),
  ),
-  '*::session' => 
-  array (
-    'driver' => 'file',
-    'lifetime' => 120,
-    'expire_on_close' => false,
-    'encrypt' => false,
-    'files' => '/Users/tmstore/PhpstormProjects/orient/storage/framework/sessions',
-    'connection' => NULL,
-    'table' => 'sessions',
-    'lottery' => 
-    array (
-      0 => 2,
-      1 => 100,
-    ),
-    'cookie' => 'october_session',
-    'path' => '/',
-    'domain' => NULL,
-    'http_only' => true,
-    'secure' => false,
-    'same_site' => 'Lax',
-  ),
  '*::tinker' => 
  array (
    'commands' => 
    array (
    ),
-    'alias' => 
-    array (
-    ),
    'dont_alias' => 
    array (
      0 => 'App\\Nova',
--- a/themes/modern/assets/css/components/1-main/variables.scss
+++ b/themes/modern/assets/css/components/1-main/variables.scss
@ -4,13 +4,13 @@ $text-black: #000;
 $text-color-white: #FFFFFF;
 $text-color-grey: #A2A2A2;
 $color-grey: #B4B4B4;
-$p-size: 20px;
-$p-height: 40px;
-$h2-size: 24px;
-$h2-height: 36px;
-$h3-size: 20px;
+$p-size: 16px;
+$p-height: 30px;
+$h2-size: 22px;
+$h2-height: 30px;
+$h3-size: 18px;
 $h3-height: 26px;
-$h4-size: 18px;
-$h4-height: 30px;
+$h4-size: 16px;
+$h4-height: 25px;
 $h5-size: 14px;
 $h5-height: 20px;
--- a/themes/modern/assets/css/components/2-layout/newsCard.scss
+++ b/themes/modern/assets/css/components/2-layout/newsCard.scss
@ -52,7 +52,7 @@
        line-height: $h4-height;
        margin: 10px 0 0 0;
        display: block;
-        max-height: 90px;
+        max-height: 75px;
        overflow: hidden;
        text-overflow: ellipsis;
    }
--- a/themes/modern/assets/css/components/2-layout/responsive.scss
+++ b/themes/modern/assets/css/components/2-layout/responsive.scss
@ -3,42 +3,28 @@
        max-width: 1240px;
    }
    // slider start
-    .slider {
-        &__nav {
-            a {
-                span {
-                    font-size: 16px;
-                }
-            }
-        }
-    }
    // slider end
-    .card { 
-        &__link {
-            font-size: 16px;
-        }
-    }
    .heading__content-body-link {
-      font-size: 16px;
+        font-size: 16px;
    }
    .heading__content-body-para {
-      font-size: 16px;
-      h3 {
-        font-size: 18px;
-        line-height: 30px;
-      }
+        font-size: 16px;
+        h3 {
+            font-size: 18px;
+            line-height: 30px;
+        }
    }
    .main__sidebar-title {
-      font-size: 16px;
+        font-size: 16px;
    }
    .about__para {
-      font-size: 16px;
+        font-size: 16px;
    }
    .address__inner {
-      font-size: 16px;
+        font-size: 16px;
    }
    .form__input label {
-      font-size: 16px;
+        font-size: 16px;
    }
 }
@include xlg-xxlg {
@ -60,6 +46,8 @@
                span {
                    overflow: hidden;
                    text-overflow: ellipsis;
+                    font-size: 14px;
+                    line-height: 22px;
                }
            }
        }
@ -82,6 +70,11 @@
            &-column {
                margin: 0 10px;
                width: calc(30% - 20px);
+                & .card {
+                    &:last-child {
+                        display: none;
+                    }
+                }
            }
        }
    }
@ -113,6 +106,11 @@
    }
    .card {
        padding: 15px;
+        &__link {
+            max-height: 66px;
+            font-size: 14px;
+            line-height: 22px;
+        }
    }
    .partner {
        &__title {
@ -134,7 +132,14 @@
            }
            &-body {
                &-para {
-                    height: 90px;
+                    height: 88px;
+                    font-size: 14px;
+                    line-height: 22px;
+                }
+                &-link {
+                    height: 44px;
+                    font: 14px;
+                    line-height: 22px;
                }
            }
        }
@ -172,6 +177,9 @@
    }
 }
@include lg-xlg {
+    .hero {
+        margin-top: 30px;
+    }
    .slider {
        &__nav {
            display: none;
@ -336,6 +344,9 @@
    }
 }
@include sm-md {
+    .hero {
+        margin-top: 0;
+    }
    .slider {
        height: 350px;
        &__item {
--- a/themes/modern/assets/css/components/3-page/heading.scss
+++ b/themes/modern/assets/css/components/3-page/heading.scss
@ -82,7 +82,7 @@
        line-height: $h4-height;
        margin: 10px 0 0 0;
        display: block;
-        height: 60px;
+        height: 50px;
        overflow: hidden;
        text-overflow: ellipsis;
        margin-bottom: 20px;
@ -92,7 +92,7 @@
        line-height: $h4-height;
        font-weight: 400;
        color: $text-light-black;
-        height: 120px;
+        height: 100px;
        overflow: hidden;
        text-overflow: ellipsis;
      }
--- a/themes/modern/assets/css/components/3-page/home.scss
+++ b/themes/modern/assets/css/components/3-page/home.scss
@ -1,3 +1,6 @@
+.hero {
+    margin-top: 50px;
+}
 // banner start
 .banner {
    margin: 80px 0;
@ -153,11 +156,11 @@
            flex-wrap: wrap;
            margin: -30px -5px 80px -5px;
            &-link {
-                padding: 10px 20px;
+                padding: 3px 7px;
                border-right: 5px;
                background: #f7f7f6;
-                font-size: $h4-size;
-                line-height: $h4-height;
+                font-size: $h5-size;
+                line-height: $h5-height;
                color: $text-light-black;
                margin: 5px;
            }
@ -238,10 +241,11 @@
            margin: 0 20px;
            .card {
                padding: 25px 0;
-                border-bottom: 1px solid $text-color-grey;
-                &:nth-last-child(1) {
-                    border-bottom: none;
-                    padding: 25px 0 0 0;
+                border-top: 1px solid #dfdfdf;
+
+                &:nth-child(1) {
+                    padding: 0 0 25px 0;
+                    border-top: none;
                }
            }
        }
--- a/themes/modern/assets/css/components/3-page/news.scss
+++ b/themes/modern/assets/css/components/3-page/news.scss
@ -50,6 +50,7 @@
    &__image {
        width: 100%;
        margin: 50px 0;
+        display: block;
        img {
            width: 100%;
            height: auto;
@ -58,7 +59,7 @@
    &__body {
        p {
            font-size: $p-size;
-            line-height: $p-height;
+            line-height: $p-height; 
            margin-bottom: 30px;
            a {
                color: blue;
@ -66,8 +67,10 @@
        }
        img {
            &.aligncenter {
-                margin: 0 auto;
+                margin: 15px auto;
                display: block;
+                width: 100%;
+                height: auto;
            }
        }
        &-row {
--- a/themes/modern/assets/css/main.css
+++ b/themes/modern/assets/css/main.css
@ -147,16 +147,16 @@ li {
  width: calc(100% - 60px);
  font-family: "roboto";
  padding: 14px 40px 14px 20px;
-  font-size: 18px;
-  line-height: 18px;
+  font-size: 16px;
+  line-height: 16px;
  color: rgba(36, 36, 36, 0.3);
  border-radius: 5px;
  border: 1px solid #c9c9c9;
 }
 .header__search-input input::placeholder {
  font-family: "roboto";
-  font-size: 18px;
-  line-height: 18px;
+  font-size: 16px;
+  line-height: 16px;
  color: rgba(36, 36, 36, 0.3);
 }
 .header__search-btn {
@ -554,8 +554,8 @@ li {
  background: #FD4C24;
  color: #FFFFFF;
  font-weight: 400;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  padding: 5px 20px;
 }
 .slider__nav {
@ -622,8 +622,8 @@ li {
  display: flex;
  align-items: center;
  justify-content: flex-start;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  color: #FFFFFF;
  font-weight: 700;
  position: relative;
@ -759,11 +759,11 @@ li {
 .card__link {
  color: #000;
  font-weight: 700;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  margin: 10px 0 0 0;
  display: block;
-  max-height: 90px;
+  max-height: 75px;
  overflow: hidden;
  text-overflow: ellipsis;
 }
@ -920,7 +920,7 @@ li {
  display: flex;
  justify-content: center;
  align-items: center;
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  font-weight: 700;
  padding: 10px 0;
@ -936,7 +936,7 @@ li {
  background-position: center center;
  background-size: contain;
  background-repeat: no-repeat;
-  font-size: 17px;
+  font-size: 15px;
  line-height: 23px;
  justify-content: center;
  align-items: center;
@ -1054,6 +1054,10 @@ li {
  background-color: #2495f3;
 }

+.hero {
+  margin-top: 50px;
+}
+
 .banner {
  margin: 80px 0;
 }
@ -1127,7 +1131,7 @@ li {
  position: absolute;
 }
 .main__body-header-title {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  font-weight: 700;
  color: #242424;
@ -1142,7 +1146,7 @@ li {
  margin: -100px 30px 0 30px;
 }
 .main__body-title {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  font-weight: 700;
  color: #242424;
@ -1170,8 +1174,8 @@ li {
  width: calc(30% - 25px);
 }
 .main__sidebar-title {
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  font-weight: 700;
  text-transform: uppercase;
  margin-bottom: 80px;
@ -1209,11 +1213,11 @@ li {
  margin: -30px -5px 80px -5px;
 }
 .main__sidebar-tag-link {
-  padding: 10px 20px;
+  padding: 3px 7px;
  border-right: 5px;
  background: #f7f7f6;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 14px;
+  line-height: 20px;
  color: #242424;
  margin: 5px;
 }
@ -1238,7 +1242,7 @@ li {
  position: absolute;
 }
 .event__header-title {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  font-weight: 700;
  color: #242424;
@ -1294,18 +1298,18 @@ li {
 }
 .event__body-column .card {
  padding: 25px 0;
-  border-bottom: 1px solid #A2A2A2;
+  border-top: 1px solid #dfdfdf;
 }
-.event__body-column .card:nth-last-child(1) {
-  border-bottom: none;
-  padding: 25px 0 0 0;
+.event__body-column .card:nth-child(1) {
+  padding: 0 0 25px 0;
+  border-top: none;
 }

 .partner {
  margin-bottom: 80px;
 }
 .partner__title {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  font-weight: 700;
  color: #242424;
@ -1326,7 +1330,7 @@ li {
 .heading__title {
  font-weight: 700;
  color: #242424;
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  margin-bottom: 80px;
 }
@ -1405,21 +1409,21 @@ li {
 .heading__content-body-link {
  color: #000;
  font-weight: 700;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  margin: 10px 0 0 0;
  display: block;
-  height: 60px;
+  height: 50px;
  overflow: hidden;
  text-overflow: ellipsis;
  margin-bottom: 20px;
 }
 .heading__content-body-para {
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  font-weight: 400;
  color: #242424;
-  height: 120px;
+  height: 100px;
  overflow: hidden;
  text-overflow: ellipsis;
 }
@ -1447,7 +1451,7 @@ li {
 }
 .heading__footer-input input {
  text-align: center;
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  height: 100%;
  width: 100%;
@ -1457,7 +1461,7 @@ li {
  color: #242424;
 }
 .heading__footer span {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  color: #242424;
  font-weight: 400;
@ -1465,7 +1469,7 @@ li {
 }

 .address__inner {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  color: #242424;
  font-weight: 400;
@ -1479,13 +1483,13 @@ li {
  padding: 80px 0;
 }
 .about__title {
-  font-size: 24px;
-  line-height: 36px;
+  font-size: 22px;
+  line-height: 30px;
  font-weight: 700;
  color: #242424;
 }
 .about__para {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 40px;
  font-weight: 400;
  color: #242424;
@ -1495,7 +1499,7 @@ li {
 .form__title {
  font-weight: 700;
  color: #242424;
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  margin-bottom: 80px;
 }
@ -1511,8 +1515,8 @@ li {
 }
 .form__input label {
  display: block;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  font-weight: 700;
  color: #242424;
  margin-bottom: 20px;
@ -1523,8 +1527,8 @@ li {
  height: 60px;
  border-radius: 5px;
  border: 1px solid #c9c9c9;
-  font-size: 18px;
-  line-height: 18px;
+  font-size: 16px;
+  line-height: 16px;
  color: #242424;
 }
 .form__input:last-child {
@ -1540,8 +1544,8 @@ li {
 }
 .form__input-bg label {
  display: block;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  font-weight: 700;
  color: #242424;
  margin-bottom: 20px;
@ -1552,8 +1556,8 @@ li {
  height: 60px;
  border-radius: 5px;
  border: 1px solid #c9c9c9;
-  font-size: 18px;
-  line-height: 18px;
+  font-size: 16px;
+  line-height: 16px;
  color: #242424;
 }
 .form__textarea {
@ -1562,8 +1566,8 @@ li {
 }
 .form__textarea label {
  display: block;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  font-weight: 700;
  color: #242424;
  margin-bottom: 20px;
@ -1582,8 +1586,8 @@ li {
  font-weight: 700;
  padding: 14px;
  border-radius: 5px;
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  margin-top: 30px;
 }

@ -1601,8 +1605,8 @@ li {
  width: calc(30% - 25px);
 }
 .news__sidebar-title {
-  font-size: 18px;
-  line-height: 30px;
+  font-size: 16px;
+  line-height: 25px;
  font-weight: 700;
  text-transform: uppercase;
  margin-bottom: 20px;
@ -1624,13 +1628,13 @@ li {
 .news__title {
  color: #000;
  font-weight: 700;
-  font-size: 24px;
-  line-height: 36px;
+  font-size: 22px;
+  line-height: 30px;
 }
 .news__date {
  display: flex;
  align-items: center;
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  color: #A2A2A2;
  font-weight: 400;
@ -1642,22 +1646,25 @@ li {
 .news__image {
  width: 100%;
  margin: 50px 0;
+  display: block;
 }
 .news__image img {
  width: 100%;
  height: auto;
 }
 .news__body p {
-  font-size: 20px;
-  line-height: 40px;
+  font-size: 16px;
+  line-height: 30px;
  margin-bottom: 30px;
 }
 .news__body p a {
  color: blue;
 }
 .news__body img.aligncenter {
-  margin: 0 auto;
+  margin: 15px auto;
  display: block;
+  width: 100%;
+  height: auto;
 }
 .news__body-row {
  display: flex;
@ -1678,8 +1685,8 @@ li {
  fill: #FD4C24;
 }
 .news__footer-name {
-  font-size: 24px;
-  line-height: 36px;
+  font-size: 22px;
+  line-height: 30px;
  font-weight: 700;
  color: #242424;
 }
@ -1688,15 +1695,15 @@ li {
  padding: 80px 0;
 }
 .terms__title {
-  font-size: 20px;
+  font-size: 18px;
  line-height: 26px;
  font-weight: 700;
  color: #000;
  margin-bottom: 40px;
 }
 .terms__para {
-  font-size: 20px;
-  line-height: 40px;
+  font-size: 16px;
+  line-height: 30px;
  font-weight: 400;
  color: #000;
  margin-bottom: 40px;
@ -1707,14 +1714,6 @@ li {
    max-width: 1240px;
  }

-  .slider__nav a span {
-    font-size: 16px;
-  }
-
-  .card__link {
-    font-size: 16px;
-  }
-
  .heading__content-body-link {
    font-size: 16px;
  }
@ -1765,6 +1764,8 @@ li {
  .slider__nav a span {
    overflow: hidden;
    text-overflow: ellipsis;
+    font-size: 14px;
+    line-height: 22px;
  }

  .event__header {
@ -1784,6 +1785,9 @@ li {
    margin: 0 10px;
    width: calc(30% - 20px);
  }
+  .event__body-column .card:last-child {
+    display: none;
+  }

  .main__body-header {
    margin-bottom: 40px;
@ -1807,6 +1811,11 @@ li {
  .card {
    padding: 15px;
  }
+  .card__link {
+    max-height: 66px;
+    font-size: 14px;
+    line-height: 22px;
+  }

  .partner__title {
    margin-bottom: 40px;
@ -1826,7 +1835,14 @@ li {
    margin-bottom: 15px;
  }
  .heading__content-body-para {
-    height: 90px;
+    height: 88px;
+    font-size: 14px;
+    line-height: 22px;
+  }
+  .heading__content-body-link {
+    height: 44px;
+    font: 14px;
+    line-height: 22px;
  }
  .heading a.progressive {
    height: 250px;
@ -1853,6 +1869,10 @@ li {
  }
 }
@media (max-width: 1023px) {
+  .hero {
+    margin-top: 30px;
+  }
+
  .slider__nav {
    display: none;
  }
@ -1925,7 +1945,7 @@ li {
    text-align: center;
    margin-right: 0;
    padding: 20px;
-    font-size: 20px;
+    font-size: 18px;
    line-height: 26px;
    font-weight: 700;
    width: calc(100% - 40px);
@ -2006,6 +2026,10 @@ li {
  }
 }
@media (max-width: 700px) {
+  .hero {
+    margin-top: 0;
+  }
+
  .slider {
    height: 350px;
  }
--- a/themes/modern/assets/js/jquery.js
+++ b/themes/modern/assets/js/jquery.js
--- a/themes/modern/assets/js/jquery_1.12.4.js
+++ b/themes/modern/assets/js/jquery_1.12.4.js
--- a/themes/modern/meta/menus/top-menu.yaml
+++ b/themes/modern/meta/menus/top-menu.yaml
@ -1,9 +1,13 @@
 items:
    -
        title: Главная
+        nesting: null
        type: url
        url: /
        code: ''
+        reference: null
+        cmsPage: null
+        replace: null
        viewBag:
            locale:
                en:
@ -47,6 +51,38 @@ items:
                    isHidden: '0'
                    cssClass: ''
                    isExternal: '0'
+    -
+        title: Фото
+        nesting: 0
+        type: blog-category
+        code: ''
+        reference: '6'
+        cmsPage: category
+        replace: 0
+        viewBag:
+            locale:
+                en:
+                    title: Photo
+                    url: ''
+            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
--- a/themes/modern/pages/index.htm
+++ b/themes/modern/pages/index.htm
@ -18,50 +18,48 @@ 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' %}

-
-<!--{% component 'reklama' %}-->
 <!-- banner start -->
 <section class="banner">
    <div class="auto__container">
@ -84,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">
@ -93,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">
@ -102,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">
@ -111,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>
@ -145,4 +140,4 @@ random = 0

 {% put scripts %}
 <script src="{{['assets/slick/slick.min.js','assets/js/lazy.js','assets/js/main.js']|theme}}"></script>
-{% endput %}
+{% endput %}
--- a/themes/modern/pages/post.htm
+++ b/themes/modern/pages/post.htm
@ -48,7 +48,7 @@ slug = "{{ :slug }}"
        </h1>
        {% if post.featured_image %}
        <picture class="news__image">
-            <img src="{{post.featured_image|media_cdn|modify({filter:'post'})}}" alt="{{post.title}}">
+            <img src="{{post.featured_image|media_cdn}}" alt="{{post.title}}">
        </picture>
        {% endif %}
    </header>
@ -97,4 +97,4 @@ slug = "{{ :slug }}"
        }
    });
 </script>
-{% endput %}
+{% endput %}
--- a/themes/modern/partials/index/category_posts.htm
+++ b/themes/modern/partials/index/category_posts.htm
@ -1,3 +1,5 @@
+[viewBag]
+==
 {% set posts = category.take_posts(3) %}
 <div class="main__body-column">
    <div class="main__body-header">
@ -8,7 +10,7 @@
            {{'page.more'|_}}
        </a>
    </div>
-    <a href="{{posts.first.featured_image|media_cdn| modify({ filter: 'thumb-medium' })}}" class="primary progressive replace">
+    <a href="{{posts.first.featured_image|media_cdn}}" class="primary progressive replace">
        <img class="preview" src="{{'assets/images/news/1.jpg'|theme}}" alt="{{posts.first.title}}">
    </a>
    <div class="main__body-card">
@ -35,4 +37,4 @@
    {% partial 'index/category_post_item' post = posts.first %}
    {% partial 'index/category_post_item' post = posts.last %}
    </div>
-</div>
+</div>
--- a/themes/modern/partials/index/partner_news.htm
+++ b/themes/modern/partials/index/partner_news.htm
@ -1,7 +1,7 @@
+[viewBag]
+
 [rssItems]
 maxItems = 6
-
-[viewBag]
 ==
 {% if rssItems.items %}
 <div class="main__body">
@ -35,4 +35,4 @@ maxItems = 6
        {% endfor %}
    </div>
 </div>
-{% endif %}
+{% endif %}
--- a/themes/modern/partials/index/post_item.htm
+++ b/themes/modern/partials/index/post_item.htm
@ -1,3 +1,5 @@
+[viewBag]
+==
 <div class="card">
    <div class="card__header">
        <div class="card__header-category">
@ -7,8 +9,6 @@
                {{post.categories.implode('name',',')}}
            {% endif %}
        </div>
-    </div>
-    <div class="card__header">
        <time class="card__header-date"><span>{{post.published_at|date('d.m.Y')}}</span>
            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4 4">
                <path id="Polygon_1" data-name="Polygon 1" d="M2,0,4,2,2,4,0,2Z"
@ -16,8 +16,11 @@
            </svg>
            <span>{{post.published_at|date('H:i')}}</span>
        </time>
+    </div>
+    <div class="card__header">
+
    </div>
    <a href="{{'post'|page({id:post.id,slug:post.slug})}}" class="card__link">
        {{post.title}}
    </a>
-</div>
+</div>
--- a/themes/modern/partials/index/top_section.htm
+++ b/themes/modern/partials/index/top_section.htm
@ -1,3 +1,5 @@
+[viewBag]
+==
 {% set firstPost = category.posts_filtered.shift %}
 <section class="event">
    <div class="auto__container">
@ -13,7 +15,7 @@
            <div class="event__body">
                <div class="event__body-row">
                    <div class="event__body-image">
-                        <a href="{{firstPost.featured_image|media_cdn| modify({ filter: 'thumb-large' })}}" class="primary progressive replace">
+                        <a href="{{firstPost.featured_image|media_cdn}}" class="primary progressive replace">
                            <img class="preview" src="{{'assets/images/news/1.jpg'|theme}}" alt="{{firstPost.title}}">
                        </a>
                        <div class="event__body-card">
@ -34,4 +36,4 @@
            </div>
        </div>
    </div>
-</section>
+</section>
--- a/themes/modern/partials/slider.htm
+++ b/themes/modern/partials/slider.htm
@ -1,3 +1,5 @@
+[viewBag]
+
 [blogPosts]
 pageNumber = "{{ :page }}"
 postsPerPage = 4
@ -5,8 +7,6 @@ noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = "category"
 postPage = "post"
-
-[viewBag]
 ==
 <section class="hero">
    <div class="auto__container">
@ -15,7 +15,7 @@ postPage = "post"
                <div class="slider__inner">
                    {% for post in posts %}
                    <div class="slider__item">
-                        <img src="{{post.featured_image|media_cdn| modify({ filter: 'slider' })}}" alt="{{post.title}}">
+                        <img src="{{post.featured_image|media_cdn}}" alt="{{post.title}}">
                        {% if post.categories.count()>0%}
                        <div class="slider__item-category">
                           {{post.categories.implode('name', ', ')}}
@ -36,4 +36,4 @@ postPage = "post"
            </div>
        </div>
    </div>
-</section>
+</section>
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@ -37,11 +37,13 @@ namespace Composer\Autoload;
 *
 * @author Fabien Potencier <fabien@symfony.com>
 * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
 */
 class ClassLoader
 {
+    private $vendorDir;
+
    // PSR-4
    private $prefixLengthsPsr4 = array();
    private $prefixDirsPsr4 = array();
@ -57,10 +59,17 @@ class ClassLoader
    private $missingClasses = array();
    private $apcuPrefix;

+    private static $registeredLoaders = array();
+
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
    public function getPrefixes()
    {
        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
        }

        return array();
@ -300,6 +309,17 @@ class ClassLoader
    public function register($prepend = false)
    {
        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
    }

    /**
@ -308,6 +328,10 @@ class ClassLoader
    public function unregister()
    {
        spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
    }

    /**
@ -367,6 +391,16 @@ class ClassLoader
        return $file;
    }

+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
    private function findFileWithExtension($class, $ext)
    {
        // PSR-4 lookup
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@ -6,7 +6,12 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);

 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
    'JSMin' => $vendorDir . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
    'JSMinException' => $vendorDir . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
    'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+    'October\\Tests\\Concerns\\InteractsWithAuthentication' => $baseDir . '/tests/concerns/InteractsWithAuthentication.php',
+    'October\\Tests\\Fixtures\\Backend\\Models\\UserFixture' => $baseDir . '/tests/fixtures/backend/models/UserFixture.php',
+    'PluginTestCase' => $baseDir . '/tests/PluginTestCase.php',
+    'TestCase' => $baseDir . '/tests/TestCase.php',
 );
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@ -38,7 +38,6 @@ return array(
    'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
    'October\\Rain\\' => array($vendorDir . '/october/rain/src'),
    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-    'League\\MimeTypeDetection\\' => array($vendorDir . '/league/mime-type-detection/src'),
    'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
    'League\\Csv\\' => array($vendorDir . '/league/csv/src'),
    'Leafo\\ScssPhp\\' => array($vendorDir . '/leafo/scssphp/src'),
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@ -13,19 +13,24 @@ class ComposerAutoloaderInitce290a037d2cbd6fc6b8d537449d0ac2
        }
    }

+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
    public static function getLoader()
    {
        if (null !== self::$loader) {
            return self::$loader;
        }

+        require __DIR__ . '/platform_check.php';
+
        spl_autoload_register(array('ComposerAutoloaderInitce290a037d2cbd6fc6b8d537449d0ac2', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
        spl_autoload_unregister(array('ComposerAutoloaderInitce290a037d2cbd6fc6b8d537449d0ac2', 'loadClassLoader'));

        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';

            call_user_func(\Composer\Autoload\ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2::getInitializer($loader));
        } else {
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@ -81,7 +81,6 @@ class ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2
        ),
        'L' => 
        array (
-            'League\\MimeTypeDetection\\' => 25,
            'League\\Flysystem\\' => 17,
            'League\\Csv\\' => 11,
            'Leafo\\ScssPhp\\' => 14,
@ -253,10 +252,6 @@ class ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2
        array (
            0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
        ),
-        'League\\MimeTypeDetection\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/league/mime-type-detection/src',
-        ),
        'League\\Flysystem\\' => 
        array (
            0 => __DIR__ . '/..' . '/league/flysystem/src',
@ -397,9 +392,14 @@ class ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2
    );

    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
        'JSMin' => __DIR__ . '/..' . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
        'JSMinException' => __DIR__ . '/..' . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
        'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+        'October\\Tests\\Concerns\\InteractsWithAuthentication' => __DIR__ . '/../..' . '/tests/concerns/InteractsWithAuthentication.php',
+        'October\\Tests\\Fixtures\\Backend\\Models\\UserFixture' => __DIR__ . '/../..' . '/tests/fixtures/backend/models/UserFixture.php',
+        'PluginTestCase' => __DIR__ . '/../..' . '/tests/PluginTestCase.php',
+        'TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
    );

    public static function getInitializer(ClassLoader $loader)
--- a/vendor/composer/platform_check.php
+++ b/vendor/composer/platform_check.php
@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70205)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.5". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}