diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index ade81cf..a91387f 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -20,8 +20,6 @@ ]; public $depends = [ 'yii\web\YiiAsset', - 'rmrevin\yii\fontawesome\AssetBundle', - 'yii\bootstrap\BootstrapPluginAsset', ]; } \ No newline at end of file diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 50e0d9f..9044c66 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -15,6 +15,7 @@ use artbox\core\models\PageCategory; use artbox\core\models\User; use common\models\page\Category; + use common\models\page\Page; use common\models\Settings; use frontend\assets\AppAsset; use artbox\core\components\imagemanager\models\ImageManager; @@ -24,6 +25,7 @@ use yii\bootstrap\Html; use yii\db\ActiveQuery; use artbox\core\helpers\Url; + use yii\db\Query; use yii\web\View; use yii\widgets\Breadcrumbs; @@ -41,7 +43,7 @@ [ 'language', 'pages' => function (ActiveQuery $query) { - $query->with('language.alias') + $query->with(['language', 'alias']) ->where(['in_menu' => true]) ->orderBy([ 'sort' => SORT_ASC ]); }, @@ -50,6 +52,7 @@ ->where([ 'status' => true ]) ->orderBy([ 'sort' => SORT_ASC ]) ->all(); + $pages = Page::find()->with(['language', 'alias'])->where(['NOT IN', 'id', (new Query())->select('page_id')->from('page_to_category')->column()])->all(); $logo = null; if ($settings->logo) { $logo_img = ImageManager::findOne($settings->logo); @@ -150,7 +153,10 @@ JS;