From 84c4457e1246ee7d7f2f7d6e58b212e3f4e85475 Mon Sep 17 00:00:00 2001 From: Eugeny Galkovskiy Date: Fri, 29 Jul 2016 16:36:35 +0300 Subject: [PATCH] 123 --- frontend/views/basket/index.php | 16 ++++++++-------- frontend/views/call/index.php | 16 ++++++++-------- frontend/views/catalog/brand.php | 9 --------- frontend/views/catalog/brands.php | 8 +------- frontend/views/catalog/catalog.php | 7 ------- frontend/views/catalog/index.php | 18 +++++++++--------- frontend/views/catalog/product.php | 12 ++++++------ frontend/views/catalog/products.php | 10 +--------- frontend/views/layouts/main.php | 15 +++++++++++++++ frontend/views/products/_product.php | 67 ------------------------------------------------------------------- frontend/views/products/_show.php | 122 -------------------------------------------------------------------------------------------------------------------------- frontend/views/products/compare.php | 46 ---------------------------------------------- frontend/views/products/index.php | 99 --------------------------------------------------------------------------------------------------- frontend/views/products/search.php | 60 ------------------------------------------------------------ frontend/views/products/show.php | 176 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 15 files changed, 48 insertions(+), 633 deletions(-) delete mode 100755 frontend/views/products/_product.php delete mode 100755 frontend/views/products/_show.php delete mode 100755 frontend/views/products/compare.php delete mode 100755 frontend/views/products/index.php delete mode 100755 frontend/views/products/search.php delete mode 100755 frontend/views/products/show.php diff --git a/frontend/views/basket/index.php b/frontend/views/basket/index.php index ad767b6..89fce9f 100755 --- a/frontend/views/basket/index.php +++ b/frontend/views/basket/index.php @@ -26,14 +26,14 @@ $('#orders-delivery input[type=\"radio\"]').click(function(){ }); ", View::POS_READY, 'order-delivery'); ?> - + + [ +// 'Корзина' +// ], +// ]) ?> + + diff --git a/frontend/views/call/index.php b/frontend/views/call/index.php index e0e9bdc..a4c7685 100755 --- a/frontend/views/call/index.php +++ b/frontend/views/call/index.php @@ -12,14 +12,14 @@ $this->registerMetaTag(['name' => 'description', 'content' => 'Обратный $this->registerMetaTag(['name' => 'keywords', 'content' => 'Обратный звонок']); ?> - + + [ +// 'Обратный звонок' +// ], +// ]) ?> + +
diff --git a/frontend/views/catalog/brand.php b/frontend/views/catalog/brand.php index ed7c1a8..75cee4b 100755 --- a/frontend/views/catalog/brand.php +++ b/frontend/views/catalog/brand.php @@ -21,15 +21,6 @@ $this->registerJsFile (Yii::getAlias('@web/js/ion.rangeSlider.js')); ?> -
diff --git a/frontend/views/catalog/brands.php b/frontend/views/catalog/brands.php index aedda75..a3f2f50 100755 --- a/frontend/views/catalog/brands.php +++ b/frontend/views/catalog/brands.php @@ -11,13 +11,7 @@ $this->params['seo']['fields']['name'] = 'Brands NAME FROM FIELD'; $this->params['seo']['key']= 'brands'; ?> - +

params['seo']['h1']?>

