Commit 353c0f813b041e96fdedfd795cb719edbd0aa7ae
1 parent
70bfbe0a
big commti
Showing
3 changed files
with
7 additions
and
6 deletions
Show diff stats
frontend/assets/AppAsset.php
| @@ -31,8 +31,9 @@ class AppAsset extends AssetBundle | @@ -31,8 +31,9 @@ class AppAsset extends AssetBundle | ||
| 31 | public $depends = [ | 31 | public $depends = [ |
| 32 | 'yii\web\JqueryAsset', | 32 | 'yii\web\JqueryAsset', |
| 33 | 'sersid\owlcarousel\Asset', | 33 | 'sersid\owlcarousel\Asset', |
| 34 | - 'yii\bootstrap\BootstrapPluginAsset', | ||
| 35 | 'frontend\assets\FlipclockAsset', | 34 | 'frontend\assets\FlipclockAsset', |
| 35 | + 'yii\bootstrap\BootstrapPluginAsset', | ||
| 36 | + | ||
| 36 | ]; | 37 | ]; |
| 37 | 38 | ||
| 38 | public function init() { | 39 | public function init() { |
frontend/assets/FotoramaAsset.php
| @@ -25,4 +25,7 @@ class FotoramaAsset extends AssetBundle | @@ -25,4 +25,7 @@ class FotoramaAsset extends AssetBundle | ||
| 25 | public $jsOptions = array( | 25 | public $jsOptions = array( |
| 26 | 'position' => \yii\web\View::POS_END | 26 | 'position' => \yii\web\View::POS_END |
| 27 | ); | 27 | ); |
| 28 | + public $depends = [ | ||
| 29 | + 'yii\web\YiiAsset', | ||
| 30 | + ]; | ||
| 28 | } | 31 | } |
frontend/views/event/_objects.php
| @@ -17,10 +17,7 @@ use yii\web\View; | @@ -17,10 +17,7 @@ use yii\web\View; | ||
| 17 | </a> | 17 | </a> |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | - <?php | ||
| 21 | - | ||
| 22 | - if(!empty($model->end_at) && strtotime($model->end_at) > strtotime(date("Y-m-d"))){ | ||
| 23 | - ?> | 20 | + <?php if(!empty($model->end_at) && strtotime($model->end_at) > strtotime(date("Y-m-d"))){?> |
| 24 | <div class="clock_style clock_<?= $model->primaryKey ?>"></div> | 21 | <div class="clock_style clock_<?= $model->primaryKey ?>"></div> |
| 25 | 22 | ||
| 26 | <?php $js = "var clock; | 23 | <?php $js = "var clock; |
| @@ -44,7 +41,7 @@ use yii\web\View; | @@ -44,7 +41,7 @@ use yii\web\View; | ||
| 44 | clock.start();"; | 41 | clock.start();"; |
| 45 | $this->registerJs($js,View::POS_END) ?> | 42 | $this->registerJs($js,View::POS_END) ?> |
| 46 | 43 | ||
| 47 | - <?php}?> | 44 | + <?php } ?> |
| 48 | </div> | 45 | </div> |
| 49 | <div class="both"></div> | 46 | <div class="both"></div> |
| 50 | 47 |