Administrator / new_rukzachok-1

Commit 8891dd7d978d0d012a66d5c241da791a07df6b99

Authored by Karnovsky A
2 parents f5e5825e 0cdfad3f

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	composer.json
#	frontend/web/css/style.css
Showing 13 changed files with 142 additions and 62 deletions   Show diff stats
Inline Side-by-side
common/modules/product/widgets/views/product_smart.php
  Show/Hide comments   View file @8891dd7
... ... @@ -2,7 +2,7 @@
2 2 /** @var \common\modules\product\models\Product $product */
3 3 use yii\helpers\Url;
4 4 ?>
5   -<li class="item">
  5 +<div class="item">
6 6 <div class="boxitem">
7 7 <div class="pixbox">
8 8 <a href="<?= Url::to([
... ... @@ -53,4 +53,4 @@ use yii\helpers\Url;
53 53 <?php endforeach; ?>
54 54 </ul>
55 55 </div>
56   -</li>
57 56 \ No newline at end of file
  57 +</div>
58 58 \ No newline at end of file
... ...
common/modules/product/widgets/views/products_block.php
  Show/Hide comments   View file @8891dd7
  1 +<?php
  2 + use yii\web\View;
  3 +?>
1 4 <div class="_prd_spec-wr">
2   - <div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
  5 + <div class="special-products products<?=
  6 +
  7 + (!empty($class) ? ' '. $class : '')?>">
3 8 <h3><?= $title?></h3>
4   - <ul>
  9 + <div class="owl-carousel">
5 10 <?php foreach($products as $product) :?>
6 11 <?= $this->render('product_smart', ['product' => $product]);?>
7 12 <?php endforeach?>
8   - </ul>
  13 + </div>
9 14 <div class="both"></div>
10 15 </div>
11   -</div>
12 16 \ No newline at end of file
  17 +</div>
  18 +
  19 +<?php $js = '$(".owl-carousel").owlCarousel({
  20 + // Navigation
  21 + navigation : true,
  22 + navigationText : ["prev","next"],
  23 + rewindNav : true,
  24 + scrollPerPage : false,
  25 + pagination : false
  26 + })';
  27 +$this->registerJs($js, View::POS_READY);
  28 +?>
13 29 \ No newline at end of file
... ...
frontend/assets/AppAsset.php
  Show/Hide comments   View file @8891dd7
... ... @@ -25,6 +25,7 @@ class AppAsset extends AssetBundle
25 25 ];
26 26 public $depends = [
27 27 'yii\web\JqueryAsset',
  28 +// 'sersid\owlcarousel\Asset'
28 29 //'yii\web\YiiAsset',
29 30 //'yii\bootstrap\BootstrapAsset',
30 31 ];
... ...
frontend/views/basket/_popup.php
  Show/Hide comments   View file @8891dd7
... ... @@ -13,14 +13,9 @@ use yii\helpers\Url;
13 13 Загрузка...
14 14  
15 15 </div>
16   - <div style="display:table;margin-top:25px;">
17   - <div class="cont_shop_but"><a href="#" class="cont_shop">Продолжить покупки</a></div>
18   - <div style="display:table-cell;padding-left:240px;">
19   -
20   - <a href="<?=Url::to(['basket/index'])?>" class="submit4 bottom3" style="color:white;">Оформить заказ</a>
21   - </div>
22   -
23   -
  16 + <div class="cont_shop_but-wr">
  17 + <a href="#" class="cont_shop">Продолжить покупки</a>
  18 + <a href="<?=Url::to(['basket/index'])?>" class="submit4 bottom3" style="color:white;">Оформить заказ</a>
24 19 </div>
25 20 </div>
26 21 </div>
... ...
frontend/views/basket/ajax_items.php
  Show/Hide comments   View file @8891dd7
... ... @@ -9,7 +9,7 @@ use yii\helpers\Html;
9 9 <div class="basket_item">
10 10 <?php echo $form->field($item,'['.$i.']id')->hiddenInput()->label(false); ?>
11 11 <div style="display: table-cell;vertical-align: middle;"><a href="#" data-id="<?=$item->id?>" class="delete_button" style="margin-right:20px;"></a></div>
12   - <div style="width:100px;height:100px;display: table-cell;vertical-align: middle; border:1px solid #d2d2d2;text-align:center;margin-left:10px;margin-right:10px;">
  12 + <div class="img_ajax_basket" style="width:100px;height:100px;display: table-cell;vertical-align: middle; border:1px solid #d2d2d2;text-align:center;margin-left:10px;margin-right:10px;">
