From 1ceb333844d97ca7df5651ac1270f93d372b08c8 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 7 Sep 2017 12:47:31 +0300 Subject: [PATCH] -Added gallery --- backend/config/main.php | 3 +++ backend/views/layouts/menu_items.php | 2 +- backend/views/settings/_social_tab.php | 8 ++++---- common/config/.gitignore | 4 +++- common/config/SitemapDynamic.php | 5 ----- common/config/SitemapStatic.php | 5 ----- common/config/mail.php | 10 ---------- common/config/main.php | 4 ++-- common/config/settings.php | 33 --------------------------------- environments/dev/common/config/filedb/mail.php | 10 ++++++++++ environments/dev/common/config/filedb/settings.php | 33 +++++++++++++++++++++++++++++++++ environments/index.php | 4 ++++ environments/prod/common/config/filedb/mail.php | 10 ++++++++++ environments/prod/common/config/filedb/settings.php | 33 +++++++++++++++++++++++++++++++++ frontend/views/layouts/main.php | 2 ++ frontend/web/.gitignore | 1 + frontend/web/sitemap.xml | 1 - 17 files changed, 106 insertions(+), 62 deletions(-) delete mode 100755 common/config/SitemapDynamic.php delete mode 100755 common/config/SitemapStatic.php delete mode 100755 common/config/mail.php delete mode 100755 common/config/settings.php create mode 100755 environments/dev/common/config/filedb/mail.php create mode 100755 environments/dev/common/config/filedb/settings.php create mode 100755 environments/prod/common/config/filedb/mail.php create mode 100755 environments/prod/common/config/filedb/settings.php delete mode 100755 frontend/web/sitemap.xml diff --git a/backend/config/main.php b/backend/config/main.php index 34090c5..dad1624 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -81,6 +81,9 @@ 'baseUrl' => '/', 'enablePrettyUrl' => true, 'showScriptName' => false, + 'processRoutes' => [ + 'page/view', + ], 'rules' => [], ], 'sitemap' => [ diff --git a/backend/views/layouts/menu_items.php b/backend/views/layouts/menu_items.php index 6850801..38a8bb5 100755 --- a/backend/views/layouts/menu_items.php +++ b/backend/views/layouts/menu_items.php @@ -49,7 +49,7 @@ [ 'label' => \Yii::t('core', 'SEO'), 'url' => '#', - 'icon' => 'bolt', + 'icon' => 'leaf', 'items' => [ [ 'label' => \Yii::t('core', 'Seo pages'), diff --git a/backend/views/settings/_social_tab.php b/backend/views/settings/_social_tab.php index 80c161c..1228813 100755 --- a/backend/views/settings/_social_tab.php +++ b/backend/views/settings/_social_tab.php @@ -10,11 +10,11 @@ */ echo $form->field($model, 'facebook') ->textInput(); - echo $form->field($model, 'vk') - ->textInput(); +// echo $form->field($model, 'vk') +// ->textInput(); echo $form->field($model, 'google') ->textInput(); echo $form->field($model, 'twitter') ->textInput(); - echo $form->field($model, 'ok') - ->textInput(); \ No newline at end of file +// echo $form->field($model, 'ok') +// ->textInput(); \ No newline at end of file diff --git a/common/config/.gitignore b/common/config/.gitignore index 7f8b552..24e20fa 100755 --- a/common/config/.gitignore +++ b/common/config/.gitignore @@ -3,4 +3,6 @@ db* params-local.php test-local.php settings.php -mail.php \ No newline at end of file +mail.php +SitemapDynamic.php +SitemapStatic.php \ No newline at end of file diff --git a/common/config/SitemapDynamic.php b/common/config/SitemapDynamic.php deleted file mode 100755 index f02fbed..0000000 --- a/common/config/SitemapDynamic.php +++ /dev/null @@ -1,5 +0,0 @@ - [ - 'host' => 'smtp.gmail.com', - 'user' => '', - 'pass' => '', - 'id' => 1, - ], -]; \ No newline at end of file diff --git a/common/config/main.php b/common/config/main.php index 2b684d8..e965513 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -1,7 +1,7 @@ dirname(dirname(__DIR__)) . '/vendor', @@ -36,7 +36,7 @@ ], 'filedb' => [ 'class' => 'yii2tech\filedb\Connection', - 'path' => '@common/config', + 'path' => '@common/config/filedb', ], 'sitemapdb' => [ 'class' => 'yii2tech\filedb\Connection', diff --git a/common/config/settings.php b/common/config/settings.php deleted file mode 100755 index dd16ed8..0000000 --- a/common/config/settings.php +++ /dev/null @@ -1,33 +0,0 @@ - [ - 'phone' => '+38 (044) 593-73-76', - 'phone2' => '+38 (098) 468-07-64', - 'skype' => 'artwebstudio', - 'email' => 'kennen.md@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' => null, - 'about' => 'Строим бизнес в онлайне', - 'analytics_key' => '119240817', - 'robots' => 'User-agent: Google -Disallow: -', - 'ga_code' => '796967', - 'ya_code' => '08908908', - 'tag_manager' => '', - 'id' => 1, - ], -]; \ No newline at end of file diff --git a/environments/dev/common/config/filedb/mail.php b/environments/dev/common/config/filedb/mail.php new file mode 100755 index 0000000..d277e2e --- /dev/null +++ b/environments/dev/common/config/filedb/mail.php @@ -0,0 +1,10 @@ + [ + 'host' => 'smtp.gmail.com', + 'user' => '', + 'pass' => '', + 'id' => 1, + ], +]; \ No newline at end of file diff --git a/environments/dev/common/config/filedb/settings.php b/environments/dev/common/config/filedb/settings.php new file mode 100755 index 0000000..c0e910d --- /dev/null +++ b/environments/dev/common/config/filedb/settings.php @@ -0,0 +1,33 @@ + [ + 'phone' => '', + 'phone2' => '', + 'skype' => '', + 'email' => '', + 'house' => '', + 'street' => '', + 'office' => '', + 'city' => '', + 'country' => '', + 'lat' => '', + 'lon' => '', + 'facebook' => '', + 'vk' => '', + 'ok' => '', + 'google' => '', + 'twitter' => '', + 'name' => '', + 'logo' => null, + 'about' => '', + 'analytics_key' => '', + 'robots' => 'User-agent: Google +Disallow: +', + 'ga_code' => '', + 'ya_code' => '', + 'tag_manager' => '', + 'id' => 1, + ], +]; \ No newline at end of file diff --git a/environments/index.php b/environments/index.php index 0070519..3a85a5c 100755 --- a/environments/index.php +++ b/environments/index.php @@ -36,6 +36,8 @@ return [ 'backend/web/assets', 'frontend/runtime', 'frontend/web/assets', + 'common/config/filedb', + 'storage', ], 'setExecutable' => [ 'yii', @@ -54,6 +56,8 @@ return [ 'backend/web/assets', 'frontend/runtime', 'frontend/web/assets', + 'common/config/filedb', + 'storage', ], 'setExecutable' => [ 'yii', diff --git a/environments/prod/common/config/filedb/mail.php b/environments/prod/common/config/filedb/mail.php new file mode 100755 index 0000000..d277e2e --- /dev/null +++ b/environments/prod/common/config/filedb/mail.php @@ -0,0 +1,10 @@ + [ + 'host' => 'smtp.gmail.com', + 'user' => '', + 'pass' => '', + 'id' => 1, + ], +]; \ No newline at end of file diff --git a/environments/prod/common/config/filedb/settings.php b/environments/prod/common/config/filedb/settings.php new file mode 100755 index 0000000..c0e910d --- /dev/null +++ b/environments/prod/common/config/filedb/settings.php @@ -0,0 +1,33 @@ + [ + 'phone' => '', + 'phone2' => '', + 'skype' => '', + 'email' => '', + 'house' => '', + 'street' => '', + 'office' => '', + 'city' => '', + 'country' => '', + 'lat' => '', + 'lon' => '', + 'facebook' => '', + 'vk' => '', + 'ok' => '', + 'google' => '', + 'twitter' => '', + 'name' => '', + 'logo' => null, + 'about' => '', + 'analytics_key' => '', + 'robots' => 'User-agent: Google +Disallow: +', + 'ga_code' => '', + 'ya_code' => '', + 'tag_manager' => '', + 'id' => 1, + ], +]; \ No newline at end of file diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index de2915f..8424d2b 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -77,6 +77,7 @@ beginBody() ?> + ga_code)) { ?> +