Administrator / baucenter

Commit 5232ce80d9f0b1aea6fed659377cf3600408bbe4

Authored by Karnovsky A
1 parent 37a612de

fish-tests and fix some-css

Showing 2 changed files with 148 additions and 3 deletions   Show diff stats
Inline Side-by-side
frontend/views/catalog/product.php
  Show/Hide comments   View file @5232ce8
@@ -113,13 +113,13 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku; @@ -113,13 +113,13 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku;
113 <div class="tabs_block"> <!-- Табы с описанием видео и отзывами --> 113 <div class="tabs_block"> <!-- Табы с описанием видео и отзывами -->
114 <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name"> 114 <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name">
115 <ul class="ionTabs__head"> 115 <ul class="ionTabs__head">
116 - <?php if (!empty($properties)) :?> 116 + <?php if (TRUE || !empty($properties)) :?>
117 <li class="ionTabs__tab" data-target="Tab_1_name">Характеристики</li> 117 <li class="ionTabs__tab" data-target="Tab_1_name">Характеристики</li>
118 <?php endif?> 118 <?php endif?>
119 - <?php if (!empty($product->description)) :?> 119 + <?php if (TRUE || !empty($product->description)) :?>
120 <li class="ionTabs__tab" data-target="Tab_2_name">Описание</li> 120 <li class="ionTabs__tab" data-target="Tab_2_name">Описание</li>
121 <?php endif?> 121 <?php endif?>
122 - <?php if (!empty($product->description)) :?> 122 + <?php if (TRUE || !empty($product->video)) :?>
123 <li class="ionTabs__tab" data-target="Tab_3_name">Видео</li> 123 <li class="ionTabs__tab" data-target="Tab_3_name">Видео</li>
124 <?php endif?> 124 <?php endif?>
125 <!-- <li class="ionTabs__tab" data-target="Tab_4_name">Отзывы(12)</li>--> 125 <!-- <li class="ionTabs__tab" data-target="Tab_4_name">Отзывы(12)</li>-->
@@ -140,16 +140,28 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku; @@ -140,16 +140,28 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
140 <?php endforeach?> 140 <?php endforeach?>
141 </ul> 141 </ul>
142 </div> 142 </div>
  143 + <?php else :?>
  144 + <div class="ionTabs__item" data-name="Tab_1_name">
  145 + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna.
  146 + </div>
143 <?php endif?> 147 <?php endif?>
144 <?php if (!empty($product->description)) :?> 148 <?php if (!empty($product->description)) :?>
145 <div class="ionTabs__item" data-name="Tab_2_name"> 149 <div class="ionTabs__item" data-name="Tab_2_name">
146 <?= $product->description?> 150 <?= $product->description?>
147 </div> 151 </div>
  152 + <?php else :?>
  153 + <div class="ionTabs__item" data-name="Tab_2_name">
  154 + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna.
  155 + </div>
148 <?php endif?> 156 <?php endif?>
149 <?php if (!empty($product->video)) :?> 157 <?php if (!empty($product->video)) :?>
150 <div class="ionTabs__item" data-name="Tab_3_name"> 158 <div class="ionTabs__item" data-name="Tab_3_name">
151 <?= $product->video?> 159 <?= $product->video?>
152 </div> 160 </div>
  161 + <?php else :?>
  162 + <div class="ionTabs__item" data-name="Tab_3_name" style="width: 100%">
  163 + <div style="clear: both;width: 100%;"><iframe width="420" height="315" src="https://www.youtube.com/embed/Q5LiO_35s1E" frameborder="0" allowfullscreen></iframe></div>
  164 + </div>
