Commit 884395b830dd553be9070af98119daa9a410ef88

Authored by Виталий
2 parents 51b67c0d 3d397a5d

Merge remote-tracking branch 'origin/vetal' into vetal

frontend/views/blog/view.php
@@ -161,13 +161,7 @@ _________________________________________________________ --> @@ -161,13 +161,7 @@ _________________________________________________________ -->
161 <!-- /#comment-form --> 161 <!-- /#comment-form -->
162 */ 162 */
163 ?> 163 ?>
164 - <?php  
165 - echo CommentWidget::widget(  
166 - [  
167 - 'model' => $model,  
168 - ]  
169 - );  
170 - ?> 164 +
171 </div> 165 </div>
172 <!-- /#blog-post --> 166 <!-- /#blog-post -->
173 167
frontend/views/category/_product_item.php
@@ -31,36 +31,36 @@ @@ -31,36 +31,36 @@
31 ); 31 );
32 ?> 32 ?>
33 </div> 33 </div>
34 - <div class="vcovers">  
35 - <div class="content">  
36 - <?php  
37 - foreach ($product->variants as $variant) {  
38 - ?>  
39 - <div class="vcover">  
40 - <?php  
41 - echo Html::a(  
42 - Html::img(  
43 - ImageHelper::set(  
44 - $variant->image ? $variant->image->getPath() : '@frontend/web/img/no-image.png'  
45 - )  
46 - ->fillResize(40, 40)  
47 - ->render(),  
48 - [  
49 - 'class' => 'img-responsive-image1',  
50 - ]  
51 - ),  
52 - [  
53 - 'variant/view',  
54 - 'id' => $variant->id,  
55 - ]  
56 - );  
57 - ?>  
58 - </div>  
59 - <?php  
60 - }  
61 - ?>  
62 - </div>  
63 - </div> 34 +<!-- <div class="vcovers">-->
  35 +<!-- <div class="content">-->
  36 +<!-- --><?php
  37 +// foreach ($product->variants as $variant) {
  38 +// ?>
  39 +<!-- <div class="vcover">-->
  40 +<!-- --><?php
  41 +// echo Html::a(
  42 +// Html::img(
  43 +// ImageHelper::set(
  44 +// $variant->image ? $variant->image->getPath() : '@frontend/web/img/no-image.png'
  45 +// )
  46 +// ->fillResize(40, 40)
  47 +// ->render(),
  48 +// [
  49 +// 'class' => 'img-responsive-image1',
  50 +// ]
  51 +// ),
  52 +// [
  53 +// 'variant/view',
  54 +// 'id' => $variant->id,
  55 +// ]
  56 +// );
  57 +// ?>
  58 +<!-- </div>-->
  59 +<!-- --><?php
  60 +// }
  61 +// ?>
  62 +<!-- </div>-->
  63 +<!-- </div>-->
64 <!-- /.image --> 64 <!-- /.image -->
65 <div class="text"> 65 <div class="text">
66 <h3> 66 <h3>
frontend/views/site/_slider_product.php
@@ -32,36 +32,36 @@ @@ -32,36 +32,36 @@
32 ?> 32 ?>
33 </div> 33 </div>
34 34
35 - <div class="vcovers">  
36 - <div class="content">  
37 - <?php  
38 - foreach ($product->variants as $variant) {  
39 - ?>  
40 - <div class="vcover">  
41 - <?php  
42 - echo Html::a(  
43 - Html::img(  
44 - ImageHelper::set(  
45 - $variant->image ? $variant->image->getPath() : '@frontend/web/img/no-image.png'  
46 - )  
47 - ->fillResize(40, 40)  
48 - ->render(),  
49 - [  
50 - 'class' => 'img-responsive-image1',  
51 - ]  
52 - ),  
53 - [  
54 - 'variant/view',  
55 - 'id' => $variant->id,  
56 - ]  
57 - );  
58 - ?>  
59 - </div>  
60 - <?php  
61 - }  
62 - ?>  
63 - </div>  
64 - </div> 35 +<!-- <div class="vcovers">-->
  36 +<!-- <div class="content">-->
  37 +<!-- --><?php
  38 +// foreach ($product->variants as $variant) {
  39 +// ?>
  40 +<!-- <div class="vcover">-->
  41 +<!-- --><?php
  42 +// echo Html::a(
  43 +// Html::img(
  44 +// ImageHelper::set(
  45 +// $variant->image ? $variant->image->getPath() : '@frontend/web/img/no-image.png'
  46 +// )
  47 +// ->fillResize(40, 40)
  48 +// ->render(),
  49 +// [
  50 +// 'class' => 'img-responsive-image1',
  51 +// ]
  52 +// ),
  53 +// [
  54 +// 'variant/view',
  55 +// 'id' => $variant->id,
  56 +// ]
  57 +// );
  58 +// ?>
  59 +<!-- </div>-->
  60 +<!-- --><?php
  61 +// }
  62 +// ?>
  63 +<!-- </div>-->
  64 +<!-- </div>-->