diff --git a/frontend/views/catalog/catalog.php b/frontend/views/catalog/catalog.php index 5c0a0e9..9d1a618 100755 --- a/frontend/views/catalog/catalog.php +++ b/frontend/views/catalog/catalog.php @@ -6,13 +6,6 @@ $this->title = 'Каталог'; $this->params['breadcrumbs'][] = ['label' => 'Каталог']; ?> -
diff --git a/frontend/views/catalog/index.php b/frontend/views/catalog/index.php index 441074b..d376416 100755 --- a/frontend/views/catalog/index.php +++ b/frontend/views/catalog/index.php @@ -8,15 +8,15 @@ $this->title = $catalog->meta_title; $this->params['seo']['fields']['meta-title'] = $catalog->meta_title; $this->registerMetaTag(['name' => 'description', 'content' => $catalog->meta_description]); $this->registerMetaTag(['name' => 'keywords', 'content' => $catalog->meta_keywords]); -?> - +//?> + + [ ['label'=>'Каталог','url'=>['catalog/all']], +// $catalog->name], +// ]) ?> + +
diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 49583c9..8ff2e4e 100755 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -106,12 +106,12 @@ ", View::POS_READY, 'Shadowbox'); ?> - + + $this->params[ 'breadcrumbs' ], +// ]) ?> + + session->getFlash('success')): ?>
diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php index b833ff8..ba0e39b 100755 --- a/frontend/views/catalog/products.php +++ b/frontend/views/catalog/products.php @@ -22,7 +22,7 @@ $this->params['seo']['category_name'] = $category->name; //foreach($category->getParents()->all() as $parent) { // $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]]; //} -$this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => ['catalog/category']]; +$this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => Url::to(['catalog/category']),'itemprop' => 'url', ]; $this->params['breadcrumbs'][] = $category->categoryName->value; @@ -63,16 +63,8 @@ $this->registerJsFile(Yii::getAlias('@web/js/ion.rangeSlider.js'),[ - -
registerJs (" @@ -241,6 +242,20 @@ $this->registerJs("
+ params['breadcrumbs'])):?> + + +
diff --git a/frontend/views/products/_product.php b/frontend/views/products/_product.php deleted file mode 100755 index 6303696..0000000 --- a/frontend/views/products/_product.php +++ /dev/null @@ -1,67 +0,0 @@ - -
-
- - - -
- name ?> - - -'; - - // есть скидка - if ($item->costMax->old_cost != 0 && $item->costMax->old_cost != $item->costMax->cost) - { - // одинаковая скидка - if ($item->costMax->count_diff == 1) - { - echo ''.$item->costMax->old_cost.' грн.'; - } - } - - echo '

'.$item->costMax->cost.' грн.

'; - - echo '
'; - -?> -
- Купить - -
-
    - mods as $mods) { ?> -
  • - - <?= $mods->name ?> - -
    • - -
-
\ No newline at end of file diff --git a/frontend/views/products/_show.php b/frontend/views/products/_show.php deleted file mode 100755 index c753d31..0000000 --- a/frontend/views/products/_show.php +++ /dev/null @@ -1,122 +0,0 @@ -title = (!empty($product->meta_title))?$product->meta_title:$product->name; -$this->registerMetaTag(['name' => 'description', 'content' => ((!empty($product->meta_description))?$product->meta_description:$product->name)]); -$this->registerMetaTag(['name' => 'keywords', 'content' => $product->meta_keywords]); -$this->registerJs(" - var checkData = function(obj){ - $('#cost').text($(obj).data('cost')); - $('#product_id').val($(obj).data('id')); - } - $('.fasovka input[type=\"radio\"]').click(function() { - checkData(this); - }); - checkData($( '.fasovka input:checked' )); -", View::POS_READY, 'fasovka'); - -$this->registerJs(" - - $('#product_gallery a').click(function() { - var image = $(this).attr('href'); - $('#productPic').attr('src', image); - return false; - }); - -", View::POS_READY, 'gallery'); - -$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({ - cssprefix: 'skit', - shownavitems: 3, - auto: false, - scroll: 1, - circular: false, - // freeheight: true, - scrollspeed: 500 - }); - -", View::POS_READY, 'sliderkit'); -?> - - -
- - -
- render('/catalog/_catalog_box',['catalog'=>$catalog]) ?> - -
-
-

name?>

-
- -
-
- -
- -
-
-
-
- - - - -
-
- -
-
-

Фасовка

-
- mods as $key=>$item):?> - > - -
-
- -
-
- - Купить -
цена 0 грн
-
-
-

Характеристики

- char?> - -

Описание

- body?> -
- -
-
- - -
- - -
\ No newline at end of file diff --git a/frontend/views/products/compare.php b/frontend/views/products/compare.php deleted file mode 100755 index 0f2c1e7..0000000 --- a/frontend/views/products/compare.php +++ /dev/null @@ -1,46 +0,0 @@ -title = 'СРАВНЕНИЕ'; -$this->registerMetaTag(['name' => 'description', 'content' => 'СРАВНЕНИЕ']); -$this->registerMetaTag(['name' => 'keywords', 'content' => 'СРАВНЕНИЕ']); - -$this->params['breadcrumbs'][] = ['label'=>'Каталог','url'=>['/catalog/all']]; -$this->params['breadcrumbs'][] = ['label'=>'СРАВНЕНИЕ','url'=>['/products/compare']]; -?> - - - - - -

СРАВНЕНИЕ

-
- -
    - - -
  • - - name?> -
    -

    Бренд: brend->name?>

    - params as $key=>$param):?> -

    name?> size?>

    - -
    -

    cost->cost?> грн.

    - Купить - -
    • - - -
-
- diff --git a/frontend/views/products/index.php b/frontend/views/products/index.php deleted file mode 100755 index eb1b3dd..0000000 --- a/frontend/views/products/index.php +++ /dev/null @@ -1,99 +0,0 @@ - -params['catalog_id'] = $catalog->id; - $this->title = $catalog->meta_title; - $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_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]; -?> - - - -
-
-
- - - $catalog->translit, 'catalog_id' => $catalog->id]) ?> - - $catalog->translit, 'catalog_id' => $catalog->id]) ?> - -
-
Цена
- false]); ?> - -
-
-
-
- field ($modelProducts, 'minCost'); ?> - field ($modelProducts, 'maxCost'); ?> -
- 'submit4', 'style' => 'margin-left:50px;']); ?> - -
-
- -
-
- - -

