Anastasia / cloud-bank

Commit c7b6386ecb9be63ece8b40a6360c30724c88f5a8

Authored by Alex Savenko
1 parent 2601ed5b

conflict

Showing 4 changed files with 3 additions and 1062 deletions   Show diff stats
Inline Side-by-side
frontend/assets/AppAsset.php
  Show/Hide comments   View file @c7b6386
1 -<<<<<<< HEAD  
2 -<?php  
3 -  
4 - namespace frontend\assets;  
5 -  
6 - use yii\web\AssetBundle;  
7 -  
8 - /**  
9 - * Main frontend application asset bundle.  
10 - */  
11 - class AppAsset extends AssetBundle  
12 - {  
13 - public $basePath = '@webroot';  
14 - public $baseUrl = '@web';  
15 - public $css = [  
16 - 'css/animate.css',  
17 - 'css/owl.carousel.css',  
18 - 'css/owl.theme.css',  
19 - '//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,500,700,800',  
20 - 'css/perfect-scrollbar.min.css',  
21 - 'css/style.css',  
22 - ];  
23 - public $js = [  
24 - 'js/jquery.cookie.js',  
25 - 'js/waypoints.min.js',  
26 - 'js/jquery.counterup.min.js',  
27 - 'js/jquery.parallax-1.1.3.js',  
28 - 'js/front.js',  
29 - 'js/owl.carousel.min.js',  
30 - 'js/perfect-scrollbar.min.js',  
31 - 'js/script.js',  
32 - 'js/custom.js',  
33 - ];  
34 - public $depends = [  
35 -// 'hiqdev\assets\pnotify\PNotifyAsset',  
36 - 'yii\web\YiiAsset',  
37 - 'rmrevin\yii\fontawesome\AssetBundle',  
38 - 'yii\bootstrap\BootstrapPluginAsset',  
39 - 'yii\widgets\PjaxAsset',  
40 - 'artbox\order\assets\BasketAsset',  
41 - ];  
42 - }  
43 -=======  
44 <?php 1 <?php
45 -  
46 namespace frontend\assets; 2 namespace frontend\assets;
47 3
48 use yii\web\AssetBundle; 4 use yii\web\AssetBundle;
@@ -82,5 +38,5 @@ @@ -82,5 +38,5 @@
82 'artbox\order\assets\BasketAsset', 38 'artbox\order\assets\BasketAsset',
83 ]; 39 ];
84 } 40 }
85 ->>>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f 41 +
86 42
87 \ No newline at end of file 43 \ No newline at end of file
frontend/views/layouts/main.php
  Show/Hide comments   View file @c7b6386