13 13 <?= \common\components\artboximage\ArtboxImageHelper::getImage($item->imageUrl, 'product_basket')?>
14 14 </div>
15 15 <div style="display: table-cell;vertical-align: middle; font-size:15px;width:210px; font-weight:normal;padding-left:15px;">
... ... @@ -22,7 +22,7 @@ use yii\helpers\Html;
22 22 <div style="display: table-cell;vertical-align: middle;">
23 23 <a href="#" style="color:#95ba2f" class="minus"></a><?php echo $form->field($item,'['.$i.']count',['template'=>'{input}'])->textInput(['type'=>'number','class' => 'item_num','disabled1'=>true])->label(false); ?><a href="#" style="color:#95ba2f" class="plus"></a>
24 24 </div>
25   - <div style="display: table-cell;vertical-align: middle; font-size:16px;color:#f75d50; font-weight:bold; padding-left:54px;"><?=$item->sum_cost?> грн.</div>
  25 + <div style="display: table-cell;vertical-align: middle; font-size:16px;color:#f75d50; font-weight:bold; padding-left:40px;"><?=$item->sum_cost?> грн.</div>
26 26 <div style="clear:both;"></div>
27 27 </div>
28 28 <?php endforeach;?>
... ...
frontend/views/basket/index.php
  Show/Hide comments   View file @8891dd7
... ... @@ -20,6 +20,7 @@ $(&#39;#orders-phone,#orders-phone2&#39;).mask(&#39;(000) 000-0000&#39;);
20 20  
21 21 $this->registerJs("
22 22 $('#orders-delivery input[type=\"radio\"]').click(function(){
  23 + $('.hidden_box').addClass('activeShow')
23 24 $('.delivery-data').hide();
24 25 $('#delivery-data-'+$(this).val()).show();
25 26 });
... ... @@ -66,7 +67,7 @@ $(&#39;#orders-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
66 67 </div>
67 68 </div>
68 69  
69   - <div class="input-blocks-group radio_grp">
  70 + <div class="input-blocks-group radio_grp hidden_box">
70 71 <div class="input-blocks-wrapper">
71 72 <?= $form->field($modelOrder, 'delivery')
72 73 ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>0])->asArray()->all(), 'id', 'title'),[
... ...
frontend/views/catalog/product.php
  Show/Hide comments   View file @8891dd7
... ... @@ -117,7 +117,7 @@ $this-&gt;registerJs (&quot;
117 117 </ul>
118 118 <div class="both"></div>
119 119  
120   - <div class="cost_box product_read_ _qqq_">
  120 + <div class="cost_box product_read_">
121 121 <div class='params'>код: <span id='art'></span><br/> цвет: <span id='color'></span></div>
122 122 <div class="product_read_price">
123 123 <div class="w">
... ... @@ -170,7 +170,7 @@ $this-&gt;registerJs (&quot;
170 170 <div class="content">
171 171 <div class="pic">
172 172 <center>
173   - <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product',['id'=>'pic'])?></a>
  173 + <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product_view',['id'=>'pic'])?></a>
174 174 </center>
175 175 </div>
176 176 <ul class="product_colors">
... ... @@ -183,16 +183,19 @@ $this-&gt;registerJs (&quot;
183 183 </div>
184 184 <div class="both"></div>
185 185 </div>
186   -
187 186 <?php
188   -//$this->registerJs ("
189   -// var productHash = window.location.hash;
190   -// productHash = productHash.replace('#','')
191   -//
192   -// var productUl = $('ul.product_mod li')
193   -// var productA = productUl.find('a#'+productHash)
194   -// productUl.removeClass('active')
195   -// productA.parent().addClass('active')
196   -// console.log(productA)
197   -// ", View::POS_READY, 'new_script');
198   -//?>
199 187 \ No newline at end of file
  188 +$this->registerJs ("
  189 + var productHash = window.location.hash;
  190 + productHash = productHash.replace('#','')
  191 +
  192 + var productUl = $('ul.product_mod li')
  193 + var productA = productUl.find('a#'+productHash)
  194 + productUl.removeClass('active')
  195 + productA.parent().addClass('active')
  196 + var dataLink = productA.attr('data-imageoriginal')
  197 + var dataImg = productA.attr('data-image')
  198 +
  199 + $('#pic').attr('src',dataImg)
  200 + $('#pic').parent().attr('href',dataLink)
  201 + ", View::POS_READY, 'new_script');
  202 +?>
200 203 \ No newline at end of file
... ...
frontend/views/catalog/product_item.php
  Show/Hide comments   View file @8891dd7
... ... @@ -6,7 +6,7 @@ use yii\helpers\Url;
6 6 <div class="boxitem">
7 7 <div class="pixbox">
8 8 <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->variant->product_variant_id]) ?>">
9   - <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
  9 + <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->variant->image->imageUrl, 'list')?>
10 10 </a>
11 11 </div>
12 12 <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
... ... @@ -26,7 +26,8 @@ use yii\helpers\Url;
26 26 'catalog/product',
27 27 'product' => $product,
28 28 '#' => 'm' .$product->variant->product_variant_id])
29   - ?>" class="name"><?= $product->fullname ?>
  29 + ?>"
  30 + class="name"><?= $product->fullname ?>
