dev

src/UnifyTheme.php

@@ -516,7 +516,7 @@ static public function initBeforeRender()
     /**
      * @var bool
      */
-    public $isShowLoader = false;
+    public $is_show_loader = false;
 
     /**
      * @var bool

src/assets/UnifyDefaultAsset.php

@@ -39,12 +39,14 @@ class UnifyDefaultAsset extends UnifyAsset
         //'@vendor/fortawesome/font-awesome/css/all.min.css',
 
         'assets/vendor/icon-awesome/css/font-awesome.min.css',
+        /*'assets/vendor/icon-awesome/css/font-awesome.min.css',
         'assets/vendor/icon-line/css/simple-line-icons.css',
         'assets/vendor/icon-etlinefont/style.css',
         'assets/vendor/icon-line-pro/style.css',
-        'assets/vendor/icon-hs/style.css',
-        'assets/vendor/animate.css',
-        'assets/vendor/typedjs/typed.css',
+        'assets/vendor/icon-hs/style.css',*/
+
+        /*'assets/vendor/animate.css',
+        'assets/vendor/typedjs/typed.css',*/
 
         'assets/css/unify-core.css',
         'assets/css/unify-components.css',

src/assets/UnifyThemeAsset.php

@@ -36,11 +36,11 @@ class UnifyThemeAsset extends UnifyAsset
     public $depends = [
         UnifyDefaultAsset::class,
 
-        UnifyHsMegamenuAsset::class,
-        UnifyHsHamburgersAsset::class,
+        //UnifyHsMegamenuAsset::class,
+        //UnifyHsHamburgersAsset::class,
         UnifyHsPopupAsset::class,
         UnifyHsOnscrollAnimationAsset::class,
-        UnifyHsStickyBlockAsset::class,
-        UnifyHsCarouselAsset::class,
+        //UnifyHsStickyBlockAsset::class,
+        //UnifyHsCarouselAsset::class,
     ];
 }

src/assets/src/css/unify-custom.css

@@ -400,3 +400,7 @@ html.mm-right .mm-menu.mm-fx-menu-slide {
 .u-btn-primary, a.g-bg-primary {
     color: #fff !important;
 }
+
+
+
+

src/assets/src/js/unify-custom.js

@@ -110,6 +110,11 @@
 
                  return false;
             });
+
+
+            $('.sx-preloader').fadeOut('slow', function () {
+                $(this).remove();
+            });
         }
     });
 
@@ -136,6 +141,9 @@
         }
     }
 
+
+
+
+
+
 })(sx, sx.$, sx._);
-
-

src/components/UnifyThemeSettings.php

@@ -127,6 +127,11 @@ class UnifyThemeSettings extends Component
 
 
 
+    /**
+     * @var bool
+     */
+    public $is_show_loader = false;
+
     /**
      * @var bool
      */
@@ -317,6 +322,7 @@ public function rules()
                 [
                     'isShowBottomBlock',
                     'is_image_body_begin',
+                    'is_show_loader',
                     'is_header_sticky_margin',
                     'is_header_sticky',
                 ],
@@ -383,6 +389,7 @@ public function attributeLabels()
 
             'isShowBottomBlock' => "Показывать блок с телефоном и email на всех страницах?",
 
+            'is_show_loader'             => "Показывать индикатор загрузки перед загрузкой страницы?",
             'is_image_body_begin'             => "Показывать в начале страницы картинку из анонса?",
             'body_begin_image_height_tree'    => "Высота блока с картинкой в разделах",
             'body_begin_image_height_element' => "Высота блока с картинкой в новостях",
@@ -409,6 +416,7 @@ public function attributeHints()
             'body_outer'    => "Задается для центрированных сайтов",
             'is_header_sticky'    => "Фиксированная шапка будет растянута на весь экран",
             'is_show_search_block'        => 'При выборе "Да", в шапке будет выведен поисковый блок',
+            'is_show_loader'        => 'Показывать индикатор загрузки?',
         ]);
     }
 
@@ -488,6 +496,9 @@ public function getConfigFormFields()
                         'class' => BoolField::class,
                     ],
 
+                    'is_show_loader' => [
+                        'class' => BoolField::class,
+                    ],
 
 
                     'main_theme_color1' => [
@@ -583,6 +594,8 @@ public function getConfigFormFields()
                     ],
 
 
+
+
                     'is_header_sticky' => [
                         'class' => BoolField::class,
                     ],
@@ -747,8 +760,6 @@ public function getConfigFormFields()
                     ],
                 ],
             ],
-
-
         ];
     }
 

src/views/headers/header-mobile.php

@@ -7,6 +7,9 @@
  */
 /* @var $this yii\web\View */
 /* @see https://htmlstream.com/public/preview/unify-v2.6.1/unify-main/shortcodes/headers/classic-header--topbar-1.html */
