Commit c208b031b2217f76a281c834107432e32b023a9f
1 parent
adc7e08f
page without category
delete bootstrap
Showing
2 changed files
with
12 additions
and
5 deletions
Show diff stats
frontend/assets/AppAsset.php
frontend/views/layouts/main.php
... | ... | @@ -15,6 +15,7 @@ |
15 | 15 | use artbox\core\models\PageCategory; |
16 | 16 | use artbox\core\models\User; |
17 | 17 | use common\models\page\Category; |
18 | + use common\models\page\Page; | |
18 | 19 | use common\models\Settings; |
19 | 20 | use frontend\assets\AppAsset; |
20 | 21 | use artbox\core\components\imagemanager\models\ImageManager; |
... | ... | @@ -24,6 +25,7 @@ |
24 | 25 | use yii\bootstrap\Html; |
25 | 26 | use yii\db\ActiveQuery; |
26 | 27 | use artbox\core\helpers\Url; |
28 | + use yii\db\Query; | |
27 | 29 | use yii\web\View; |
28 | 30 | use yii\widgets\Breadcrumbs; |
29 | 31 | |
... | ... | @@ -41,7 +43,7 @@ |
41 | 43 | [ |
42 | 44 | 'language', |
43 | 45 | 'pages' => function (ActiveQuery $query) { |
44 | - $query->with('language.alias') | |
46 | + $query->with(['language', 'alias']) | |
45 | 47 | ->where(['in_menu' => true]) |
46 | 48 | ->orderBy([ 'sort' => SORT_ASC ]); |
47 | 49 | }, |
... | ... | @@ -50,6 +52,7 @@ |
50 | 52 | ->where([ 'status' => true ]) |
51 | 53 | ->orderBy([ 'sort' => SORT_ASC ]) |
52 | 54 | ->all(); |
55 | + $pages = Page::find()->with(['language', 'alias'])->where(['NOT IN', 'id', (new Query())->select('page_id')->from('page_to_category')->column()])->all(); | |
53 | 56 | $logo = null; |
54 | 57 | if ($settings->logo) { |
55 | 58 | $logo_img = ImageManager::findOne($settings->logo); |
... | ... | @@ -150,7 +153,10 @@ JS; |
150 | 153 | </li> |
151 | 154 | <?php }?> |
152 | 155 | <li><a href="<?=Url::to(['site/register'])?>"><?=Yii::t('app', 'РЕЄСТРАЦІЯ')?></a></li> |
153 | - <li><a href="<?=Url::to(['site/contacts'])?>"><?=Yii::t('app', 'КОНТАКТИ')?></a></li> | |
156 | + <?php foreach ($pages as $page){?> | |
157 | + <li><a href="<?=Url::to(['alias' => $page->alias])?>"><?=$page->language->title?></a></li> | |
158 | + | |
159 | + <?php }?> | |
154 | 160 | </ul> |
155 | 161 | </nav> |
156 | 162 | </div> |
... | ... | @@ -190,7 +196,10 @@ JS; |
190 | 196 | </li> |
191 | 197 | <?php }?> |
192 | 198 | <li><a href="<?=Url::to(['site/register'])?>"><?=Yii::t('app', 'РЕЄСТРАЦІЯ')?></a></li> |
193 | - <li><a href="<?=Url::to(['site/contacts'])?>"><?=Yii::t('app', 'КОНТАКТИ')?></a></li> | |
199 | + <?php foreach ($pages as $page){?> | |
200 | + <li><a href="<?=Url::to(['alias' => $page->alias])?>"><?=$page->language->title?></a></li> | |
201 | + | |
202 | + <?php }?> | |
194 | 203 | </ul> |
195 | 204 | </div> |
196 | 205 | </div> | ... | ... |