Yarik / artbox-shop

Commit cd5c4aa479bc4dd06fb0f88d6310f311bb93f1c3

Authored by Yarik
2 parents d7374030 e66561dc

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	common/config/bootstrap.php
Showing 6 changed files with 31 additions and 5 deletions   Show diff stats
Inline Side-by-side
backend/config/main.php
  Show/Hide comments   View file @cd5c4aa
@@ -31,11 +31,12 @@ @@ -31,11 +31,12 @@
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', 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',
39 ], 40 ],
40 'components' => [ 41 'components' => [
41 'assetManager' => [ 42 'assetManager' => [
backend/views/layouts/menu_items.php
  Show/Hide comments   View file @cd5c4aa
@@ -126,5 +126,17 @@ @@ -126,5 +126,17 @@
126 ], 126 ],
127 ], 127 ],
128 ], 128 ],
  129 + [
  130 + 'label' => \Yii::t('app', 'Blog'),
  131 + 'url' => '#',
  132 + 'icon' => 'pencil-square',
  133 + 'items' => [
  134 + [
  135 + 'label' => \Yii::t('catalog', 'Articles'),
  136 + 'url' => [ 'blog-article/index' ],
  137 + 'icon' => 'file-text',
  138 + ],
  139 + ],
  140 + ],
129 ] 141 ]
130 ); 142 );
131 \ No newline at end of file 143 \ No newline at end of file
common/config/bootstrap.php
  Show/Hide comments   View file @cd5c4aa
@@ -12,4 +12,7 @@ @@ -12,4 +12,7 @@
12 } 12 }
13 if (!Yii::getAlias('@artbox/order', false)) { 13 if (!Yii::getAlias('@artbox/order', false)) {
14 Yii::setAlias('@artbox/order', dirname(dirname(__DIR__)) . '/artweb/artbox-order'); 14 Yii::setAlias('@artbox/order', dirname(dirname(__DIR__)) . '/artweb/artbox-order');
  15 + }
  16 + if (!Yii::getAlias('@artbox/weblog', false)) {
  17 + Yii::setAlias('@artbox/weblog', dirname(dirname(__DIR__)) . '/artweb/artbox-weblog');
15 } 18 }
16 \ No newline at end of file 19 \ No newline at end of file
common/config/main.php
  Show/Hide comments   View file @cd5c4aa
@@ -35,6 +35,10 @@ @@ -35,6 +35,10 @@
35 'class' => 'yii\i18n\PhpMessageSource', 35 'class' => 'yii\i18n\PhpMessageSource',
36 'basePath' => '@common/messages', 36 'basePath' => '@common/messages',
37 ], 37 ],
  38 + 'blog' => [
  39 + 'class' => 'yii\i18n\PhpMessageSource',
  40 + 'basePath' => '@artbox/weblog/messages',
  41 + ],
38 ], 42 ],
39 ], 43 ],
40 'filedb' => [ 44 'filedb' => [
frontend/views/layouts/main.php
  Show/Hide comments   View file @cd5c4aa
@@ -240,6 +240,7 @@ _________________________________________________________ --> @@ -240,6 +240,7 @@ _________________________________________________________ -->
240 <!--/.nav-collapse --> 240 <!--/.nav-collapse -->
241 241
242 <div class="cart-item" id="cart"> 242 <div class="cart-item" id="cart">
  243 + <span class="badge">0</span>
243 <?php 244 <?php
244 echo Html::a( 245 echo Html::a(
245 Html::tag( 246 Html::tag(
frontend/web/css/style.css
  Show/Hide comments   View file @cd5c4aa
@@ -4538,4 +4538,9 @@ a.list-group-item.active &gt; .badge, @@ -4538,4 +4538,9 @@ a.list-group-item.active &gt; .badge,
4538 padding-right: 20px; 4538 padding-right: 20px;
4539 outline: none; 4539 outline: none;
4540 margin-bottom: 20px; 4540 margin-bottom: 20px;
  4541 +}
  4542 +#cart .badge{
  4543 + position: absolute;
  4544 + top: 2px;
  4545 + right: 4px;
4541 } 4546 }
4542 \ No newline at end of file 4547 \ No newline at end of file