From c7b6386ecb9be63ece8b40a6360c30724c88f5a8 Mon Sep 17 00:00:00 2001 From: Alex Savenko Date: Wed, 20 Sep 2017 17:11:55 +0300 Subject: [PATCH] conflict --- frontend/assets/AppAsset.php | 46 +--------------------------------------------- frontend/views/layouts/main.php | 671 +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/site/.index.php.swp | Bin 0 -> 16384 bytes frontend/views/site/index.php | 348 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 4 files changed, 3 insertions(+), 1062 deletions(-) create mode 100644 frontend/views/site/.index.php.swp diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index b1dd27c..dd7700b 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -1,48 +1,4 @@ -<<<<<<< HEAD ->>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f + \ No newline at end of file diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 755763f..cc4d7fd 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -1,672 +1,4 @@ -<<<<<<< HEAD -user->identity; - $seo = Yii::$app->get('seo'); - $feedback = new Feedback(); - $settings = Settings::getInstance(); - $controller = Yii::$app->controller; - $default_controller = Yii::$app->defaultRoute; - /** - * @var LoginForm $loginForm - */ - $loginForm = \Yii::createObject( - [ - 'class' => LoginForm::className(), - 'returnUrl' => \Yii::$app->request->absoluteUrl, - ] - ); - /** - * @var Newsletter $newsletter - */ - $newsletter = \Yii::createObject( - [ - 'class' => Newsletter::className(), - ] - ); - $isHome = ( ( $controller->id === $default_controller ) && ( $controller->action->id === $controller->defaultAction ) ) ? true : false; - /** - * @var Page[] $pages - */ - $pages = Page::find() - ->where([ 'in_menu' => true ]) - ->with('lang.alias') - ->orderBy( - [ - 'sort' => SORT_ASC, - 'id' => SORT_ASC, - ] - ) - ->all(); - $logo = null; - if ($settings->logo) { - $logo_img = Image::findOne($settings->logo); - if ($logo_img) { - $logo = $logo_img->getUrl() ?? $logo; - } - } - - $this->registerMetaTag( - [ - 'name' => 'description', - 'content' => $seo->desc, - ] - ) -?> - -beginPage() ?> - - - - - - - - <?= Html::encode($seo->title) ?> - head() ?> - - - beginBody() ?> - - - -
-
- - - - - - - - -
- - - -
- -
- - - user->isGuest) { - ?> - - - - - - - - session->getFlash('success')) { - ?> - - registerJs("$('#success-modal').modal('show');"); - } - ?> - - - - - - Feedback::SCENARIO_CALLBACK, - 'returnUrl' => Url::current([], true), - ] - ); - ?> - - - - - - - - -
-
- isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], - 'homeLink' => [ - 'label' => \Yii::t('app', 'Home'), - 'url' => [ '/site/index' ], - ], - ] - ) ?> -
-
- - - - - - - -
-
-
-

О нас

- -

about ?>

- - - -
- - -
- -

Разделы

- -
- - -
-
-
lang->title, - [ - 'page/view', - 'id' => $page->id, - ] - ) ?>
-
-
- - -
-
- -
- - - - -
- -
- - - -
- -
- -

Социальные сети

- -

- facebook)) { ?> - - vk)) { ?> -vk ?> -google)) { ?> - - twitter)) { ?> - - ok)) { ?> -ok ?> - -

- -
- -
- -

Контактная информация

- -

email ?> -
city . ',' ?> -
street . ', ' . $settings->house ?> -
- country ?> -

- 'btn btn-small btn-template-main', - ] - ); - ?> - - - -
- -
- -
- - - - - -
- - endBody() ?> - - -======= + endBody() ?> ->>>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f endPage() ?> \ No newline at end of file diff --git a/frontend/views/site/.index.php.swp b/frontend/views/site/.index.php.swp new file mode 100644 index 0000000..4857aa3 Binary files /dev/null and b/frontend/views/site/.index.php.swp differ diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index f7cd474..5261be4 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -1,349 +1,4 @@ -<<<<<<< HEAD -title = 'My Yii Application'; - $seo = Yii::$app->get('seo'); -?> -
- -
- -
-
- - render( - '@frontend/views/layouts/_category_menu', - [ - 'isHome' => true, - ] - ); - ?> -
- -
-
- -
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
- - -
-
- - -
-
- -
-
-
-
-
-
-
-


- - Позиций товаров

-
-
-
-
-
-
-


- - Брендов

-
-
-
-
-
-
-

12 ... 36
- - Месяцев Гарантия

-
-
-
- -
- -
- - -
-
-
-
-
-

-
- -
    - image->getPath()) - ->setWidth(150) - ->render(), - [ - 'class' => 'img-responsive', - ] - ), - [ - 'class' => 'item', - ] - ); - } - ?> -
- -
- -
-
-
- -
-
- -
-
-

Полезные статьи

-
- -

Идейные соображения высшего порядка, а также постоянное информационно-пропагандистское обеспечение нашей деятельности требуют от нас анализа позиций, занимаемых участниками в отношении поставленных задач. Не следует, однако забывать, что консультация с широким активом влечет за собой процесс внедрения и модернизации позиций, занимаемых участниками в отношении поставленных задач. - Почитайте наш блог! -

- - - -
- - -
-
-
-
- image ? $article->image->getPath() : '@frontend/web/img/no-image.png' - ) - ->cropResize(255, 192) - ->renderImage( - [ - 'class' => 'img-responsive', - 'alt' => $article->lang->title, - ] - ) ?> -
-
-
-

- -

-
-
-
-

lang->title; ?>

- category) ) { ?> -

category->lang->title ?> - -

-

lang->body_preview; ?>

-

- -

-
-
- -
- - -
- - - - -
- -
- -
- - - -
-
-
- text; ?> -
-
-
-======= + ->>>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f -- libgit2 0.21.4