big commti

Administrator
1 parent 07a62660
Showing 7 changed files with 49 additions and 59 deletions Show diff stats
frontend/assets/AppAsset.php
frontend/assets/FlipclockAsset.php
frontend/config/main.php
frontend/views/catalog/product.php
frontend/views/event/_objects.php
frontend/views/layouts/main.php
frontend/widgets/views/slider.php
@@ -23,8 +23,7 @@ class AppAsset extends AssetBundle
         'http://fonts.googleapis.com/css?family=Roboto:400,300,700&subset=latin,cyrillic-ext',
     ];
     public $js = [
-        //'js/js_head.js',
-        //'js/js_footer.js',
+
         '/js/artbox_basket.js',
         'js/script.js',
         'js/new_script.js',
@@ -23,6 +23,7 @@ class FlipclockAsset extends AssetBundle
         'flipclock/compiled/flipclock.min.js'
     ];
     public $jsOptions = array(
-        'position' => \yii\web\View::POS_END
+        'position' => \yii\web\View::POS_END,
+        'depends' => ['yii\web\JqueryAsset']
     );
 }
@@ -19,7 +19,13 @@ return [
     ],
     'components' => [
-
+        'assetManager' => [
+            'bundles' => [
+                'yii\web\JqueryAsset' =>[
+                    'jsOptions' =>  ['position' => \yii\web\View::POS_END]
+                ]
+            ],
+        ],
         'authManager' => [
             'class' => 'yii\rbac\DbManager',
         ],
 <?php
 /**
  * @var $product Product
+ * @var $this View
  */
     use common\components\artboximage\ArtboxImageHelper;
     use common\models\Orders;
@@ -11,6 +12,7 @@ use frontend\assets\FotoramaAsset;
     use yii\bootstrap\ActiveForm;
     use yii\bootstrap\Html;
 use yii\helpers\Url;
+use yii\web\View;
 use yii\widgets\MaskedInput;
 use frontend\assets\FlipclockAsset;
     FotoramaAsset::register($this);
@@ -176,13 +178,11 @@ use frontend\assets\FlipclockAsset;
                                     <div class="event_title"> <?=  Html::a('Акция!!! '.$event->name,Url::to(['event/show','alias'=>$event->alias,'id'=>$event->primaryKey]))?></div>
                                     <div class="event_time">До конца осталось:</div>
                                     <div class="clock_<?= $event->primaryKey ?> clock_product_first "></div>
-                                    <script type="text/javascript">
-                                        var clock;
-
-                                        $(document).ready(function() {
+                                        <?php
+                                            $js = "
                                             var clock;
-                                            clock = $('.clock_<?= $event->primaryKey ?>').FlipClock({
+                                            clock = $('.clock_$event->primaryKey').FlipClock({
                                                 clockFace: 'DailyCounter',
                                                 language: 'ru',
                                                 classes: {
@@ -197,12 +197,13 @@ use frontend\assets\FlipclockAsset;
                                                 },
                                             });
-                                            clock.setTime(<?= strtotime($event->end_at) - strtotime(date("Y-m-d H:i:s"))?>);
+                                            clock.setTime( ".strtotime($event->end_at) - strtotime(date('Y-m-d H:i:s')).");
                                             clock.setCountdown(true);
                                             clock.start();
+                                            ";
+                                        $this->registerJs($js,['position'=>View::POS_END])
+                                        ?>
-                                        });
-                                    </script>
                                 </div>
                             <?php endif; ?>
 <?php
 use yii\helpers\Html;
-use frontend\helpers\TextHelper;
 use yii\helpers\Url;
 use frontend\components\Text;
 use frontend\assets\FlipclockAsset;
+use yii\web\View;
+
 FlipclockAsset::register($this);
 ?>
 <div class="news_item">
@@ -23,13 +24,9 @@ FlipclockAsset::register($this);
         if(!empty($model->end_at) && strtotime($model->end_at) > strtotime(date("Y-m-d"))){
             ?>
             <div class="clock_style clock_<?= $model->primaryKey ?>"></div>
-            <script type="text/javascript">
-                var clock;
-
-                $(document).ready(function() {
-                    var clock;
-                    clock = $('.clock_<?= $model->primaryKey ?>').FlipClock({
+                    <?php $js = "var clock;
+                    clock = $('.clock_". $model->primaryKey ."').FlipClock({
                         clockFace: 'DailyCounter',
                         language: 'ru',
                         classes: {
@@ -44,21 +41,14 @@ FlipclockAsset::register($this);
                         },
                     });
-                    clock.setTime(<?= strtotime($model->end_at) - strtotime(date("Y-m-d H:i:s"))?>);
+                    clock.setTime(".strtotime($model->end_at) - strtotime(date('Y-m-d H:i:s')).");
                     clock.setCountdown(true);
-                    clock.start();
-
-                });
-            </script>
+                    clock.start();";
+                    $this->registerJs($js,['position'=>View::POS_END]) ?>
-
-            <?php
-        }
-
-        ?>
+            <?php}?>
         </div>
-        <div class="both"></div>
-
+    <div class="both"></div>
@@ -30,7 +30,7 @@ use common\models\Event;
         <link type="image/ico" href="http://www.linija-svitla.ua/images/icon.ico" rel="SHORTCUT ICON"/>
         <link rel="icon" href="http://www.linija-svitla.ua/images/icon.ico" type="image/x-icon"/>
-        <script language="JavaScript" type="text/JavaScript" src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+
         <meta name="google-site-verification" content="m60Ax2153voy05Xdtit_bnBVjuZG-fv0Zu14jLjb4Tk"/>
@@ -20,33 +20,26 @@ FlipclockAsset::register($this);
         if(!empty($image->end_at) && strtotime($image->end_at) > strtotime(date("Y-m-d"))){
         ?>
         <div class="clock_style clock_<?= $image->primaryKey ?>"></div>
-        <script type="text/javascript">
-            var clock;
-
-            $(document).ready(function() {
-                var clock;
-
-                clock = $('.clock_<?= $image->primaryKey ?>').FlipClock({
-                    clockFace: 'DailyCounter',
-                    language: 'ru',
-                    classes: {
-                        active: 'flip-clock-active',
-                        before: 'flip-clock-before',
-                        divider: 'flip-clock-divider',
-                        dot: 'flip-clock-dot',
-                        label: 'flip-clock-label',
-                        flip: 'flip',
-                        play: 'play',
-                        wrapper: 'flip-clock-wrapper'
-                    },
-                });
-
-                clock.setTime(<?= strtotime($image->end_at) - strtotime(date("Y-m-d H:i:s"))?>);
-                clock.setCountdown(true);
-                clock.start();
-
-            });
-        </script>
+        <?php $js = "var clock;
+                    clock = $('.clock_". $image->primaryKey ."').FlipClock({
+                        clockFace: 'DailyCounter',
+                        language: 'ru',
+                        classes: {
+                            active: 'flip-clock-active',
+                            before: 'flip-clock-before',
+                            divider: 'flip-clock-divider',
+                            dot: 'flip-clock-dot',
+                            label: 'flip-clock-label',
+                            flip: 'flip',
+                            play: 'play',
+                            wrapper: 'flip-clock-wrapper'
+                        },
+                    });
+
+                    clock.setTime(".strtotime($model->end_at) - strtotime(date('Y-m-d H:i:s')).");
+                    clock.setCountdown(true);
+                    clock.start();";
+        $this->registerJs($js,['position'=>View::POS_END]) ?>
         <?php