Anastasia / clinica

Commit 08a354abc6830c0a1f8a5f1147cbb4b54d9e60c2

Authored by alex
2 parents e6ffc250 44a17990

Merge branches 'clinica_khonko' and 'master' of gitlab.artweb.com.ua:steska/clin… 

…ica into clinica_khonko

 введите сообщение коммита, для объяснения, зачем нужно
# это слияние, особенно, если это слияние обновленной вышестоящей
# ветки в тематическую ветку.
#
# Строки, начинающиеся с «#» будут проигнорированы, а пустое
# сообщение отменяет процесс коммита.
Showing 7 changed files with 21 additions and 26 deletions   Show diff stats
Inline Side-by-side
console/migrations/m180605_082938_alter_table_article.php renamed to console/migrations/m181102_082938_alter_table_article.php
  Show/Hide comments   View file @08a354a
... ... @@ -5,7 +5,7 @@ use yii\db\Migration;
5 5 /**
6 6 * Class m180605_082938_alter_table_article
7 7 */
8   -class m180605_082938_alter_table_article extends Migration
  8 +class m181102_082938_alter_table_article extends Migration
9 9 {
10 10 /**
11 11 * {@inheritdoc}
... ...
frontend/assets/AppAsset.php
  Show/Hide comments   View file @08a354a
... ... @@ -13,14 +13,14 @@
13 13 public $baseUrl = '@web';
14 14 public $css = [
15 15 'css/style.css',
16   - '//fonts.googleapis.com/css?family=Ubuntu:400,500,700&subset=cyrillic,cyrillic-ext,latin-ext'
  16 +// '//fonts.googleapis.com/css?family=Ubuntu:400,500,700&subset=cyrillic,cyrillic-ext,latin-ext'
17 17 ];
18 18 public $js = [
19 19 'js/script.js',
20 20 'js/jquery.mask.min.js'
21 21 ];
22 22 public $depends = [
23   - 'yii\web\JqueryAsset',
  23 + 'yii\web\YiiAsset',
24 24 ];
25 25 }
26 26  
27 27 \ No newline at end of file
... ...
frontend/assets/ScrollAsset.php
  Show/Hide comments   View file @08a354a
... ... @@ -22,6 +22,6 @@ class ScrollAsset extends AssetBundle
22 22 'js/jquery.mCustomScrollbar.concat.min.js'
23 23 ];
24 24 public $depends = [
25   - 'yii\web\JqueryAsset',
  25 + 'frontend\assets\AppAsset',
26 26 ];
27 27 }
28 28 \ No newline at end of file
... ...
frontend/config/main.php
  Show/Hide comments   View file @08a354a
... ... @@ -381,7 +381,7 @@
381 381 ],
382 382 'assetsAutoCompress' => [
383 383 'class' => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',
384   - 'enabled' => false,
  384 + 'enabled' => true,
385 385  
386 386 'readFileTimeout' => 3,
387 387 //Time in seconds for reading each asset file
... ... @@ -414,11 +414,11 @@
414 414 'jsFileCompressFlaggedComments' => true,
415 415 //Cut comments during processing js
416 416  
417   - 'htmlCompress' => true,
  417 + 'htmlCompress' => true,
418 418 //Enable compression html
419 419 'noIncludeJsFilesOnPjax' => true,
420 420 //Do not connect the js files when all pjax requests
421   - 'htmlCompressOptions' => //options for compressing output result
  421 + 'htmlCompressOptions' => //options for compressing output result
422 422 [
423 423 'extra' => false,
424 424 //use more compact algorithm
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @08a354a
... ... @@ -158,9 +158,7 @@
158 158  
159 159 <ul class="hidden-xs hidden-sm">
160 160 <li><a href="/vtoroe-mnenie" class="new"><span> <?=\Yii::t('app','Second thing')?> </span></a></li>
161   - <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ?
162   - Url::to(['alias' => $aliases['{"0":"site/questions"}']]) : Url::to(['site/questions'])?>">
163   - <?=\Yii::t('app','Quest/Answer')?></a></li>
  161 + <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>
164 162 <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks')?></a></li>
165 163 </ul>
166 164 <!-- -->
... ...
frontend/views/site/index.php
  Show/Hide comments   View file @08a354a
... ... @@ -17,7 +17,14 @@
17 17 \frontend\assets\ScrollAsset::register($this);
18 18 $js = <<<JS
19 19 //первый слайдер
20   -
  20 + if($(window).width() > 767) {
  21 + $('.for-hidden-mob').mCustomScrollbar(
  22 + {
  23 + autoHideScrollbar: true,
  24 + theme: 'minimal'
  25 + }
  26 + );
  27 + }
21 28 setTimeout(function() {
22 29 if ($(".slider-first")
23 30 .children().length > 1) {
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @08a354a
... ... @@ -482,6 +482,9 @@ $(document).ready(function() {
482 482 });
483 483  
484 484 });
  485 +jQuery.fn.load = function(callback) {
  486 + $(window).on("load", callback)
  487 +};
485 488  
486 489 window.onload = function () {
487 490 console.log('start onload');
... ... @@ -499,21 +502,8 @@ window.onload = function () {
499 502 console.log('start');
500 503 $('nav').addClass('start');
501 504 $('body').addClass('disabled-preloader')
502   - },2700 + 2000)
  505 + },2700 + 2000);
503 506  
504 507  
505   - if($(window).width() > 767) {
506   - $('.for-hidden-mob').mCustomScrollbar(
507   - {
508   - autoHideScrollbar: true,
509   - theme: 'minimal'
510   - }
511   - );
512   - }
513   -}
514   -
515   -$(window).load(function() {
516   - console.log('start load jquery');
517   -
518   -});
  508 +};
519 509  
... ...