From 3a8a9bd9c74fee33392a9069e6af159a7827f550 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Tue, 31 May 2016 18:52:10 +0300
Subject: [PATCH] image size

---
 frontend/assets/AppAsset.php         | 8 ++++----
 frontend/config/main.php             | 7 +++++++
 frontend/views/basket/index.php      | 2 +-
 frontend/views/catalog/product.php   | 2 +-
 frontend/views/iam/edit_company.php  | 2 +-
 frontend/views/iam/edit_customer.php | 2 +-
 frontend/views/iam/edit_person.php   | 2 +-
 frontend/views/layouts/main.php      | 4 ++--
 frontend/views/products/_show.php    | 2 +-
 frontend/views/products/index.php    | 4 ++--
 frontend/views/products/show.php     | 2 +-
 frontend/views/reg/company.php       | 2 +-
 frontend/views/reg/customer.php      | 2 +-
 frontend/views/reg/person.php        | 2 +-
 frontend/views/site/index.php        | 2 +-
 15 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index c20dea5..73342f2 100755
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -24,14 +24,14 @@ class AppAsset extends AssetBundle
     public $js = [
     ];
     public $depends = [
-        'yii\web\JqueryAsset',
-        'sersid\owlcarousel\Asset'
-        //'yii\web\YiiAsset',
+//        'yii\web\JqueryAsset',
+        'sersid\owlcarousel\Asset',
+        'yii\web\YiiAsset',
         //'yii\bootstrap\BootstrapAsset',
     ];
     
     public function init() {
-        $this->jsOptions['position'] = View::POS_HEAD;
+        $this->jsOptions['position'] = View::POS_END;
         parent::init();
     }    
 }
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 30f04cd..bb7b555 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -12,6 +12,13 @@ return [
     'bootstrap' => ['log'],
     'controllerNamespace' => 'frontend\controllers',
     'components' => [
+        'assetManager' => [
+            'bundles' => [
+                'yii\web\JqueryAsset' =>[
+                    'jsOptions' =>  ['position' => \yii\web\View::POS_END]
+                ]
+            ],
+        ],
         'authManager' => [
             'class' => 'yii\rbac\DbManager',
         ],
diff --git a/frontend/views/basket/index.php b/frontend/views/basket/index.php
index c277175..f5c1104 100755
--- a/frontend/views/basket/index.php
+++ b/frontend/views/basket/index.php
@@ -11,7 +11,7 @@ $this->title = 'Корзина';
 $this->registerMetaTag(['name' => 'description', 'content' => 'Корзина']);
 $this->registerMetaTag(['name' => 'keywords', 'content' => 'Корзина']);
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#orders-phone,#orders-phone2').mask('(000) 000-0000');
diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php
index 5bce498..8d7fcda 100755
--- a/frontend/views/catalog/product.php
+++ b/frontend/views/catalog/product.php
@@ -72,7 +72,7 @@ $this->registerJs ("
     ", View::POS_READY, 'nav_product');
 
 $this->registerCssFile (Yii::$app->request->BaseUrl . '/js/shadowbox-3.0.3/shadowbox.css');
-$this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
+$this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
 $this->registerJs ("
         Shadowbox.init({
 
diff --git a/frontend/views/iam/edit_company.php b/frontend/views/iam/edit_company.php
index ee76e9b..3a6e9be 100755
--- a/frontend/views/iam/edit_company.php
+++ b/frontend/views/iam/edit_company.php
@@ -10,7 +10,7 @@ $this->title = 'Редактирование Исполнителя - Компа
 $this->params['breadcrumbs'][] = ['label'=>'Профиль','url'=>['/iam/index']];
 $this->params['breadcrumbs'][] = $this->title;
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#user-phone').mask('(000) 000-0000');
diff --git a/frontend/views/iam/edit_customer.php b/frontend/views/iam/edit_customer.php
index 80961ff..6fe3560 100755
--- a/frontend/views/iam/edit_customer.php
+++ b/frontend/views/iam/edit_customer.php
@@ -10,7 +10,7 @@ $this->title = 'Редактирование Заказчика';
 $this->params['breadcrumbs'][] = ['label'=>'Профиль','url'=>['/iam/index']];
 $this->params['breadcrumbs'][] = $this->title;
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#user-phone').mask('(000) 000-0000');
diff --git a/frontend/views/iam/edit_person.php b/frontend/views/iam/edit_person.php
index 5ef051e..ab417ee 100755
--- a/frontend/views/iam/edit_person.php
+++ b/frontend/views/iam/edit_person.php
@@ -12,7 +12,7 @@ $this->title = 'Редактирование профиля';
 $this->params['breadcrumbs'][] = ['label'=>'Профиль','url'=>['/iam/index']];
 $this->params['breadcrumbs'][] = $this->title;
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#user-phone').mask('(000) 000-0000');
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 23d656b..ded4311 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -46,14 +46,14 @@ $this->registerJsFile (Yii::$app->request->baseUrl . '/js/fix_height.js', ['posi
 
     // jquery-migrate
     $this->registerJsFile('http://code.jquery.com/jquery-migrate-1.3.0.js',[
-        'position' => View::POS_HEAD,
+        'position' => View::POS_END,
         'depends' => ['yii\web\JqueryAsset']
     ]);
 
     // jcarousel
     $this->registerCssFile(Yii::$app->request->BaseUrl.'/js/jsor-jcarousel-7bb2e0a/skins/tango/skin.css');
     $this->registerJsFile(Yii::$app->request->baseUrl.'/js/jsor-jcarousel-7bb2e0a/lib/jquery.jcarousel.min.js',[
-        'position' => View::POS_HEAD,
+        'position' => View::POS_END,
         'depends' => ['yii\web\JqueryAsset']
     ]);
 
diff --git a/frontend/views/products/_show.php b/frontend/views/products/_show.php
index e384f84..c753d31 100755
--- a/frontend/views/products/_show.php
+++ b/frontend/views/products/_show.php
@@ -27,7 +27,7 @@ $this->registerJs("
 
 ", View::POS_READY, 'gallery');
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.sliderkit.1.9.2.pack.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.sliderkit.1.9.2.pack.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 $this->registerJs("
 
                 $('.skit').sliderkit({
diff --git a/frontend/views/products/index.php b/frontend/views/products/index.php
index 0ffc3a6..eb1b3dd 100755
--- a/frontend/views/products/index.php
+++ b/frontend/views/products/index.php
@@ -20,8 +20,8 @@ $this->params['catalog_id'] = $catalog->id;
     $this->registerMetaTag (['name' => 'description', 'content' => $catalog->meta_description]);
     $this->registerMetaTag (['name' => 'keywords', 'content' => $catalog->meta_keywords]);
     $this->registerCssFile (Yii::$app->request->BaseUrl . '/css/begunok.css');
-    $this->registerJsFile (Yii::$app->request->baseUrl . '/js/jquery.ui-slider.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
-    $this->registerJsFile (Yii::$app->request->baseUrl . '/js/begunok.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
+    $this->registerJsFile (Yii::$app->request->baseUrl . '/js/jquery.ui-slider.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
+    $this->registerJsFile (Yii::$app->request->baseUrl . '/js/begunok.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
     $this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => ['/catalog/all']];
     if (! empty($catalog->parent)) $this->params['breadcrumbs'][] = ['label' => $catalog->parent->name, 'url' => ['products/index', 'translit' => $catalog->parent->translit]];
     $this->params['breadcrumbs'][] = ['label' => $catalog->name]; 
diff --git a/frontend/views/products/show.php b/frontend/views/products/show.php
index 8456550..80e46a4 100755
--- a/frontend/views/products/show.php
+++ b/frontend/views/products/show.php
@@ -60,7 +60,7 @@ use yii\widgets\Breadcrumbs;
     ", View::POS_READY, 'nav_product');
 
     $this->registerCssFile (Yii::$app->request->BaseUrl . '/js/shadowbox-3.0.3/shadowbox.css');
-    $this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
+    $this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
     $this->registerJs ("
         Shadowbox.init({
 
diff --git a/frontend/views/reg/company.php b/frontend/views/reg/company.php
index a7301eb..c2e6afd 100755
--- a/frontend/views/reg/company.php
+++ b/frontend/views/reg/company.php
@@ -9,7 +9,7 @@ use yii\captcha\Captcha;
 $this->title = 'Регистрация Исполнителя - Компания';
 $this->params['breadcrumbs'][] = $this->title;
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#user-phone').mask('(000) 000-0000');
diff --git a/frontend/views/reg/customer.php b/frontend/views/reg/customer.php
index b85219f..d8781b0 100755
--- a/frontend/views/reg/customer.php
+++ b/frontend/views/reg/customer.php
@@ -9,7 +9,7 @@ use yii\captcha\Captcha;
 $this->title = 'Регистрация Заказчика';
 $this->params['breadcrumbs'][] = $this->title;
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#user-phone').mask('(000) 000-0000');
diff --git a/frontend/views/reg/person.php b/frontend/views/reg/person.php
index fbf10af..3bb6a64 100755
--- a/frontend/views/reg/person.php
+++ b/frontend/views/reg/person.php
@@ -9,7 +9,7 @@ use yii\captcha\Captcha;
 $this->title = 'Регистрация';
 $this->params['breadcrumbs'][] = $this->title;
 
-$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
+$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
 
 $this->registerJs("
 $('#customer-phone').mask('(000) 000-0000');
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index fe75ade..7e8470c 100755
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -12,7 +12,7 @@ use frontend\widgets\Seo;
 $this->params['seo']['title'] = 'Купить городской рюкзак Киев | Купить рюкзаки Dakine Украина | Rukzachok.com.ua';
 $this->registerJsFile (
     Yii::$app->request->baseUrl . '/js/slides.min.jquery.js',
-    ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
+    ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
 
 ?>
 
--
libgit2 0.21.4