Commit d737403096717d1f521165d8730aaea43dcd8b67
1 parent
9838b24c
Basket
Showing
32 changed files
with
7 additions
and
15 deletions
Show diff stats
backend/views/layouts/main.php
| @@ -137,7 +137,7 @@ | @@ -137,7 +137,7 @@ | ||
| 137 | 137 | ||
| 138 | <ul class="nav navbar-nav navbar-right"> | 138 | <ul class="nav navbar-nav navbar-right"> |
| 139 | <li class=""> | 139 | <li class=""> |
| 140 | - <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> | 140 | + <a href="" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> |
| 141 | <?php | 141 | <?php |
| 142 | echo Html::img( | 142 | echo Html::img( |
| 143 | ( empty( $avatar ) ? 'http://placehold.it/128x128' : $avatar ) | 143 | ( empty( $avatar ) ? 'http://placehold.it/128x128' : $avatar ) |
common/config/bootstrap.php
| @@ -9,4 +9,7 @@ | @@ -9,4 +9,7 @@ | ||
| 9 | } | 9 | } |
| 10 | if (!Yii::getAlias('@artbox/catalog', false)) { | 10 | if (!Yii::getAlias('@artbox/catalog', false)) { |
| 11 | Yii::setAlias('@artbox/catalog', dirname(dirname(__DIR__)) . '/artweb/artbox-catalog'); | 11 | Yii::setAlias('@artbox/catalog', dirname(dirname(__DIR__)) . '/artweb/artbox-catalog'); |
| 12 | + } | ||
| 13 | + if (!Yii::getAlias('@artbox/order', false)) { | ||
| 14 | + Yii::setAlias('@artbox/order', dirname(dirname(__DIR__)) . '/artweb/artbox-order'); | ||
| 12 | } | 15 | } |
| 13 | \ No newline at end of file | 16 | \ No newline at end of file |
frontend/assets/AppAsset.php
| @@ -12,41 +12,28 @@ | @@ -12,41 +12,28 @@ | ||
| 12 | public $basePath = '@webroot'; | 12 | public $basePath = '@webroot'; |
| 13 | public $baseUrl = '@web'; | 13 | public $baseUrl = '@web'; |
| 14 | public $css = [ | 14 | public $css = [ |
| 15 | - // 'css/site.css', // - | ||
| 16 | 'css/animate.css', | 15 | 'css/animate.css', |
| 17 | - // + | ||
| 18 | 'css/style.css', | 16 | 'css/style.css', |
| 19 | - // + | ||
| 20 | // 'css/style.default.css', // - | 17 | // 'css/style.default.css', // - |
| 21 | 'css/owl.carousel.css', | 18 | 'css/owl.carousel.css', |
| 22 | - // + | ||
| 23 | 'css/owl.theme.css', | 19 | 'css/owl.theme.css', |
| 24 | - // + | ||
| 25 | '//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,500,700,800', | 20 | '//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,500,700,800', |
| 26 | - // + | ||
| 27 | 'css/custom.css', | 21 | 'css/custom.css', |
| 28 | - // + | ||
| 29 | ]; | 22 | ]; |
| 30 | public $js = [ | 23 | public $js = [ |
| 31 | 'js/jquery.cookie.js', | 24 | 'js/jquery.cookie.js', |
| 32 | - // + | ||
| 33 | 'js/waypoints.min.js', | 25 | 'js/waypoints.min.js', |
| 34 | - // + | ||
| 35 | 'js/jquery.counterup.min.js', | 26 | 'js/jquery.counterup.min.js', |
| 36 | - // + | ||
| 37 | 'js/jquery.parallax-1.1.3.js', | 27 | 'js/jquery.parallax-1.1.3.js', |
| 38 | - // + | ||
| 39 | 'js/front.js', | 28 | 'js/front.js', |
| 40 | - // + | ||
| 41 | 'js/owl.carousel.min.js', | 29 | 'js/owl.carousel.min.js', |
| 42 | - // + | ||
| 43 | 'js/script.js', | 30 | 'js/script.js', |
| 44 | - // - | ||
| 45 | ]; | 31 | ]; |
| 46 | public $depends = [ | 32 | public $depends = [ |
| 47 | 'yii\web\YiiAsset', | 33 | 'yii\web\YiiAsset', |
| 48 | 'rmrevin\yii\fontawesome\AssetBundle', | 34 | 'rmrevin\yii\fontawesome\AssetBundle', |
| 49 | 'yii\bootstrap\BootstrapPluginAsset', | 35 | 'yii\bootstrap\BootstrapPluginAsset', |
| 36 | + 'artbox\order\assets\BasketAsset', | ||
| 50 | ]; | 37 | ]; |
| 51 | } | 38 | } |
| 52 | 39 | ||
| 53 | \ No newline at end of file | 40 | \ No newline at end of file |
