Merge branch 'clinica_khonko' of gitlab.artweb.com.ua:steska/clinica into clinica_khonko

Alex Savenko
2 parents 06a2015d 7fc91ad7
Showing 7 changed files with 33 additions and 36 deletions Show diff stats
console/migrations/m180605_082938_alter_table_article.php → console/migrations/m181102_082938_alter_table_article.php
frontend/assets/AppAsset.php
frontend/assets/ScrollAsset.php
frontend/config/main.php
frontend/views/layouts/main.php
frontend/views/site/index.php
frontend/web/js/script.js
@@ -5,7 +5,7 @@ use yii\db\Migration;
 /**
  * Class m180605_082938_alter_table_article
  */
-class m180605_082938_alter_table_article extends Migration
+class m181102_082938_alter_table_article extends Migration
 {
     /**
      * {@inheritdoc}
@@ -13,14 +13,14 @@
         public $baseUrl = '@web';
         public $css = [
             'css/style.css',
-            '//fonts.googleapis.com/css?family=Ubuntu:400,500,700&amp;subset=cyrillic,cyrillic-ext,latin-ext'
+//            '//fonts.googleapis.com/css?family=Ubuntu:400,500,700&amp;subset=cyrillic,cyrillic-ext,latin-ext'
         ];
         public $js = [
             'js/script.js',
             'js/jquery.mask.min.js'
         ];
         public $depends = [
-            'yii\web\JqueryAsset',
+            'yii\web\YiiAsset',
         ];
     }
  
 \ No newline at end of file
@@ -22,6 +22,6 @@ class ScrollAsset extends AssetBundle
         'js/jquery.mCustomScrollbar.concat.min.js'
     ];
     public $depends = [
-        'yii\web\JqueryAsset',
+        'frontend\assets\AppAsset',
     ];
 }
 \ No newline at end of file
@@ -381,7 +381,7 @@
             ],
             'assetsAutoCompress' => [
                 'class'   => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',
-                'enabled' => false,
+                'enabled' => true,
  
                 'readFileTimeout' => 3,
                 //Time in seconds for reading each asset file
@@ -414,11 +414,11 @@
                 'jsFileCompressFlaggedComments' => true,
                 //Cut comments during processing js
  
-                'htmlCompress' => true,
+                'htmlCompress'           => true,
                 //Enable compression html
                 'noIncludeJsFilesOnPjax' => true,
                 //Do not connect the js files when all pjax requests
-                'htmlCompressOptions' =>              //options for compressing output result
+                'htmlCompressOptions'    =>              //options for compressing output result
                     [
                         'extra'       => false,
                         //use more compact algorithm
@@ -67,8 +67,8 @@
     $this->registerMetaTag(
         [
             'name'    => 'robots',
-            'content' => $seo->robots,
-            //                                'content' => 'noindex,nofollow',
+//            'content' => $seo->robots,
+            'content' => 'noindex,nofollow',
         ]
     );
     $module = \Yii::$app->getModule('feedback');
@@ -158,9 +158,7 @@
  
                 <ul class="hidden-xs hidden-sm">
                   <li><a href="/vtoroe-mnenie" class="new"><span> <?=\Yii::t('app','Second thing')?>  </span></a></li>
-                  <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ?
-                          Url::to(['alias' => $aliases['{"0":"site/questions"}']]) : Url::to(['site/questions'])?>">
-                          <?=\Yii::t('app','Quest/Answer')?></a></li>
+                  <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ? Url::to(['alias' => $aliases['{"0":"site/questions"}']]) : Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer')?></a></li>
                   <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks')?></a></li>
                 </ul>
 <!--                -->
@@ -317,7 +315,7 @@
         </div>
       </header>
  
-      <!-- #content должен быть в main.php  -->
+      <?php #content должен быть в main.php ?>
       <div id="content_" class="section-box-content">
         <!-- start breadcrumbs -->
         <?php if (!empty($this->params['breadcrumbs'])) {?>
@@ -332,12 +330,14 @@
           </div>
         </section>
             <?php }?>
-        <!-- если не главная выводить сюда-->
-        <!-- end breadcrumbs -->
-        
-        <!-- start content -->
+          <?php #если не главная выводить сюда
+          # end breadcrumbs ?>
+
+        <?php #start content ?>
+
           <?= $content ?>
-        <!-- end content -->
+          <?php # end content ?>
+
  
           <div class="section-box-6">
               <div class="container">
@@ -526,8 +526,8 @@
         <div class="txt-success"><span><?=\Yii::t('app','Thanks for request')?></span>
           <p><?=Yii::t('app','We`ll call you later')?>.</p></div>
       </div>
-      
-      <!-- выводить если главная страница -->
+      <?php # выводить если главная страница  ?>
+
  
         <?php $this->endBody() ?>
     </body>
@@ -17,7 +17,14 @@
     \frontend\assets\ScrollAsset::register($this);
     $js = <<<JS
           //первый слайдер
-
+          if($(window).width() > 767) {
+        $('.for-hidden-mob').mCustomScrollbar(
+            {
+                autoHideScrollbar: true,
+                theme: 'minimal'
+            }
+        );
+    }
           setTimeout(function() {
               if ($(".slider-first")
                       .children().length > 1) {
@@ -482,6 +482,9 @@ $(document).ready(function() {
     });
  
 });
+jQuery.fn.load = function(callback) {
+  $(window).on("load", callback)
+};
  
 window.onload = function () {
     console.log('start onload');
@@ -499,21 +502,8 @@ window.onload = function () {
         console.log('start');
         $('nav').addClass('start');
         $('body').addClass('disabled-preloader')
-    },2700 + 2000)
+    },2700 + 2000);
  
  
-    if($(window).width() > 767) {
-        $('.for-hidden-mob').mCustomScrollbar(
-            {
-                autoHideScrollbar: true,
-                theme: 'minimal'
-            }
-        );
-    }
-}
-
-$(window).load(function() {
-    console.log('start load jquery');
-
-});
+};