30 31 </a>
31 32  
32 33 <?php
... ... @@ -47,7 +48,8 @@ use yii\helpers\Url;
47 48 </div>
48 49 <a href="<?= Url::to([
49 50 'catalog/product',
50   - 'product' => $product])
  51 + 'product' => $product,
  52 + '#' => 'm' .$product->variant->product_variant_id])
51 53 ?>" class="link_buy">Купить</a>
52 54  
53 55 <div class="mycarousel">
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @8891dd7
... ... @@ -28,6 +28,8 @@
28 28 $this->registerJs ("
29 29 $('#call').call({token:'" . Yii::$app->request->getCsrfToken () . "'});
30 30 ", View::POS_READY, 'call');
  31 +
  32 +$this->registerJsFile (Yii::$app->request->baseUrl . '/js/fix_height.js', ['position' => View::POS_HEAD]);
31 33 $this->registerJs ("
32 34 var activeTab = $('.social li:first a').attr('id');
33 35 $('.'+activeTab+'_box').show();
... ... @@ -160,7 +162,9 @@
160 162 <div class="both"></div>
161 163 </div>
162 164  
163   - <?= $content ?>
  165 + <div class="wrapper_all">
  166 + <?= $content ?>
  167 + </div>
164 168  
165 169 </div>
166 170  
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @8891dd7
... ... @@ -73,7 +73,7 @@ nav input[type=&quot;submit&quot;]{width:35px;height:29px;border:none;background:url(&#39;../i
73 73 .menu ul li{float:left;border-left:1px solid #8b9094; height: 43px;}
74 74 .menu ul li:first-child{border-left:none;}
75 75 .menu ul li a{width: 100%; height:100%;line-height:43px;float:left;box-sizing:border-box; padding:0 21px;text-transform: uppercase;color:#ffffff;font-size:15px;text-decoration: none;font-weight: 600;}
76   -.menu ul li a:hover{color:#e5e4e4;}
  76 +.menu ul li:hover{background: #3e454b;}
77 77 .menu ul li.active a{background:#f5f5f5;color:#596065;}
78 78 .menu ul li.active a:hover{cursor: default;}
79 79  
... ... @@ -150,10 +150,10 @@ a.link_buy, .checkout_basket button {
150 150 border-right: 0;
151 151 cursor: pointer;
152 152 }
153   -a.link_buy:hover, .submit4m:hover, .checkout_basket button:hover, .submit4:hover {
  153 +a.link_buy:hover, .submit4m:hover, .checkout_basket button:hover, .submit4:hover, .btn-primary:hover {
154 154 border-bottom: 3px solid #95ba2f;;
155 155 }
156   -a.link_buy:active, .submit4m:active,.checkout_basket button:active, .submit4:active {
  156 +a.link_buy:active, .submit4m:active,.checkout_basket button:active, .submit4:active, .btn-primary:active {
157 157 background: #799920;
158 158 border-bottom: 3px solid #799920;
159 159  
... ... @@ -377,8 +377,23 @@ a.del:hover{color:#a52828;text-decoration: underline;}
377 377 .submit4m {font-family: Roboto;border:none;background:#95ba2f;border-radius:4px;color:#ffffff;text-transform: uppercase;font-size:10px;cursor:pointer; width:102px; height: 29px; border-bottom: 3px solid #799920; line-height: 29px;}
378 378 .submit4m:active,.submit4m:focus {outline: none}
379 379  
380   -.btn-primary{margin-top:5px;border:none;padding:8px 13px;background:#95ba2f;border-radius:5px;color:#ffffff;text-transform: uppercase;text-decoration:none;font-size:14px;font-weight:bold;cursor:pointer;}
381   -.btn-primary:hover{background:#f75d50;}
  380 +.btn-primary{
  381 + border-bottom: 3px solid #799920;
  382 + border-top:0;border-right: 0;border-left: 0;
  383 + margin-top:5px;
  384 + padding:0 15px;
  385 + background:#95ba2f;
  386 + border-radius:4px;
  387 + color:#ffffff;
  388 + text-transform: uppercase;
  389 + text-decoration:none;
  390 + font-size:12px;
  391 + font-weight:bold;
  392 + cursor:pointer;
  393 + height: 29px;
  394 + line-height: 29px;
  395 +}
  396 +.btn-primary:active, .btn-primary:focus {outline: none;}
382 397  
383 398 a.logout:visited,a.logout:link{border:none;padding:3px 5px;background:#f75d50;border-radius:5px;color:#ffffff;text-transform: uppercase;text-decoration:none;font-size:11px;font-weight:normal;cursor:pointer;}
384 399 a.logout:hover{background:#95ba2f;}
... ... @@ -544,9 +559,9 @@ ul.social {margin-top: 20px;}
544 559 #order-payment{float:right;width:280px;}
545 560 #order-delivery{float:right;width:280px;}
546 561  
547   -.delivery-data{padding:5px;border:1px solid #1bb631;background: #b7f5bf;display:none;border-radius: 5px;float: left;}
  562 +.delivery-data{margin-bottom:27px;position:relative;background: #95ba2f;display:none;border-radius: 5px;float: left;box-sizing: border-box; padding: 14px 20px; color: #fff; font-size: 13px;}
548 563  
549   -.jcarousel-next-disabled, .jcarousel-prev-disabled {display: none !important;}
  564 +.jcarousel-next-disabled, .jcarousel-prev-disabled {opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";}
550 565 .content2 br {display: none;}
551 566 .pixbox a {
552 567 width: 160px;
... ... @@ -986,19 +1001,22 @@ a.active{font-weight:bold;text-decoration: underline;}
986 1001 margin: 0 0.5em;
987 1002 list-style: none;
988 1003 }
989   -.sort_block ul li a:after {
990   - display: inline-block;
991   - /*font-family: 'Glyphicons Halflings';*/
992   - font-style: normal;
993   - font-weight: normal;
994   - line-height: 1;
995   - -webkit-font-smoothing: antialiased;
  1004 +.sort_block ul li a.asc:after, .sort_block ul li a.desc:after {
  1005 + display: block;
  1006 + width: 5px;
  1007 + height: 3px;
  1008 + position: absolute;
  1009 + top: 50%;
  1010 + margin-top: -1px;
  1011 + right: -10px;
  1012 + content: '';
  1013 + background: url("../img/arrow_sort_asc_desc.png") no-repeat;
996 1014 }
997 1015 .sort_block ul li a.asc:after {
998   - content: "↓";
  1016 + background-position: 0 0;
999 1017 }
1000 1018 .sort_block ul li a.desc:after {
1001   - content: "↑";
  1019 + background-position: 0 -3px;
1002 1020 }
1003 1021 /*************/
1004 1022 .home_banner_up {margin-top: 20px;}
... ... @@ -1075,6 +1093,15 @@ a.active{font-weight:bold;text-decoration: underline;}
1075 1093 .jcarousel-skin-tango .jcarousel-next-vertical {
1076 1094 bottom: -13px;
1077 1095 }
  1096 +.jcarousel-skin-tango .jcarousel-prev-vertical, .jcarousel-skin-tango .jcarousel-next-vertical {
  1097 + left: 0;
  1098 + width: 42px;
  1099 + background-position: 14px 0;
  1100 +}
  1101 +.jcarousel-skin-tango .jcarousel-prev-vertical:hover, .jcarousel-skin-tango .jcarousel-next-vertical:hover {
  1102 + background-position: 14px 0;
  1103 + left: 0;
  1104 +}
1078 1105 ul.product-special {
1079 1106 position: absolute;
1080 1107 top: 0;
... ... @@ -1100,7 +1127,7 @@ ul.product-special li.top {
1100 1127 ul.product-special li.top:after {
1101 1128 content: '';
1102 1129 position: absolute;
1103   - left: 52px;
  1130 + right: -19px;
1104 1131 top: 3px;
1105 1132 border: 11px solid transparent;
1106 1133 border-top: 5px solid #fbc665;
... ... @@ -1125,7 +1152,7 @@ ul.product-special li.promo {
1125 1152 ul.product-special li.promo:after {
1126 1153 content: '';
1127 1154 position: absolute;
1128   - left: 52px;
  1155 + right: -19px;
1129 1156 top: 3px;
1130 1157 border: 11px solid transparent;
1131 1158 border-top: 5px solid #f75d50;
... ... @@ -1173,6 +1200,7 @@ ul.product-special li.promo:after {
1173 1200 }
1174 1201 .sort_block ul li a {
1175 1202 color: #8fa951;
  1203 + position: relative;
1176 1204 }
1177 1205 .sort_block ul li a:hover {
1178 1206 color: #333;
... ... @@ -1253,17 +1281,19 @@ ul.product-special li.promo:after {
1253 1281 .irs {height: 49px;}
1254 1282 .price_filter.first_price_li {margin-top: 8px;}
1255 1283 .product_read_ .w{
1256   - width: 110px;overflow: hidden;
1257   - float: left;
  1284 + width: 110px;
  1285 + overflow: hidden;
1258 1286 margin: 0;
1259 1287 padding-top: 0;
1260   - white-space: nowrap;
1261   - min-height: 32px;
  1288 + display: table-cell;
  1289 + vertical-align: middle;
  1290 + height: 32px;
  1291 + float: none;
1262 1292 }
1263 1293 .product_read_ .w strike, .product_read_ .w .cost {
1264 1294 width: 100%;
1265 1295 float: left;
1266   - line-height: 15px;
  1296 + /*line-height: 15px;*/
1267 1297 }
1268 1298  
1269 1299 .product_read_price .link_buy {
... ... @@ -1289,8 +1319,6 @@ ul.product-special li.promo:after {
1289 1319 padding-bottom: 15px;
1290 1320 }
1291 1321 #login-form .btn-primary {
1292   - padding: 0 13px;
1293   - height: 28px;
1294 1322 }
1295 1323 .field-orders-delivery .control-label, .field-orders-payment .control-label, .field-orders-body .control-label, .textareagroup .control-label {
1296 1324 width: 100%;
... ... @@ -1435,12 +1463,43 @@ input.custom-radio + label:hover {
1435 1463 }
1436 1464 .input-blocks-wrapper .help-block {
1437 1465 padding-left: 71px;
1438   - padding-top: 5px;
  1466 + padding-top: 4px;
1439 1467 width: 100%;
1440 1468 float: left;
1441 1469 box-sizing: border-box;
1442 1470 margin-bottom: 0;
1443 1471 }
  1472 +.cont_shop_but-wr {
  1473 + height: 33px;
  1474 + margin-top: 35px;
  1475 + padding-bottom: 29px;
  1476 +}
  1477 +.cont_shop_but-wr .cont_shop {
  1478 + margin-top: 8px;
  1479 + float: left;
  1480 +}
  1481 +.cont_shop_but-wr .submit4.bottom3 {float: right;}
  1482 +._qqq_ .params {font-size: 12px;}
  1483 +.activeShow {border-bottom: 0 !important;}
  1484 +.delivery-data:after {
  1485 + width: 100%;
  1486 + border-bottom: 1px solid #d2d2d2;
  1487 + position: absolute;
  1488 + content: '';
  1489 + bottom: -27px;
  1490 + left: 0;
  1491 +}
  1492 +.img_ajax_basket img {
  1493 + margin-right: 0!important;
  1494 + max-width: 90px;
  1495 + max-height: 90px;
  1496 + vertical-align: middle;
  1497 +}
  1498 +.jcarousel-skin-tango>li{display: none;}
  1499 +#login-form {
  1500 + margin: 50px auto 0 auto;
  1501 +}
  1502 +.wrapper_all {}
1444 1503 .product-thumb-video iframe {
1445 1504 width: 260px;
1446 1505 height: auto;
... ...
frontend/web/img/arrow_sort_asc_desc.png 0 → 100644
View file @8891dd7

995 Bytes
frontend/web/js/fix_height.js 0 → 100644
  Show/Hide comments   View file @8891dd7
frontend/web/js/main.js
  Show/Hide comments   View file @8891dd7
1 1 /* more_hide */
2   -
3 2 $(function(){
4 3 $(".more").click(function(){
5 4 if($(this).hasClass("hideico")){
... ...