1 -<<<<<<< HEAD  
2 -<?php  
3 - /**  
4 - * @var View $this  
5 - * @var string $content  
6 - * @var SeoComponent $seo  
7 - * @var User $user  
8 - */  
9 - use artbox\core\components\SeoComponent;  
10 - use artbox\core\models\Feedback;  
11 - use artbox\core\models\Image;  
12 - use artbox\core\models\Page;  
13 - use artbox\core\models\User;  
14 - use artbox\order\models\LoginForm;  
15 - use common\models\Newsletter;  
16 - use common\models\SearchForm;  
17 - use common\models\Settings;  
18 - use frontend\assets\AppAsset;  
19 - use frontend\widgets\LangLink;  
20 - use yii\base\Model;  
21 - use yii\bootstrap\ActiveForm;  
22 - use yii\bootstrap\Html;  
23 - use yii\helpers\Url;  
24 - use yii\web\View;  
25 - use yii\widgets\Breadcrumbs;  
26 -  
27 - AppAsset::register($this);  
28 - /**  
29 - * @var \artbox\order\models\Customer $user  
30 - */  
31 - $user = \Yii::$app->user->identity;  
32 - $seo = Yii::$app->get('seo');  
33 - $feedback = new Feedback();  
34 - $settings = Settings::getInstance();  
35 - $controller = Yii::$app->controller;  
36 - $default_controller = Yii::$app->defaultRoute;  
37 - /**  
38 - * @var LoginForm $loginForm  
39 - */  
40 - $loginForm = \Yii::createObject(  
41 - [  
42 - 'class' => LoginForm::className(),  
43 - 'returnUrl' => \Yii::$app->request->absoluteUrl,  
44 - ]  
45 - );  
46 - /**  
47 - * @var Newsletter $newsletter  
48 - */  
49 - $newsletter = \Yii::createObject(  
50 - [  
51 - 'class' => Newsletter::className(),  
52 - ]  
53 - );  
54 - $isHome = ( ( $controller->id === $default_controller ) && ( $controller->action->id === $controller->defaultAction ) ) ? true : false;  
55 - /**  
56 - * @var Page[] $pages  
57 - */  
58 - $pages = Page::find()  
59 - ->where([ 'in_menu' => true ])  
60 - ->with('lang.alias')  
61 - ->orderBy(  
62 - [  
63 - 'sort' => SORT_ASC,  
64 - 'id' => SORT_ASC,  
65 - ]  
66 - )  
67 - ->all();  
68 - $logo = null;  
69 - if ($settings->logo) {  
70 - $logo_img = Image::findOne($settings->logo);  
71 - if ($logo_img) {  
72 - $logo = $logo_img->getUrl() ?? $logo;  
73 - }  
74 - }  
75 -  
76 - $this->registerMetaTag(  
77 - [  
78 - 'name' => 'description',  
79 - 'content' => $seo->desc,  
80 - ]  
81 - )  
82 -?>  
83 -  
84 -<?php $this->beginPage() ?>  
85 -  
86 - <!DOCTYPE html>  
87 - <html lang="<?= \Yii::$app->language ?>">  
88 - <head>  
89 - <meta charset="<?= \Yii::$app->charset ?>">  
90 - <meta name="viewport" content="width=device-width, initial-scale=1">  
91 - <?= Html::csrfMetaTags() ?>  
92 - <title><?= Html::encode($seo->title) ?></title>  
93 - <?php $this->head() ?>  
94 - </head>  
95 - <body>  
96 - <?php $this->beginBody() ?>  
97 - <!-- Google Analytics -->  
98 - <script>  
99 - (function(i, s, o, g, r, a, m) {  
100 - i[ 'GoogleAnalyticsObject' ] = r;  
101 - i[ r ] = i[ r ] || function() {  
102 - (i[ r ].q = i[ r ].q || []).push(arguments)  
103 - }, i[ r ].l = 1 * new Date();  
104 - a = s.createElement(o), m = s.getElementsByTagName(o)[ 0 ];  
105 - a.async = 1;  
106 - a.src = g;  
107 - m.parentNode.insertBefore(a, m)  
108 - })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');  
109 -  
110 - ga('create', <?=$settings->ga_code?>, 'auto');  
111 - ga('send', 'pageview');  
112 -  
113 - </script>  
114 -  
115 - <div id="all">  
116 - <header>  
117 -  
118 - <!-- *** TOP ***  
119 -_________________________________________________________ -->  
120 - <div id="top" class="hidden-sm hidden-xs">  
121 - <div class="container">  
122 - <div class="row">  
123 - <div class="col-xs-6 left-top-nav">  
124 - <?php  
125 - foreach ($pages as $page) {  
126 - echo Html::a(  
127 - $page->lang->title,  
128 - [  
129 - 'page/view',  
130 - 'id' => $page->id,  
131 - ]  
132 - );  
133 - }  
134 - echo Html::a(  
135 - \Yii::t('app', 'ะšะพะฝั‚ะฐะบั‚ั‹'),  
136 - [  
137 - 'site/contact',  
138 - ]  
139 - );  
140 - ?>  
141 - </div>  
142 - <div class="col-xs-6 right-top-nav">  
143 - <div class="inline-block lang-link">  
144 - <?php  
145 - echo LangLink::widget();  
146 - ?>  
147 - </div>  
148 - <div class="inline-block">  
149 - <span class="top-phone"><i class="fa fa-phone"></i>&ensp;<?php echo $settings->phone; ?></span>  
150 - <a href="#" data-toggle="modal" data-target="#callback-modal" class="link-underline_dott">  
151 - <?php echo "ะžะฑั€ะฐั‚ะฝั‹ะน ะทะฒะพะฝะพะบ"; ?>  
152 - </a>  
153 - </div>  
154 - <div class="inline-block login">  
155 - <?php  
156 - if (\Yii::$app->user->isGuest) {  
157 - ?>  
158 - <a href="#" data-toggle="modal" data-target="#login-modal"><i class="fa fa-sign-in"></i>  
159 - <span>ะ’ั…ะพะด</span></a>  
160 - <?php  
161 - } else {  
162 - echo Html::a($user->username, [ 'account/index' ]);  
163 - }  
164 - ?>  
165 - </div>  
166 - </div>  
167 - </div>  
168 - </div>  
169 - </div>  
170 -  
171 - <!-- *** TOP END *** -->  
172 -  
173 - <!-- *** NAVBAR ***  
174 - _________________________________________________________ -->  
175 -  
176 - <div class="navbar-affixed-top" data-spy="affix" data-offset-top="200">  
177 -  
178 - <div class="navbar navbar-default yamm" role="navigation" id="navbar">  
179 -  
180 - <div class="container">  
181 - <div class="navbar-header">  
182 - <?php  
183 - echo Html::a(  
184 - Html::img(  
185 - $logo ? : '/img/no-image.png',  
186 - [  
187 - 'alt' => 'logo',  
188 - ]  
189 - ),  
190 - '/ru/',  
191 - [  
192 - 'class' => 'navbar-brand home',  
193 - ]  
194 - )  
195 - ?>  
196 - <div class="navbar-buttons">  
197 - <button type="button" class="navbar-toggle btn-template-main" data-toggle="collapse" data-target="#navigation">  
198 - <span class="sr-only"><?php echo \Yii::t(  
199 - 'app',  
200 - 'Toggle navigation'  
201 - ); ?></span>  
202 - <i class="fa fa-align-justify"></i>  
203 - </button>  
204 - </div>  
205 - </div>  
206 - <!--/.navbar-header -->  
207 -  
208 - <div class="navbar-collapse collapse navbar-left" id="navigation">  
209 - <ul class="nav navbar-nav navbar-left">  
210 - <li class="main-nav-item <?php if ($isHome){ echo 'home-page-menu';}?>">  
211 - <a href="#" <?php echo $isHome ? '' : 'role="button" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="200"'; ?>><span class="btn-like"><?php echo \Yii::t(  
212 - 'app',  
213 - 'ะšะฐั‚ะฐะปะพะณ'  
214 - ); ?><i class="fa fa-bars" aria-hidden="true"></i></span></a>  
215 - <?php  
216 - if (!$isHome) {  
217 - echo $this->render(  
218 - '_category_menu',  
219 - [  
220 - 'isHome' => $isHome,  
221 - ]  
222 - );  
223 - }  
224 - ?>  
225 - </li>  
226 - <li class="main-nav-item">  
227 - <?php  
228 - echo Html::a(  
229 - \Yii::t('app', 'ะะบั†ะธะธ'),  
230 - [  
231 - '/special/index',  
232 - 'type' => 'sale',  
233 - ]  
234 - );  
235 - ?>  
236 - </li>  
237 - <li class="main-nav-item">  
238 - <?php  
239 - echo Html::a(  
240 - \Yii::t('app', 'ะะพะฒะธะฝะบะธ'),  
241 - [  
242 - '/special/index',  
243 - 'type' => 'new',  
244 - ]  
245 - );  
246 - ?>  
247 - </li>  
248 - <li class="main-nav-item">  
249 - <?php  
250 - echo Html::a(  
251 - \Yii::t('app', 'ะ‘ะปะพะณ'),  
252 - [  
253 - '/blog/index',  
254 - ]  
255 - );  
256 - ?>  
257 - </li>  
258 - </ul>  
259 - </div>  
260 - <!--/.nav-collapse -->  
261 -  
262 - <div class="cart-item" id="cart">  
263 - <span class="badge">0</span>  
264 - <?php  
265 - echo Html::a(  
266 - Html::tag(  
267 - 'span',  
268 - \Yii::t('app', 'ะšะพั€ะทะธะฝะฐ'),  
269 - [  
270 - 'class' => 'sub-title',  
271 - ]  
272 - ),  
273 - [  
274 - '#',  
275 - ],  
276 - [  
277 - 'class' => 'cart-item-link',  
278 - 'data-toggle' => 'modal',  
279 - 'data-target' => '#basket-modal',  
280 - ]  
281 - );  
282 - ?>  
283 - </div>  
284 -  
285 - <div class="search-block" id="search">  
286 - <?php  
287 - /**  
288 - * @var Model $search  
289 - */  
290 - $search = \Yii::createObject(SearchForm::className());  
291 - $searchForm = ActiveForm::begin(  
292 - [  
293 - 'action' => [ '/search/index' ],  
294 - 'id' => 'search-form',  
295 - 'method' => 'get',  
296 - 'options' => [  
297 - 'class' => 'navbar-form',  
298 - 'role' => 'search',  
299 - ],  
300 - ]  
301 - );  
302 - echo Html::beginTag(  
303 - 'div',  
304 - [  
305 - 'class' => 'input-group',  
306 - ]  
307 - );  
308 - echo $searchForm->field(  
309 - $search,  
310 - 'word',  
311 - [  
312 - 'options' => [  
313 - 'tag' => false,  
314 - ],  
315 - ]  
316 - )  
317 - ->label(false)  
318 - ->textInput(  
319 - [  
320 - 'placeholder' => $search->getAttributeLabel('word'),  
321 - 'name' => 'word',  
322 - ]  
323 - );  
324 - echo Html::tag(  
325 - 'span',  
326 - Html::submitButton(  
327 - Html::tag(  
328 - 'i',  
329 - '',  
330 - [  
331 - 'class' => 'fa fa-search',  
332 - ]  
333 - ),  
334 - [  
335 - 'class' => 'btn btn-template-main',  
336 - ]  
337 - ),  
338 - [  
339 - 'class' => 'input-group-btn',  
340 - ]  
341 - );  
342 - echo Html::endTag('div');  
343 - $searchForm::end();  
344 - ?>  
345 - </div>  
346 -  
347 -  
348 - <!--/.nav-collapse -->  
349 - </div>  
350 - </div>  
351 - <!-- /#navbar -->  
352 - </div>  
353 - <!-- *** NAVBAR END *** -->  
354 - </header>  
355 -  
356 - <!-- *** LOGIN MODAL ***  
357 -_________________________________________________________ -->  
358 - <?php  
359 - if (\Yii::$app->user->isGuest) {  
360 - ?>  
361 - <div class="modal fade" id="login-modal" tabindex="-1" role="dialog" aria-labelledby="Login" aria-hidden="true">  
362 - <div class="modal-dialog modal-sm">  
363 -  
364 - <div class="modal-content">  
365 - <div class="modal-header">  
366 - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>  
367 - <h4 class="modal-title text-center" id="Login">  
368 - <?php echo \Yii::t('app', 'Customer login'); ?>  
369 - </h4>  
370 - </div>  
371 - <div class="modal-body">  
372 - <?php  
373 - $login = ActiveForm::begin(  
374 - [  
375 - 'action' => [ '/site/login' ],  
376 - ]  
377 - );  
378 - echo $login->field($loginForm, 'returnUrl')  
379 - ->label(false)  
380 - ->hiddenInput();  
381 - echo $login->field($loginForm, 'username')  
382 - ->label(false)  
383 - ->textInput(  
384 - [  
385 - 'placeholder' => $loginForm->getAttributeLabel('username'),  
386 - ]  
387 - );  
388 - echo $login->field($loginForm, 'password')  
389 - ->label(false)  
390 - ->passwordInput(  
391 - [  
392 - 'placeholder' => $loginForm->getAttributeLabel('ะฟะฐั€ะพะปัŒ'),  
393 - ]  
394 - );  
395 - echo $login->field($loginForm, 'rememberMe')  
396 - ->checkbox();  
397 - ?>  
398 - <div class="text-center">  
399 - <?php  
400 - echo Html::submitButton(  
401 - \Yii::t('app', 'Login'),  
402 - [  
403 - 'class' => 'btn btn-success',  
404 - ]  
405 - );  
406 - $login::end();  
407 - ?>  
408 - </div>  
409 - <p class="text-center text-muted">  
410 - <?php echo \Yii::t('app', 'Not registered yet?'); ?></p>  
411 - <p class="text-center text-muted">  
412 - <?php  
413 - echo Html::a(  
414 - Html::tag('strong', \Yii::t('app', 'Register now!')),  
415 - [  
416 - '/site/login',  
417 - ]  
418 - );  
419 - ?>  
420 - </p>  
421 -  
422 - </div>  
423 - </div>  
424 - </div>  
425 - </div>  
426 - <?php  
427 - }  
428 - ?>  
429 -  
430 - <!-- *** LOGIN MODAL END *** -->  
431 -  
432 -  
433 - <!-- *** SUCCESS MODAL BEGIN ***  
434 -_________________________________________________________ -->  
435 - <?php  
436 - if ($msg = \Yii::$app->session->getFlash('success')) {  
437 - ?>  
438 - <div class="modal fade" id="success-modal" tabindex="-1" role="dialog" aria-labelledby="Success" aria-hidden="true">  
439 - <div class="modal-dialog modal-sm">  
440 -  
441 - <div class="modal-content">  
442 - <div class="modal-header">  
443 - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>  
444 - </div>  
445 - <div class="modal-body">  
446 - <?php echo $msg; ?>  
447 - </div>  
448 - </div>  
449 - </div>  
450 - </div>  
451 - <?php  
452 - $this->registerJs("$('#success-modal').modal('show');");  
453 - }  
454 - ?>  
455 -  
456 - <!-- *** Breadcrumbs *** -->  
457 - <!-- *** FEEDBACK MODAL BEGIN *** -->  
458 - <?php  
459 - ?>  
460 -  
461 - <?php  
462 - $callback = new Feedback(  
463 - [  
464 - 'scenario' => Feedback::SCENARIO_CALLBACK,  
465 - 'returnUrl' => Url::current([], true),  
466 - ]  
467 - );  
468 - ?>  
469 - <div class="modal fade" id="callback-modal" tabindex="-1" role="dialog" aria-labelledby="Login" aria-hidden="true">  
470 - <div class="modal-dialog modal-sm">  
471 -  
472 - <div class="modal-content">  
473 - <div class="modal-header">  
474 - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>  
475 - <h4 class="modal-title callback text-center" id="Login">ะžะฑั€ะฐั‚ะฝั‹ะน ะทะฒะพะฝะพะบ</h4>  
476 - </div>  
477 - <div class="modal-body">  
478 - <?php  
479 - $form = ActiveForm::begin(  
480 - [  
481 - 'action' => [ 'site/callback' ],  
482 - ]  
483 - );  
484 - echo $form->field($callback, 'returnUrl')  
485 - ->label(false)  
486 - ->hiddenInput();  
487 - echo $form->field($callback, 'name')  
488 - ->label(false)  
489 - ->textInput(  
490 - [  
491 - 'placeholder' => $callback->getAttributeLabel('ะ’ะฐัˆะต ะธะผั'),  
492 - ]  
493 - );  
494 - echo $form->field($callback, 'phone')  
495 - ->label(false)  
496 - ->textInput(  
497 - [  
498 - 'placeholder' => $callback->getAttributeLabel('ะะพะผะตั€ ั‚ะตะปะตั„ะพะฝะฐ'),  
499 - ]  
500 - );  
501 - echo Html::tag(  
502 - 'p',  
503 - Html::submitButton(  
504 - Html::icon(  
505 - 'sign-in',  
506 - [  
507 - 'prefix' => 'fa fa-',  
508 - ]  
509 - ) . \Yii::t('app', 'ะžั‚ะฟั€ะฐะฒะธั‚ัŒ'),  
510 - [  
511 - 'class' => 'btn btn-template-main',  
512 - ]  
513 - ),  
514 - [  
515 - 'class' => 'text-center',  
516 - ]  
517 - );  
518 - $form::end();  
519 - ?>  
520 - </div>  
521 - </div>  
522 - </div>  
523 - </div>  
524 - <!-- *** FEEDBACK MODAL END *** -->  
525 -  
526 - <!-- *** MODAL BASKET START *** -->  
527 -  
528 - <div class="modal fade" id="basket-modal" tabindex="-1" role="dialog" aria-hidden="true">  
529 - <?php  
530 - echo $this->render('_basket_modal');  
531 - ?>  
532 - </div>  
533 - <!-- *** MODAL BASKET END *** -->  
534 - <?php  
535 - if (!$isHome) {  
536 - ?>  
537 - <div id="heading-breadcrumbs">  
538 - <div class="container">  
539 - <?= Breadcrumbs::widget(  
540 - [  
541 - 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [],  
542 - 'homeLink' => [  
543 - 'label' => \Yii::t('app', 'Home'),  
544 - 'url' => [ '/site/index' ],  
545 - ],  
546 - ]  
547 - ) ?>  
548 - </div>  
549 - </div>  
550 - <?php  
551 - }  
552 - ?>  
553 - <!-- *** crumbs END *** -->  
554 -  
555 - <?= $content ?>  
556 -  
557 - <!-- *** FOOTER ***  
558 -_________________________________________________________ -->  
559 -  
560 - <footer id="footer">  
561 - <div class="container">  
562 - <div class="col-md-3 col-sm-6">  
563 - <h4>ะž ะฝะฐั</h4>  
564 -  
565 - <p><?= $settings->about ?></p>  
566 -  
567 - <hr class="hidden-md hidden-lg hidden-sm">  
568 -  
569 - </div>  
570 - <!-- /.col-md-3 -->  
571 -  
572 - <div class="col-md-3 col-sm-6">  
573 -  
574 - <h4>ะ ะฐะทะดะตะปั‹</h4>  
575 -  
576 - <div class="blog-entries">  
577 -  
578 - <?php foreach ($pages as $page) { ?>  
579 - <div class="item same-height-row clearfix">  
580 - <div class="name">  
581 - <h5><?= Html::a(  
582 - $page->lang->title,  
583 - [  
584 - 'page/view',  
585 - 'id' => $page->id,  
586 - ]  
587 - ) ?></h5>  
588 - </div>  
589 - </div>  
590 - <?php } ?>  
591 -  
592 - <div class="item same-height-row clearfix">  
593 - <div class="style name">  
594 - <?= Html::a(\Yii::t('app', 'ะšะพะฝั‚ะฐะบั‚ั‹'), [ 'site/contact' ]) ?>  
595 - </div>  
596 -  
597 -<!-- <div class="name">-->  
598 -<!-- --><?//= Html::a(\Yii::t('app', 'ะšะพะฝั‚ะฐะบั‚ั‹'), [ 'site/contact' ]) ?>  
599 -<!-- </div>-->  
600 - </div>  
601 -  
602 - </div>  
603 -  
604 - <hr class="hidden-md hidden-lg">  
605 -  
606 - </div>  
607 -  
608 - <div class="col-md-3 col-sm-6">  
609 -  
610 - <h4>ะกะพั†ะธะฐะปัŒะฝั‹ะต ัะตั‚ะธ</h4>  
611 -  
612 - <p class="socials-links">  
613 - <?php if (!empty($settings->facebook)) { ?>  
614 - <a href="<?= $settings->facebook ?>"><i class="fa fa-facebook-official" aria-hidden="true"></i></a>  
615 - <?php }  
616 -// if (!empty($settings->vk)) { ?>  
617 -<!-- <a href="--><?//= $settings->vk ?><!--"><i class="fa fa-vk" aria-hidden="true"></i></a>-->  
618 -<!-- --><?php //}  
619 - if (!empty($settings->google)) { ?>  
620 - <a href="<?= $settings->google ?>"><i class="fa fa-google-plus-square" aria-hidden="true"></i></a>  
621 - <?php }  
622 - if (!empty($settings->twitter)) { ?>  
623 - <a href="<?= $settings->twitter ?>"><i class="fa fa-twitter-square" aria-hidden="true"></i></a>  
624 - <?php }  
625 -// if (!empty($settings->ok)) { ?>  
626 -<!-- <a href="--><?//= $settings->ok ?><!--"><i class="fa fa-odnoklassniki" aria-hidden="true"></i></a>-->  
627 -<!-- --><?php //} ?>  
628 - </p>  
629 -  
630 - </div>  
631 -  
632 - <div class="col-md-3 col-sm-6">  
633 -  
634 - <h4>ะšะพะฝั‚ะฐะบั‚ะฝะฐั ะธะฝั„ะพั€ะผะฐั†ะธั</h4>  
635 -  
636 - <p><strong><?= $settings->email ?></strong>  
637 - <br><?= $settings->city . ',' ?>  
638 - <br><?= $settings->street . ', ' . $settings->house ?>  
639 - <br>  
640 - <strong><?= $settings->country ?></strong>  
641 - </p>  
642 - <?php  
643 - echo Html::a(  
644 - \Yii::t('app', 'ะะฐะฟะธัะฐั‚ัŒ ะฝะฐะผ'),  
645 - [ 'site/contact' ],  
646 - [  
647 - 'class' => 'btn btn-small btn-template-main',  
648 - ]  
649 - );  
650 - ?>  
651 -  
652 - <hr class="hidden-md hidden-lg hidden-sm">  
653 -  
654 - </div>  
655 - <!-- /.col-md-3 -->  
656 - </div>  
657 - <!-- /.container -->  
658 - </footer>  
659 - <!-- /#footer -->  
660 -  
661 - <!-- *** FOOTER END *** -->  
662 -  
663 -  
664 - </div>  
665 - <!-- /#all -->  
666 - <?php $this->endBody() ?>  
667 - </body>  
668 - </html>  
669 -======= 1 +
670 <?php 2 <?php
671 /** 3 /**
672 * @var View $this 4 * @var View $this
@@ -1410,5 +742,4 @@ _________________________________________________________ --&gt; @@ -1410,5 +742,4 @@ _________________________________________________________ --&gt;
1410 <?php $this->endBody() ?> 742 <?php $this->endBody() ?>
1411 </body> 743 </body>
1412 </html> 744 </html>
1413 ->>>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f  
1414 <?php $this->endPage() ?> 745 <?php $this->endPage() ?>
1415 \ No newline at end of file 746 \ No newline at end of file
frontend/views/site/.index.php.swp 0 โ†’ 100644
View file @c7b6386
No preview for this file type
frontend/views/site/index.php
  Show/Hide comments   View file @c7b6386
1 -<<<<<<< HEAD  
2 -<?php  
3 - use artbox\catalog\models\Brand;  
4 - use artbox\catalog\models\Category;  
5 - use artbox\catalog\models\Product;  
6 - use artbox\core\components\SeoComponent;  
7 - use artbox\core\helpers\ImageHelper;  
8 - use artbox\weblog\models\Article;  
9 - use yii\bootstrap\Html;  
10 - use yii\helpers\Url;  
11 - use yii\web\View;  
12 -  
13 - /**  
14 - * @var View $this  
15 - * @var Category[] $categories  
16 - * @var Product[] $topItems  
17 - * @var Product[] $newItems  
18 - * @var Product[] $saleItems  
19 - * @var int $brandCount  
20 - * @var int $productCount  
21 - * @var Brand[] $brands  
22 - * @var SeoComponent $seo  
23 - * @var Article[] $articles  
24 - */  
25 - $this->title = 'My Yii Application';  
26 - $seo = Yii::$app->get('seo');  
27 -?>  
28 -<section class="category-carousel-box">  
29 - <!-- *** HOMEPAGE CAROUSEL ***  
30 -_________________________________________________________ -->  
31 - <div class="container">  
32 -  
33 - <div class="row">  
34 - <div class="col-sm-3">  
35 - <!-- ะตัะปะธ ะฝะตั‚ ะฒะปะพะถะตะฝะฝะพัั‚ะธ ะฒ ะผะตะฝัŽ ั‚ะพ ะดะพะฑะฐะฒะปัั‚ัŒ ั€ะพะดะธั‚ะตะปัŒััŒะบะธะผ li ะบะปะฐัั ".no-child-menu" -->  
36 - <?php  
37 - echo $this->render(  
38 - '@frontend/views/layouts/_category_menu',  
39 - [  
40 - 'isHome' => true,  
41 - ]  
42 - );  
43 - ?>  
44 - </div>  
45 -  
46 - <div class="col-sm-9">  
47 - <div class="home-carousel" style="min-height:384px;">  
48 -  
49 - <div class="dark-mask"></div>  
50 -  
51 - <div class="homepage owl-carousel">  
52 - <div class="item">  
53 - <div class="row">  
54 - <div class="col-sm-5">  
55 - </div>  
56 - <div class="col-sm-7">  
57 - </div>  
58 - </div>  
59 - </div>  
60 - </div>  
61 - <!-- /.project owl-slider -->  
62 - </div>  
63 - </div>  
64 - </div>  
65 - </div>  
66 - <!-- *** HOMEPAGE CAROUSEL END *** -->  
67 -</section>  
68 -  
69 -  
70 -<section>  
71 - <div class="container">  
72 - <div class="hidden-xs col-sm-3"></div>  
73 - <div class="hidden-xs col-sm-9">  
74 - <?php  
75 - if (!empty($newItems)) {  
76 - ?>  
77 - <div class="heading text-center">  
78 - <h2><?php echo \Yii::t('app', 'ะะพะฒะธะฝะบะธ'); ?></h2>  
79 - </div>  
80 -  
81 - <div class="product-carousel">  
82 - <div class="homepage owl-carousel">  
83 - <?php  
84 - $newItemsArrays = array_chunk($newItems, 4);  
85 - foreach ($newItemsArrays as $newItemsArray) {  
86 - ?>  
87 - <div class="products">  
88 - <?php  
89 - foreach ($newItemsArray as $product) {  
90 - echo $this->render(  
91 - '_slider_product',  
92 - [  
93 - 'product' => $product,  
94 - ]  
95 - );  
96 - }  
97 - ?>  
98 - </div>  
99 - <?php  
100 - }  
101 - ?>  
102 - </div>  
103 - </div>  
104 - <?php  
105 - }  
106 - if (!empty($saleItems)) {  
107 - ?>  
108 - <div class="heading text-center">  
109 - <h2><?php echo \Yii::t('app', 'ะะบั†ะธะธ'); ?></h2>  
110 - </div>  
111 - <div class="product-carousel">  
112 - <div class="homepage owl-carousel">  
113 - <?php  
114 - $newItemsArrays = array_chunk($saleItems, 4);  
115 - foreach ($newItemsArrays as $newItemsArray) {  
116 - ?>  
117 - <div class="products">  
118 - <?php  
119 - foreach ($newItemsArray as $product) {  
120 - echo $this->render(  
121 - '_slider_product',  
122 - [  
123 - 'product' => $product,  
124 - ]  
125 - );  
126 - }  
127 - ?>  
128 - </div>  
129 - <?php  
130 - }  
131 - ?>  
132 - </div>  
133 - </div>  
134 - <?php  
135 - }  
136 - if (!empty($topItems)) {  
137 - ?>  
138 - <div class="heading text-center">  
139 - <h2><?php echo \Yii::t('app', 'ะขะพะฟ'); ?></h2>  
140 - </div>  
141 - <div class="product-carousel">  
142 - <div class="homepage owl-carousel">  
143 - <?php  
144 - $newItemsArrays = array_chunk($topItems, 4);  
145 - foreach ($newItemsArrays as $newItemsArray) {  
146 - ?>  
147 - <div class="products">  
148 - <?php  
149 - foreach ($newItemsArray as $product) {  
150 - echo $this->render(  
151 - '_slider_product',  
152 - [  
153 - 'product' => $product,  
154 - ]  
155 - );  
156 - }  
157 - ?>  
158 - </div>  
159 - <?php  
160 - }  
161 - ?>  
162 - </div>  
163 - </div>  
164 - <?php  
165 - }  
166 - ?>  
167 - </div>  
168 - </div>  
169 -</section>  
170 -  
171 -<section class="bar color-white no-mb">  
172 - <div class="container">  
173 - <div class="row showcase">  
174 - <div class="col-md-4 col-sm-6">  
175 - <div class="item">  
176 - <div class="icon"><i class="fa fa-cubes"></i>  
177 - </div>  
178 - <h4><span class="counter"><?php echo $productCount; ?></span><br>  
179 -  
180 - ะŸะพะทะธั†ะธะน ั‚ะพะฒะฐั€ะพะฒ</h4>  
181 - </div>  
182 - </div>  
183 - <div class="col-md-4 col-sm-6">  
184 - <div class="item">  
185 - <div class="icon"><i class="fa fa-tags"></i>  
186 - </div>  
187 - <h4><span class="counter"><?php echo $brandCount; ?></span><br>  
188 -  
189 - ะ‘ั€ะตะฝะดะพะฒ</h4>  
190 - </div>  
191 - </div>  
192 - <div class="col-md-4 col-sm-6">  
193 - <div class="item">  
194 - <div class="icon"><i class="fa fa-copy"></i>  
195 - </div>  
196 - <h4><span class="counter">12</span> ... <span class="counter">36</span><br>  
197 -  
198 - ะœะตััั†ะตะฒ ะ“ะฐั€ะฐะฝั‚ะธั </h4>  
199 - </div>  
200 - </div>  
201 - </div>  
202 - <!-- /.row -->  
203 - </div>  
204 - <!-- /.container -->  
205 -</section>  
206 -<!-- /.bar -->  
207 -<?php  
208 - if (!empty($brands)) {  
209 - ?>  
210 - <section class="bar background-gray no-mb">  
211 - <div class="container">  
212 - <div class="row">  
213 - <div class="col-md-12">  
214 - <div class="heading text-center">  
215 - <h2><?php echo \Yii::t('app', 'ะ‘ั€ะตะฝะดั‹'); ?></h2>  
216 - </div>  
217 -  
218 - <ul class="owl-carousel customers brand-carousel">  
219 - <?php  
220 - foreach ($brands as $brand) {  
221 - echo Html::tag(  
222 - 'div',  
223 - Html::img(  
224 - ImageHelper::set($brand->image->getPath())  
225 - ->setWidth(150)  
226 - ->render(),  
227 - [  
228 - 'class' => 'img-responsive',  
229 - ]  
230 - ),  
231 - [  
232 - 'class' => 'item',  
233 - ]  
234 - );  
235 - }  
236 - ?>  
237 - </ul>  
238 - <!-- /.owl-carousel -->  
239 - </div>  
240 -  
241 - </div>  
242 - </div>  
243 - </section>  
244 - <?php  
245 - }  
246 -?>  
247 -<section class="bar background-white no-mb">  
248 - <div class="container">  
249 -  
250 - <div class="col-md-12">  
251 - <div class="heading text-center">  
252 - <h2>ะŸะพะปะตะทะฝั‹ะต ัั‚ะฐั‚ัŒะธ</h2>  
253 - </div>  
254 -  
255 - <p class="lead">ะ˜ะดะตะนะฝั‹ะต ัะพะพะฑั€ะฐะถะตะฝะธั ะฒั‹ััˆะตะณะพ ะฟะพั€ัะดะบะฐ, ะฐ ั‚ะฐะบะถะต ะฟะพัั‚ะพัะฝะฝะพะต ะธะฝั„ะพั€ะผะฐั†ะธะพะฝะฝะพ-ะฟั€ะพะฟะฐะณะฐะฝะดะธัั‚ัะบะพะต ะพะฑะตัะฟะตั‡ะตะฝะธะต ะฝะฐัˆะตะน ะดะตัั‚ะตะปัŒะฝะพัั‚ะธ ั‚ั€ะตะฑัƒัŽั‚ ะพั‚ ะฝะฐั ะฐะฝะฐะปะธะทะฐ ะฟะพะทะธั†ะธะน, ะทะฐะฝะธะผะฐะตะผั‹ั… ัƒั‡ะฐัั‚ะฝะธะบะฐะผะธ ะฒ ะพั‚ะฝะพัˆะตะฝะธะธ ะฟะพัั‚ะฐะฒะปะตะฝะฝั‹ั… ะทะฐะดะฐั‡. ะะต ัะปะตะดัƒะตั‚, ะพะดะฝะฐะบะพ ะทะฐะฑั‹ะฒะฐั‚ัŒ, ั‡ั‚ะพ ะบะพะฝััƒะปัŒั‚ะฐั†ะธั ั ัˆะธั€ะพะบะธะผ ะฐะบั‚ะธะฒะพะผ ะฒะปะตั‡ะตั‚ ะทะฐ ัะพะฑะพะน ะฟั€ะพั†ะตัั ะฒะฝะตะดั€ะตะฝะธั ะธ ะผะพะดะตั€ะฝะธะทะฐั†ะธะธ ะฟะพะทะธั†ะธะน, ะทะฐะฝะธะผะฐะตะผั‹ั… ัƒั‡ะฐัั‚ะฝะธะบะฐะผะธ ะฒ ะพั‚ะฝะพัˆะตะฝะธะธ ะฟะพัั‚ะฐะฒะปะตะฝะฝั‹ั… ะทะฐะดะฐั‡.  
256 - <a href="/blog/index">ะŸะพั‡ะธั‚ะฐะนั‚ะต ะฝะฐัˆ ะฑะปะพะณ!</a>  
257 - </p>  
258 -  
259 - <!-- *** BLOG HOMEPAGE ***  
260 -_________________________________________________________ -->  
261 -  
262 - <div class="row">  
263 -  
264 - <?php foreach ($articles as $article) { ?>  
265 - <div class="col-md-3 col-sm-6">  
266 - <div class="box-image-text blog">  
267 - <div class="top">  
268 - <div class="image">  
269 - <?= ImageHelper::set(  
270 - $article->image ? $article->image->getPath() : '@frontend/web/img/no-image.png'  
271 - )  
272 - ->cropResize(255, 192)  
273 - ->renderImage(  
274 - [  
275 - 'class' => 'img-responsive',  
276 - 'alt' => $article->lang->title,  
277 - ]  
278 - ) ?>  
279 - </div>  
280 - <div class="bg"></div>  
281 - <div class="text">  
282 - <p class="buttons">  
283 - <a href="<?= Url::to(  
284 - [  
285 - 'blog/article',  
286 - 'id' => $article->id,  
287 - ]  
288 - ) ?>" class="btn btn-template-transparent-primary"><i class="fa fa-link"></i> <?php echo \Yii::t(  
289 - 'app',  
290 - 'Read more'  
291 - ); ?></a>  
292 - </p>  
293 - </div>  
294 - </div>  
295 - <div class="content">  
296 - <h4><a href="<?= Url::to(  
297 - [  
298 - 'blog/article',  
299 - 'id' => $article->id,  
300 - ]  
301 - ) ?>"><?= $article->lang->title; ?></a></h4>  
302 - <?php if ( !empty($article->category) ) { ?>  
303 - <p class="author-category"><a href="<?= Url::to(  
304 - [  
305 - 'blog/category',  
306 - 'id' => $article->category->id,  
307 - ]  
308 - ) ?>"><?= $article->category->lang->title ?></a>  
309 - <?php } ?>  
310 - </p>  
311 - <p class="intro"><?= $article->lang->body_preview; ?></p>  
312 - <p class="read-more">  
313 - <a href="<?= Url::to(  
314 - [  
315 - 'blog/article',  
316 - 'id' => $article->id,  
317 - ]  
318 - ) ?>" class="btn btn-template-main"><?php echo \Yii::t('app', 'Continue reading'); ?></a>  
319 - </p>  
320 - </div>  
321 - </div>  
322 - <!-- /.box-image-text -->  
323 - </div>  
324 - <?php } ?>  
325 -  
326 - </div>  
327 - <!-- /.row -->  
328 -  
329 - <!-- *** BLOG HOMEPAGE END *** -->  
330 -  
331 - </div>  
332 -  
333 - </div>  
334 - <!-- /.container -->  
335 -</section>  
336 -<!-- /.bar -->  
337 -  
338 -  
339 -<section class="bar background-white no-mb">  
340 - <div class="container">  
341 - <div class="col-md-12">  
342 - <?php echo $seo->text; ?>  
343 - </div>  
344 - </div>  
345 -</section>  
346 -======= 1 +
347 <?php 2 <?php
348 use artbox\catalog\models\Brand; 3 use artbox\catalog\models\Brand;
349 use artbox\catalog\models\Category; 4 use artbox\catalog\models\Category;
@@ -688,4 +343,3 @@ _________________________________________________________ --&gt; @@ -688,4 +343,3 @@ _________________________________________________________ --&gt;
688 </div> 343 </div>
689 </div> 344 </div>
690 </section> 345 </section>
691 ->>>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f