name ?>

-
- -
    - - -
  • - render ('_product', ['item' => $item, 'num' => 3]) ?> -
    • - - -
-
-
- - $pages, - 'registerLinkTags' => true, - ]); ?> -
- -
-
- - -
- - - - - diff --git a/frontend/views/products/search.php b/frontend/views/products/search.php deleted file mode 100755 index 8eb66ea..0000000 --- a/frontend/views/products/search.php +++ /dev/null @@ -1,60 +0,0 @@ - -title = 'Поиск'; - $this->registerMetaTag (['name' => 'description', 'content' => 'Поиск']); - $this->registerMetaTag (['name' => 'keywords', 'content' => 'Поиск']); -?> - - -
- -
-

Поиск

- -
- -
- -
    - - -
  • - render ('_product', ['item' => $item, 'num' => 3]) ?> -
    • - - -
-
-
- $pages, - 'registerLinkTags' => true, - ]); ?> -
 
-
- - -
- -
- \ No newline at end of file diff --git a/frontend/views/products/show.php b/frontend/views/products/show.php deleted file mode 100755 index c2f8aff..0000000 --- a/frontend/views/products/show.php +++ /dev/null @@ -1,176 +0,0 @@ -title = (! empty($product->meta_title)) ? $product->meta_title : $product->name; - $this->registerMetaTag (['name' => 'description', 'content' => ((! empty($product->meta_description)) ? $product->meta_description : $product->name)]); - $this->registerMetaTag (['name' => 'keywords', 'content' => $product->meta_keywords]); - $this->registerJs (' - - var checkData = function($index) - { - var $source = $(".productLeftBar .product_mod > li").eq($index).find("a"); - var $target = $(".productLeftBar .cost_box"); - - $("#cost").text($source.data("cost")); - $("#old_cost").text($source.data("old_cost")); - - if (parseInt ($source.data("old_cost")) == 0) - { - $target.find("strike").hide(); - } - else - { - $target.find("strike").show(); - } - - $("#product_id").val($source.data("id")); - $("#art").text($source.data("art")); - $("#color").text($source.data("color")); - $("#pic").attr("src",$source.data("image")); - $("#picoriginal").attr("href",$source.data("imageoriginal")); - } - - $(".product_mod > li").click(function() - { - checkData($(this).index()); - - Shadowbox.setup($("#picoriginal")); - - return false; - }); - - checkData(0); - - ', View::POS_READY, 'fasovka'); - - $this->registerJs (" - $('#nav_product li a').addClass('active'); - $('#nav_product li').find('.info').toggle(); - - $('#nav_product li a').bind('click',function() - { - if($(this).parent().find('.info').css('display')=='none')$(this).addClass('active'); - else $(this).removeClass('active'); - $(this).parent().find('.info').toggle(); - - return false; - }); - ", 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_END, 'depends' => ['yii\web\JqueryAsset']]); - $this->registerJs (" - Shadowbox.init({ - - }); - ", View::POS_READY, 'Shadowbox'); -?> - - - -session->getFlash ('success')): ?> -
- -
- - -
-

name ?>

-
Цветовые решения
-
    - mods as $key => $item): ?> -
  • - - <?= $item->name ?> - -
    • - -
-
- -
-
код:
цвет:
-
- 0 грн.
- 0 грн. -
- - Купить -
-
- -
- -
- -
- -
- -
- -
- - -
-
- -
-
-
    - fotos as $key => $item): ?> -
  • <?= $item->name ?>
    • - -
- - -
-
-
\ No newline at end of file -- libgit2 0.21.4