Commit 8c34d56cee3bc4f1568701415b4597991316b229
1 parent
c32f9e9b
test commit 3
Showing
1 changed file
with
11 additions
and
25 deletions
Show diff stats
frontend/views/layouts/main.php
@@ -76,8 +76,7 @@ | @@ -76,8 +76,7 @@ | ||
76 | <div class="barEmpty"></div> | 76 | <div class="barEmpty"></div> |
77 | <div class="container"> | 77 | <div class="container"> |
78 | <div id="bottom"> | 78 | <div id="bottom"> |
79 | - | ||
80 | - | 79 | + |
81 | </div> | 80 | </div> |
82 | </div> | 81 | </div> |
83 | 82 | ||
@@ -207,13 +206,13 @@ | @@ -207,13 +206,13 @@ | ||
207 | <div id="brand_bar"> | 206 | <div id="brand_bar"> |
208 | 207 | ||
209 | <div class="container"> | 208 | <div class="container"> |
210 | - <?php if($this->beginCache('brand_list',[ | ||
211 | - 'duration' => 3600 *24 | ||
212 | - ])){ ?> | 209 | + <?php if($this->beginCache('brand_list',[ |
210 | + 'duration' => 3600 *24 | ||
211 | + ])){ ?> | ||
213 | 212 | ||
214 | - <?= $this->render('../partial/brand_list')?> | 213 | + <?= $this->render('../partial/brand_list')?> |
215 | 214 | ||
216 | - <?php $this->endCache(); } ?> | 215 | + <?php $this->endCache(); } ?> |
217 | </div> | 216 | </div> |
218 | </div> | 217 | </div> |
219 | 218 | ||
@@ -455,18 +454,15 @@ | @@ -455,18 +454,15 @@ | ||
455 | </footer> | 454 | </footer> |
456 | 455 | ||
457 | <div class="btn-fixeds fixed-events"><a href="/event/main">акции</a></div> | 456 | <div class="btn-fixeds fixed-events"><a href="/event/main">акции</a></div> |
458 | -<!-- <div class="btn-fixeds fixed-sale"><a href="/event">Распродажа</a></div>--> | 457 | + <!--<div class="btn-fixeds fixed-sale"><a href="/event">Распродажа</a></div>--> |
459 | 458 | ||
460 | - <table border="0" cellspacing="0" cellpadding="0" class="reqsBox"> | ||
461 | - </table> | 459 | + <table border="0" cellspacing="0" cellpadding="0" class="reqsBox"></table> |
462 | <div class="debug"></div> | 460 | <div class="debug"></div> |
463 | </div> | 461 | </div> |
464 | </div> | 462 | </div> |
465 | 463 | ||
466 | - | ||
467 | <!-- Modal's --> | 464 | <!-- Modal's --> |
468 | - | ||
469 | - | 465 | + |
470 | <!-- login window --> | 466 | <!-- login window --> |
471 | <?= $this->render('/modal/login_window_model_window') ?> | 467 | <?= $this->render('/modal/login_window_model_window') ?> |
472 | 468 | ||
@@ -475,11 +471,10 @@ | @@ -475,11 +471,10 @@ | ||
475 | 471 | ||
476 | <!-- forgot password form --> | 472 | <!-- forgot password form --> |
477 | <?= $this->render('/modal/forgot_password_form_model_window') ?> | 473 | <?= $this->render('/modal/forgot_password_form_model_window') ?> |
474 | + | ||
478 | <div class="modal fade" id="price_drop" tabindex="-1" role="dialog" aria-labelledby="myModalLabel3"> | 475 | <div class="modal fade" id="price_drop" tabindex="-1" role="dialog" aria-labelledby="myModalLabel3"> |
479 | <div class="modal-dialog auth" role="document"> | 476 | <div class="modal-dialog auth" role="document"> |
480 | <div class="modal-content"> | 477 | <div class="modal-content"> |
481 | - | ||
482 | - | ||
483 | <div class="modal-body"> | 478 | <div class="modal-body"> |
484 | 479 | ||
485 | <form> | 480 | <form> |
@@ -499,21 +494,14 @@ | @@ -499,21 +494,14 @@ | ||
499 | <button type="submit" class="btn btn-default btn-large">Отправить</button> | 494 | <button type="submit" class="btn btn-default btn-large">Отправить</button> |
500 | <div class="clearfix"></div> | 495 | <div class="clearfix"></div> |
501 | </form> | 496 | </form> |
502 | - | ||
503 | - | 497 | + |
504 | <br/> | 498 | <br/> |
505 | <div class="clearfix"></div> | 499 | <div class="clearfix"></div> |
506 | </div> | 500 | </div> |
507 | - | ||
508 | </div> | 501 | </div> |
509 | </div> | 502 | </div> |
510 | </div> | 503 | </div> |
511 | 504 | ||
512 | - | ||
513 | - | ||
514 | - | ||
515 | - | ||
516 | - | ||
517 | <div class="modal fade" id="returnСonditions" tabindex="-1" role="dialog" aria-labelledby="myModalLabel4"> | 505 | <div class="modal fade" id="returnСonditions" tabindex="-1" role="dialog" aria-labelledby="myModalLabel4"> |
518 | <div class="modal-dialog text-dialog" role="document"> | 506 | <div class="modal-dialog text-dialog" role="document"> |
519 | <div class="modal-content"> | 507 | <div class="modal-content"> |
@@ -539,8 +527,6 @@ | @@ -539,8 +527,6 @@ | ||
539 | <!-- consultation_modal --> | 527 | <!-- consultation_modal --> |
540 | <?= $this->render('/modal/my_callback_modal_window') ?> | 528 | <?= $this->render('/modal/my_callback_modal_window') ?> |
541 | 529 | ||
542 | - | ||
543 | - | ||
544 | <div class="modal fade" id="myWishlistAdded" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> | 530 | <div class="modal fade" id="myWishlistAdded" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> |
545 | <div class="modal-dialog wishlist" role="document"> | 531 | <div class="modal-dialog wishlist" role="document"> |
546 | <div class="modal-content"> | 532 | <div class="modal-content"> |