Commit f7f3dca8e3557528a695586f82a9640cfa8c7ed4
Merge remote-tracking branch 'origin/master'
Showing
4 changed files
with
22 additions
and
2 deletions
Show diff stats
backend/config/main.php
| @@ -23,6 +23,7 @@ | @@ -23,6 +23,7 @@ | ||
| 23 | 'seo' => 'artbox\core\controllers\SeoController', | 23 | 'seo' => 'artbox\core\controllers\SeoController', |
| 24 | 'feedback' => 'artbox\core\controllers\FeedbackController', | 24 | 'feedback' => 'artbox\core\controllers\FeedbackController', |
| 25 | 'weblog-article' => 'artbox\weblog\controllers\ArticleController', | 25 | 'weblog-article' => 'artbox\weblog\controllers\ArticleController', |
| 26 | + 'category' => 'artbox\catalog\controllers\CategoryController', | ||
| 26 | ], | 27 | ], |
| 27 | 'components' => [ | 28 | 'components' => [ |
| 28 | 'assetManager' => [ | 29 | 'assetManager' => [ |
backend/views/layouts/main.php
| @@ -177,6 +177,18 @@ | @@ -177,6 +177,18 @@ | ||
| 177 | ], | 177 | ], |
| 178 | ], | 178 | ], |
| 179 | ], | 179 | ], |
| 180 | + [ | ||
| 181 | + 'label' => \Yii::t('app', 'SEO'), | ||
| 182 | + 'url' => '#', | ||
| 183 | + 'icon' => 'bolt', | ||
| 184 | + 'items' => [ | ||
| 185 | + [ | ||
| 186 | + 'label' => \Yii::t('core', 'Category'), | ||
| 187 | + 'url' => [ 'category/index' ], | ||
| 188 | + 'icon' => 'file-text', | ||
| 189 | + ], | ||
| 190 | + ], | ||
| 191 | + ], | ||
| 180 | ] | 192 | ] |
| 181 | ); | 193 | ); |
| 182 | echo Menu::widget( | 194 | echo Menu::widget( |
common/config/bootstrap.php
| @@ -6,4 +6,7 @@ | @@ -6,4 +6,7 @@ | ||
| 6 | Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage'); | 6 | Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage'); |
| 7 | if (!Yii::getAlias('@artbox/core', false)) { | 7 | if (!Yii::getAlias('@artbox/core', false)) { |
| 8 | Yii::setAlias('@artbox/core', dirname(dirname(__DIR__)) . '/artweb/artbox-core'); | 8 | Yii::setAlias('@artbox/core', dirname(dirname(__DIR__)) . '/artweb/artbox-core'); |
| 9 | + } | ||
| 10 | + if (!Yii::getAlias('@artbox/catalog', false)) { | ||
| 11 | + Yii::setAlias('@artbox/catalog', dirname(dirname(__DIR__)) . '/artweb/artbox-catalog'); | ||
| 9 | } | 12 | } |
| 10 | \ No newline at end of file | 13 | \ No newline at end of file |
common/config/main.php
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | ], | 22 | ], |
| 23 | 'i18n' => [ | 23 | 'i18n' => [ |
| 24 | 'translations' => [ | 24 | 'translations' => [ |
| 25 | - 'core' => [ | 25 | + 'core' => [ |
| 26 | 'class' => 'yii\i18n\PhpMessageSource', | 26 | 'class' => 'yii\i18n\PhpMessageSource', |
| 27 | 'basePath' => '@artbox/catalog/messages', | 27 | 'basePath' => '@artbox/catalog/messages', |
| 28 | ], | 28 | ], |
| @@ -30,7 +30,11 @@ | @@ -30,7 +30,11 @@ | ||
| 30 | 'class' => 'yii\i18n\PhpMessageSource', | 30 | 'class' => 'yii\i18n\PhpMessageSource', |
| 31 | 'basePath' => '@artbox/catalog/messages', | 31 | 'basePath' => '@artbox/catalog/messages', |
| 32 | ], | 32 | ], |
| 33 | - 'app' => [ | 33 | + 'catalog' => [ |
| 34 | + 'class' => 'yii\i18n\PhpMessageSource', | ||
| 35 | + 'basePath' => '@artbox/catalog/messages', | ||
| 36 | + ], | ||
| 37 | + 'app' => [ | ||
| 34 | 'class' => 'yii\i18n\PhpMessageSource', | 38 | 'class' => 'yii\i18n\PhpMessageSource', |
| 35 | 'basePath' => '@common/messages', | 39 | 'basePath' => '@common/messages', |
| 36 | ], | 40 | ], |