From 6e516b406848beda8a6e2bdc50a4b9e7cd928785 Mon Sep 17 00:00:00 2001 From: yarik Date: Thu, 30 Mar 2017 19:12:42 +0300 Subject: [PATCH] Layout complete --- backend/config/main.php | 20 -------------------- backend/views/settings/_contact_tab.php | 2 ++ common/config/main.php | 30 +++++++++++++++++++++++++----- common/config/settings.php | 48 ++++++++++++++++++++++++------------------------ frontend/controllers/PageController.php | 9 ++++++++- frontend/views/layouts/main.php | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- frontend/views/page/view.php | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------- frontend/web/css/custom.css | 13 +++++++++---- frontend/web/img/no-image.png | Bin 0 -> 748 bytes 9 files changed, 248 insertions(+), 187 deletions(-) create mode 100644 frontend/web/img/no-image.png diff --git a/backend/config/main.php b/backend/config/main.php index 31570fc..659ff71 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -24,19 +24,6 @@ 'feedback' => 'artbox\core\controllers\FeedbackController', 'weblog-article' => 'artbox\weblog\controllers\ArticleController', ], - 'modules' => [ - 'imagemanager' => [ - 'class' => 'noam148\imagemanager\Module', - 'canUploadImage' => true, - 'canRemoveImage' => function () { - return true; - }, - 'setBlameableBehavior' => false, - 'cssFiles' => [ - 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', - ], - ], - ], 'components' => [ 'assetManager' => [ 'bundles' => [ @@ -53,13 +40,6 @@ ], 'appendTimestamp' => true, ], - 'imagemanager' => [ - 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', - 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', - 'cachePath' => 'assets/images', - 'useFilename' => true, - 'absoluteUrl' => false, - ], 'request' => [ 'csrfParam' => '_csrf-backend', 'baseUrl' => '/admin', diff --git a/backend/views/settings/_contact_tab.php b/backend/views/settings/_contact_tab.php index e81acbe..d20c83b 100644 --- a/backend/views/settings/_contact_tab.php +++ b/backend/views/settings/_contact_tab.php @@ -27,6 +27,8 @@ ->textInput(); echo $form->field($model, 'city') ->textInput(); + echo $form->field($model, 'country') + ->textInput(); echo $form->field($model, 'lat') ->textInput(); echo $form->field($model, 'lon') diff --git a/common/config/main.php b/common/config/main.php index c27e905..2f2a09a 100644 --- a/common/config/main.php +++ b/common/config/main.php @@ -3,11 +3,24 @@ return [ 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', + 'modules' => [ + 'imagemanager' => [ + 'class' => 'noam148\imagemanager\Module', + 'canUploadImage' => true, + 'canRemoveImage' => function () { + return true; + }, + 'setBlameableBehavior' => false, + 'cssFiles' => [ + 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', + ], + ], + ], 'components' => [ - 'cache' => [ + 'cache' => [ 'class' => 'yii\caching\FileCache', ], - 'i18n' => [ + 'i18n' => [ 'translations' => [ 'core' => [ 'class' => 'yii\i18n\PhpMessageSource', @@ -15,17 +28,24 @@ ], ], ], - 'filedb' => [ + 'filedb' => [ 'class' => 'yii2tech\filedb\Connection', 'path' => '@common/config', ], - 'sitemapdb' => [ + 'sitemapdb' => [ 'class' => 'yii2tech\filedb\Connection', 'path' => '@common/config', 'primaryKeyName' => 'id', ], - 'seo' => [ + 'seo' => [ 'class' => SeoComponent::className(), ], + 'imagemanager' => [ + 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', + 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', + 'cachePath' => 'assets/images', + 'useFilename' => true, + 'absoluteUrl' => false, + ], ], ]; diff --git a/common/config/settings.php b/common/config/settings.php index 20feb28..44d5cbf 100755 --- a/common/config/settings.php +++ b/common/config/settings.php @@ -2,32 +2,32 @@ return [ 1 => [ - 'phone' => '+38 (044) 593-73-76', - 'phone2' => '+38 (098) 468-07-64', - 'skype' => 'artwebstudio', - 'email' => 'artweb.ua@gmail.com', - 'house' => '1-М', - 'street' => 'пр. М. Бажана', - 'office' => '25', - 'city' => 'Киев', - 'country' => '', - 'lat' => '50.409382', - 'lon' => '30.646391', - 'facebook' => 'https://www.facebook.com/ArtWeb.ua/', - 'vk' => 'https://vk.com/artwebua', - 'ok' => 'https://ok.ru/artwebua', - 'google' => 'https://plus.google.com/+ArtwebUaAgency', - 'twitter' => 'https://twitter.com/ArtWeb_ua', - 'name' => 'Artweb', - 'logo' => '2', - 'about' => 'Строим бизнес в онлайне', + 'phone' => '+38 (044) 593-73-76', + 'phone2' => '+38 (098) 468-07-64', + 'skype' => 'artwebstudio', + 'email' => 'artweb.ua@gmail.com', + 'house' => '1-М', + 'street' => 'пр. М. Бажана', + 'office' => '25', + 'city' => 'Киев', + 'country' => 'Украина', + 'lat' => '50.403696', + 'lon' => '30.641481', + 'facebook' => 'https://www.facebook.com/ArtWeb.ua/', + 'vk' => 'https://vk.com/artwebua', + 'ok' => 'https://ok.ru/artwebua', + 'google' => 'https://plus.google.com/+ArtwebUaAgency', + 'twitter' => 'https://twitter.com/ArtWeb_ua', + 'name' => 'Artweb', + 'logo' => '2', + 'about' => 'Строим бизнес в онлайне', 'analytics_key' => '119240817', - 'robots' => 'User-agent: Google + 'robots' => 'User-agent: Google Disallow: ', - 'ga_code' => '796967', - 'ya_code' => '08908908', - 'tag_manager' => '', - 'id' => 1, + 'ga_code' => '796967', + 'ya_code' => '08908908', + 'tag_manager' => '', + 'id' => 1, ], ]; \ No newline at end of file diff --git a/frontend/controllers/PageController.php b/frontend/controllers/PageController.php index 4491466..b6614a5 100644 --- a/frontend/controllers/PageController.php +++ b/frontend/controllers/PageController.php @@ -29,6 +29,13 @@ $pages = Page::find() ->with('lang') + ->where( + [ + 'not', + [ 'id' => $id ], + ] + ) + ->limit(5) ->all(); return $this->render( @@ -54,7 +61,7 @@ ->with('lang') ->one(); - if (!empty($model)) { + if (!empty( $model )) { if ($model->lang->alias_id !== Yii::$app->seo->aliasId) { throw new NotFoundHttpException('Wrong language'); } diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 9e787d9..87418f6 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -5,15 +5,19 @@ * @var SeoComponent $seo * @var User $user */ - use artbox\core\components\SeoComponent; + use artbox\core\helpers\ImageHelper; use artbox\core\models\Feedback; + use artbox\core\models\Page; use artbox\core\models\User; use common\models\Settings; use frontend\assets\AppAsset; + use noam148\imagemanager\models\ImageManager; use yii\bootstrap\ActiveForm; use yii\bootstrap\Nav; use yii\bootstrap\Html; + use yii\helpers\Json; + use yii\helpers\Url; use yii\web\View; use yii\widgets\Breadcrumbs; @@ -22,6 +26,25 @@ $seo = Yii::$app->get('seo'); $feedback = new Feedback(); $settings = Settings::getInstance(); + $controller = Yii::$app->controller; + $default_controller = Yii::$app->defaultRoute; + $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') + ->all(); + $logo = null; + if ($settings->logo) { + $logo = ImageManager::findOne($settings->logo); + if ($logo) { + $logo = $logo->getImagePathPrivate(); + } else { + \Yii::getAlias('@frontend/web/img/no-image.png'); + } + } ?> beginPage() ?> @@ -198,10 +221,17 @@
- - - - Universal logoUniversal - go to homepage + + + setHeight(42) + ->renderImage( + [ + 'alt' => $settings->name, + ] + ) + ?>