65 <!-- /.image --> 65 <!-- /.image -->
66 <div class="text"> 66 <div class="text">
67 <h3> 67 <h3>
frontend/views/variant/view.php
@@ -111,75 +111,75 @@ @@ -111,75 +111,75 @@
111 } 111 }
112 ?> 112 ?>
113 113
114 - <div class="row" id="thumbs">  
115 - <?php  
116 - if (!empty($images)) {  
117 - foreach ($images as $image) {  
118 - echo Html::tag(  
119 - 'div',  
120 - Html::a(  
121 - ImageHelper::set($image->getPath())  
122 - ->fillResize(70, 60)  
123 - ->renderImage(  
124 - [  
125 - 'class' => 'img-responsive',  
126 - 'alt' => $model->lang->title,  
127 - 'title' => $model->lang->title,  
128 - ]  
129 - ),  
130 - ImageHelper::set($image->getPath())  
131 - ->fillResize(555, 555)  
132 - ->render(),  
133 - [  
134 - 'class' => 'thumb',  
135 - ]  
136 - ),  
137 - [  
138 - 'class' => 'col-xs-2',  
139 - ]  
140 - );  
141 - }  
142 - } else {  
143 - echo Html::tag(  
144 - 'div',  
145 - Html::a(  
146 - ImageHelper::set('@frontend/web/img/no-image.png')  
147 - ->fillResize(70, 60)  
148 - ->renderImage(  
149 - [  
150 - 'class' => 'img-responsive',  
151 - 'alt' => $model->lang->title,  
152 - 'title' => $model->lang->title,  
153 - ]  
154 - ),  
155 - ImageHelper::set('@frontend/web/img/no-image.png')  
156 - ->fillResize(555, 555)  
157 - ->render(),  
158 - [  
159 - 'class' => 'thumb',  
160 - ]  
161 - ),  
162 - [  
163 - 'class' => 'col-xs-2',  
164 - ]  
165 - );  
166 - }  
167 - ?>  
168 - </div>  
169 - <?php  
170 - if (!empty($model->product->video)) {  
171 - ?>  
172 - <div class="product-video">  
173 - <div class="h3">  
174 - <?php echo \Yii::t('app', 'Видеообзор продукта'); ?>  
175 - </div>  
176 - <div class="video-box">  
177 - <?php echo $model->product->video; ?>  
178 - </div>  
179 - </div>  
180 - <?php  
181 - }  
182 - ?> 114 +<!-- <div class="row" id="thumbs">-->
  115 +<!-- --><?php
  116 +// if (!empty($images)) {
  117 +// foreach ($images as $image) {
  118 +// echo Html::tag(
  119 +// 'div',
  120 +// Html::a(
  121 +// ImageHelper::set($image->getPath())
  122 +// ->fillResize(70, 60)
  123 +// ->renderImage(
  124 +// [
  125 +// 'class' => 'img-responsive',
  126 +// 'alt' => $model->lang->title,
  127 +// 'title' => $model->lang->title,
  128 +// ]
  129 +// ),
  130 +// ImageHelper::set($image->getPath())
  131 +// ->fillResize(555, 555)
  132 +// ->render(),
  133 +// [
  134 +// 'class' => 'thumb',
  135 +// ]
  136 +// ),
  137 +// [
  138 +// 'class' => 'col-xs-2',
  139 +// ]
  140 +// );
  141 +// }
  142 +// } else {
  143 +// echo Html::tag(
  144 +// 'div',
  145 +// Html::a(
  146 +// ImageHelper::set('@frontend/web/img/no-image.png')
  147 +// ->fillResize(70, 60)
  148 +// ->renderImage(
  149 +// [
  150 +// 'class' => 'img-responsive',
  151 +// 'alt' => $model->lang->title,
  152 +// 'title' => $model->lang->title,
  153 +// ]
  154 +// ),
  155 +// ImageHelper::set('@frontend/web/img/no-image.png')
  156 +// ->fillResize(555, 555)
  157 +// ->render(),
  158 +// [
  159 +// 'class' => 'thumb',
  160 +// ]
  161 +// ),
  162 +// [
  163 +// 'class' => 'col-xs-2',
  164 +// ]
  165 +// );
  166 +// }
  167 +// ?>
  168 +<!-- </div>-->
  169 +<!-- --><?php
  170 +// if (!empty($model->product->video)) {
  171 +// ?>
  172 +<!-- <div class="product-video">-->
  173 +<!-- <div class="h3">-->
  174 +<!-- --><?php //echo \Yii::t('app', 'Видеообзор продукта'); ?>
  175 +<!-- </div>-->
  176 +<!-- <div class="video-box">-->
  177 +<!-- --><?php //echo $model->product->video; ?>
  178 +<!-- </div>-->
  179 +<!-- </div>-->
  180 +<!-- --><?php
  181 +// }
  182 +// ?>
183 </div> 183 </div>
184 <div class="col-sm-6"> 184 <div class="col-sm-6">
185 <div class="box"> 185 <div class="box">