+\skeeks\assets\unify\base\UnifyHsHamburgersAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsMegamenuAsset::register($this);
+
 $this->registerJs(<<<JS
     /* Перемещаем модальное окно в конец body. */
     $('.modal').on('shown.bs.modal', function (e) {

src/views/headers/header-v1.php

@@ -10,6 +10,8 @@
 
 \skeeks\assets\unify\base\UnifyHsDropdownAsset::register($this);
 \skeeks\assets\unify\base\UnifyHsHeaderAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsHamburgersAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsMegamenuAsset::register($this);
 
 $this->registerJs(<<<JS
 

src/views/headers/header-v2.php

@@ -8,6 +8,8 @@
 /* @var $this yii\web\View */
 \skeeks\assets\unify\base\UnifyHsHeaderAsset::register($this);
 \skeeks\assets\unify\base\UnifyHsDropdownAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsHamburgersAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsMegamenuAsset::register($this);
 
 //$this->theme->bodyCssClass = $this->theme->bodyCssClass . " g-mt-80";
 

src/views/headers/header-v3.php

@@ -10,6 +10,8 @@
 
 \skeeks\assets\unify\base\UnifyHsDropdownAsset::register($this);
 \skeeks\assets\unify\base\UnifyHsHeaderAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsHamburgersAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsMegamenuAsset::register($this);
 
 $this->registerJs(<<<JS
 

src/views/headers/header-v4.php

@@ -10,6 +10,8 @@
 
 \skeeks\assets\unify\base\UnifyHsDropdownAsset::register($this);
 \skeeks\assets\unify\base\UnifyHsHeaderAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsHamburgersAsset::register($this);
+\skeeks\assets\unify\base\UnifyHsMegamenuAsset::register($this);
 
 $this->registerJs(<<<JS
 

src/views/layouts/main.php

@@ -25,9 +25,36 @@
     </head>
     <body class="<?= $this->theme->bodyCssClass; ?>">
     <?php $this->beginBody() ?>
-    <? if ($this->theme->isShowLoader) : ?>
-        <div class="preloader">
-            <div id="loaderImage"></div>
+    <? if ($this->theme->is_show_loader) : ?>
+        <?
+        $this->registerCss(<<<CSS
+        
+/*************************
+*******Preloader CSS*********
+**************************/
+.sx-preloader {
+  display: table;
+  background: #1e1e1e;
+  z-index: 999999;
+  position: fixed;
+  height: 100%;
+  width: 100%;
+  left: 0;
+  top: 0;
+}
+
+.sx-loader-image {
+  display: table-cell;
+  vertical-align: middle;
+  overflow: hidden;
+  text-align: center;
+}
+
+CSS
+);
+        ?>
+        <div class="sx-preloader">
+            <div class="sx-loader-image"></div>
         </div>
     <? endif; ?>
     <div>

src/views/modules/cms/content-element/default.php

@@ -13,7 +13,12 @@
 ?>
 
 <? if ($this->theme->is_image_body_begin) : ?>
-    <section class="g-bg-cover g-bg-size-cover g-bg-white-gradient-opacity-v1--after sx-body-begin-image-wrapper" data-bg-img-src="<?= $model->image ? $model->image->src : $this->theme->body_begin_no_image; ?>" style="background-image: url('<?= $model->image ? $model->image->src : $this->theme->body_begin_no_image; ?>'); background: center;">
+    <section class="g-bg-cover g-bg-size-cover g-bg-white-gradient-opacity-v1--after sx-body-begin-image-wrapper" data-bg-img-src="<?= $model->image ? \Yii::$app->imaging->thumbnailUrlOnRequest($model->image->src,
+                            new \skeeks\cms\components\imaging\filters\Thumbnail([
+                                'w' => 1920,
+                                'h' => 500,
+                            ]), $model->code
+                        ) : $this->theme->body_begin_no_image; ?>" style="background: center;">
         <div class="container text-center g-pos-rel g-z-index-1 g-pb-50">
             <div class="row d-flex justify-content-center align-content-end flex-wrap g-min-height-<?= $this->theme->body_begin_image_height_element; ?>">
                 <div class="col-lg-10 mt-auto">
@@ -101,7 +106,7 @@
                     <? if (!$this->theme->is_image_body_begin) : ?>
                     <?= $model->description_short; ?>
                     <? endif; ?>
-                    <div itemprop="articleBody">
+                    <div itemprop="articleBody" style="overflow: auto;">
                     <?= $model->description_full; ?>
 
                     </div>

src/views/modules/cms/tree/default.php

@@ -11,14 +11,9 @@
     <section class="g-bg-cover g-bg-size-cover g-bg-white-gradient-opacity-v1--after sx-body-begin-image-wrapper" data-bg-img-src="<?= $model->image ? \Yii::$app->imaging->thumbnailUrlOnRequest($model->image->src,
                             new \skeeks\cms\components\imaging\filters\Thumbnail([
                                 'w' => 1920,
-                                'h' => 1080,
+                                'h' => 500,
                             ]), $model->code
-                        ) : $this->theme->body_begin_no_image; ?>" style="background-image: url('<?= $model->image ? \Yii::$app->imaging->thumbnailUrlOnRequest($model->image->src,
-                            new \skeeks\cms\components\imaging\filters\Thumbnail([
-                                'w' => 1920,
-                                'h' => 1080,
-                            ]), $model->code
-                        ) : $this->theme->body_begin_no_image; ?>'); background: center;">
+                        ) : $this->theme->body_begin_no_image; ?>" style="background-position: center;">
         <div class="container text-center g-pos-rel g-z-index-1 g-pb-50">
             <div class="row d-flex justify-content-center align-content-end flex-wrap g-min-height-<?= $this->theme->body_begin_image_height_tree; ?>">
                 <div class="col-lg-10 mt-auto">