153 <?php endif?> 165 <?php endif?>
154 <!--<div class="ionTabs__item" data-name="Tab_4_name"> 166 <!--<div class="ionTabs__item" data-name="Tab_4_name">
155 <span class="tabs_item_name">Отзывы</span> 167 <span class="tabs_item_name">Отзывы</span>
@@ -160,5 +172,137 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku; @@ -160,5 +172,137 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
160 </div> 172 </div>
161 173
162 </div> <!-- конец табов с описанием видео и отзывами --> 174 </div> <!-- конец табов с описанием видео и отзывами -->
  175 + <div style="clear: both;"></div>
  176 + <hr>
  177 +
  178 + <h1 class="with_this">С этим товаром покупают</h1>
  179 +
  180 + <div class="flex_container"><!-- блок - с этим также покупают -->
  181 +
  182 + <div class="my_custom_card">
  183 + <div class="new">АКЦИЯ</div>
  184 + <div class="top">Toп</div>
  185 + <a href="#" class="item_link"><div class="pic"><img src="images/items/01.jpg"></div>
  186 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  187 + <div class="brand">Бренд: <span>Knauf</span></div>
  188 + <div class="type">Штукатурки</div>
  189 + <div class="price">102.05 <span>грн.</span></div>
  190 + <button class="basket_add_but">в корзину</button>
  191 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  192 + <img class="item_bottom_img" src="images/nc_item_bottom.png" alt="">
  193 + </div>
  194 +
  195 + <div class="my_custom_card">
  196 + <div class="new">АКЦИЯ</div>
  197 + <div class="top">Toп</div>
  198 + <a href="#" class="item_link"><div class="pic"><img src="images/items/01.jpg"></div>
  199 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  200 + <div class="brand">Бренд: <span>Knauf</span></div>
  201 + <div class="type">Штукатурки</div>
  202 + <div class="price">102.05 <span>грн.</span></div>
  203 + <button class="basket_add_but">в корзину</button>
  204 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  205 + <img class="item_bottom_img" src="images/nc_item_bottom.png" alt="">
  206 + </div>
  207 +
  208 + <div class="my_custom_card">
  209 + <div class="new">АКЦИЯ</div>
  210 + <div class="top">Toп</div>
  211 + <a href="#" class="item_link"><div class="pic"><img src="images/items/01.jpg"></div>
  212 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  213 + <div class="brand">Бренд: <span>Knauf</span></div>
  214 + <div class="type">Штукатурки</div>
  215 + <div class="price">102.05 <span>грн.</span></div>
  216 + <button class="basket_add_but">в корзину</button>
  217 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  218 + <img class="item_bottom_img" src="images/nc_item_bottom.png" alt="">
  219 + </div>
  220 +
  221 + <div class="my_custom_card">
  222 + <div class="new">АКЦИЯ</div>
  223 + <div class="top">Toп</div>
  224 + <a href="#" class="item_link"><div class="pic"><img src="images/items/01.jpg"></div>
  225 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  226 + <div class="brand">Бренд: <span>Knauf</span></div>
  227 + <div class="type">Штукатурки</div>
  228 + <div class="price">102.05 <span>грн.</span></div>
  229 + <button class="basket_add_but">в корзину</button>
  230 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  231 + <img class="item_bottom_img" src="images/nc_item_bottom.png" alt="">
  232 + </div>
  233 +
  234 + </div> <!-- конец блока - с этим также покупают -->
  235 +
  236 + <hr>
  237 +
  238 + <div class="watched_block">
  239 + <h1>Вы недавно просматривали</h1>
  240 + <div class="flex-container">
  241 +
  242 + <div class="my_custom_card">
  243 + <div class="new">АКЦИЯ</div>
  244 + <div class="top">Toп</div>
  245 + <a href="#" class="item_link"><div class="pic"><img src="/images/items/01.jpg"></div>
  246 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  247 + <div class="brand">Бренд: <span>Knauf</span></div>
  248 + <div class="type">Штукатурки</div>
  249 + <div class="price">102.05 <span>грн.</span></div>
  250 + <a href="#" class="test_a">
  251 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  252 + </a>
  253 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  254 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  255 + </div>
  256 +
  257 + <div class="my_custom_card">
  258 + <div class="new">АКЦИЯ</div>
  259 + <div class="top">Toп</div>
  260 + <a href="#" class="item_link"><div class="pic"><img src="/images/items/01.jpg"></div>
  261 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  262 + <div class="brand">Бренд: <span>Knauf</span></div>
  263 + <div class="type">Штукатурки</div>
  264 + <div class="price">102.05 <span>грн.</span></div>
  265 + <a href="#" class="test_a">
  266 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  267 + </a>
  268 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  269 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  270 + </div>
  271 +
  272 + <div class="my_custom_card">
  273 + <div class="new">АКЦИЯ</div>
  274 + <div class="top">Toп</div>
  275 + <a href="#" class="item_link"><div class="pic"><img src="/images/items/01.jpg"></div>
  276 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  277 + <div class="brand">Бренд: <span>Knauf</span></div>
  278 + <div class="type">Штукатурки</div>
  279 + <div class="price">102.05 <span>грн.</span></div>
  280 + <a href="#" class="test_a">
  281 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  282 + </a>
  283 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  284 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  285 + </div>
  286 +
  287 + <div class="my_custom_card">
  288 + <div class="new">АКЦИЯ</div>
  289 + <div class="top">Toп</div>
  290 + <a href="#" class="item_link"><div class="pic"><img src="/images/items/01.jpg"></div>
  291 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  292 + <div class="brand">Бренд: <span>Knauf</span></div>
  293 + <div class="type">Штукатурки</div>
  294 + <div class="price">102.05 <span>грн.</span></div>
  295 + <a href="#" class="test_a">
  296 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  297 + </a>
  298 + <a href="#" class="compare_add_but_d">
  299 + <img src="/images/ico_scales.png" alt=""><span>добавить к сравнению</span>
  300 + </a>
  301 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  302 + </div>
  303 +
  304 + </div>
  305 +
  306 + </div>
163 307
164 </div> <!-- end flex container --> 308 </div> <!-- end flex container -->
frontend/web/css/concat_all.css
  Show/Hide comments   View file @5232ce8
@@ -1122,6 +1122,7 @@ hr { @@ -1122,6 +1122,7 @@ hr {
1122 1122
1123 .tabs_block { 1123 .tabs_block {
1124 color: #333333; 1124 color: #333333;
  1125 + width: 100%;
1125 } 1126 }
1126 1127
1127 .watched_block { 1128 .watched_block {