Commit 2e649e4bdb906d690ba844bcfe754feb0078218a

Authored by Yarik
2 parents 4bf9edb7 4373f216

Merge remote-tracking branch 'origin/master'

backend/config/main.php
@@ -31,12 +31,14 @@ @@ -31,12 +31,14 @@
31 'variant-option-group-exclusion' => 'artbox\catalog\controllers\VariantOptionGroupExclController', 31 'variant-option-group-exclusion' => 'artbox\catalog\controllers\VariantOptionGroupExclController',
32 'product-option-group-complementary' => 'artbox\catalog\controllers\ProductOptionGroupComplController', 32 'product-option-group-complementary' => 'artbox\catalog\controllers\ProductOptionGroupComplController',
33 'product-option-group-exclusion' => 'artbox\catalog\controllers\ProductOptionGroupExclController', 33 'product-option-group-exclusion' => 'artbox\catalog\controllers\ProductOptionGroupExclController',
34 - 'variant-option-complementary' => 'artbox\catalog\controllers\VariantOptionComplController',  
35 - 'variant-option-exclusion' => 'artbox\catalog\controllers\VariantOptionExclController',  
36 - 'product-option-complementary' => 'artbox\catalog\controllers\ProductOptionComplController',  
37 - 'product-option-exclusion' => 'artbox\catalog\controllers\ProductOptionExclController',  
38 - 'import' => 'artbox\catalog\controllers\ImportController',  
39 - 'blog-article' => 'artbox\weblog\controllers\ArticleController', 34 + 'variant-option-complementary' => 'artbox\catalog\controllers\VariantOptionComplController',
  35 + 'variant-option-exclusion' => 'artbox\catalog\controllers\VariantOptionExclController',
  36 + 'product-option-complementary' => 'artbox\catalog\controllers\ProductOptionComplController',
  37 + 'product-option-exclusion' => 'artbox\catalog\controllers\ProductOptionExclController',
  38 + 'import' => 'artbox\catalog\controllers\ImportController',
  39 + 'blog-article' => 'artbox\weblog\controllers\ArticleController',
  40 + 'blog-category' => 'artbox\weblog\controllers\CategoryController',
  41 + 'blog-tag' => 'artbox\weblog\controllers\TagController',
40 ], 42 ],
41 'components' => [ 43 'components' => [
42 'assetManager' => [ 44 'assetManager' => [
backend/views/layouts/menu_items.php
@@ -136,6 +136,16 @@ @@ -136,6 +136,16 @@
136 'url' => [ 'blog-article/index' ], 136 'url' => [ 'blog-article/index' ],
137 'icon' => 'file-text', 137 'icon' => 'file-text',
138 ], 138 ],
  139 + [
  140 + 'label' => \Yii::t('catalog', 'Categories'),
  141 + 'url' => [ 'blog-category/index' ],
  142 + 'icon' => 'file-text',
  143 + ],
  144 + [
  145 + 'label' => \Yii::t('catalog', 'Tags'),
  146 + 'url' => [ 'blog-tag/index' ],
  147 + 'icon' => 'file-text',
  148 + ],
139 ], 149 ],
140 ], 150 ],
141 ] 151 ]