diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php index a5a4999..8f9a6c3 100755 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -104,8 +104,18 @@ use yii\widgets\Menu; [ 'label' => 'Блог', 'template'=>' {label}', - 'url' => ['/blog/index'], 'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'], + 'active' => preg_match('/^blog.*$/', $this->context->id) || preg_match('/^blog-category.*$/', $this->context->id) ? true : false, + 'items' => [ + [ + 'label' => 'Статьи блога', + 'url' => ['/blog/index'], + ], + [ + 'label' => 'Категории блога', + 'url' => '/admin/blog-category/index' + ], + ], ], [ 'label' => 'События', diff --git a/frontend/controllers/BlogController.php b/frontend/controllers/BlogController.php index 3487a0e..0a36be2 100755 --- a/frontend/controllers/BlogController.php +++ b/frontend/controllers/BlogController.php @@ -55,11 +55,7 @@ public function actionCategory($id) { - $model = BlogCategory::find() - ->where([ - 'id' => $id, - ]) - ->one(); + $model = BlogCategory::findOne($id); $query = $model->getBlogs(); $dataProvider = new ActiveDataProvider([ 'query' => $query, diff --git a/frontend/views/blog/_blog_item.php b/frontend/views/blog/_blog_item.php index 510d29e..3a3d7de 100755 --- a/frontend/views/blog/_blog_item.php +++ b/frontend/views/blog/_blog_item.php @@ -1,31 +1,41 @@
title; ?>
-
- Дизайн интерьера - date)), ' ', date('d, Y', $model->date); +
+ categories as $category) { ?> + + name; ?> + + + date)), ' ', date('d, Y', $model->date); ?>
  • @@ -36,7 +46,10 @@ use yii\widgets\ListView;

body_preview; ?>

- Узнать больше + Узнать больше
\ No newline at end of file diff --git a/frontend/views/blog/category.php b/frontend/views/blog/category.php index 7243a2e..25108fa 100755 --- a/frontend/views/blog/category.php +++ b/frontend/views/blog/category.php @@ -1,38 +1,44 @@ title = "Блог"; -$this->params[ 'breadcrumbs' ][] = $this->title; - + + use common\models\BlogCategory; + use yii\data\ActiveDataProvider; + use yii\helpers\Url; + use yii\web\View; + use yii\widgets\ListView; + + /** + * @var BlogCategory $model + * @var ActiveDataProvider $dataProvider + * @var View $this + */ + $this->title = $model->name; + $this->params[ 'breadcrumbs' ][] = [ + 'label' => 'Блог', + 'url' => Url::to([ + '/blog' + ]), + ]; + $this->params[ 'breadcrumbs' ][] = $this->title; ?>
$dataProvider, - 'options' => [ - 'tag' => false, - ], - 'pager' => [ - 'prevPageCssClass' => 'left_pg', - 'nextPageCssClass' => 'right_pg', - 'activePageCssClass' => 'active', - 'disabledPageCssClass' => '', - 'firstPageLabel' => false, - ], - 'itemView' => '_blog_item', - 'layout' => '{items}{pager}', - ]); - + + echo ListView::widget([ + 'dataProvider' => $dataProvider, + 'options' => [ + 'tag' => false, + ], + 'pager' => [ + 'prevPageCssClass' => 'left_pg', + 'nextPageCssClass' => 'right_pg', + 'activePageCssClass' => 'active', + 'disabledPageCssClass' => '', + 'firstPageLabel' => false, + ], + 'itemView' => '_blog_item', + 'layout' => '{items}{pager}', + ]); + ?>
diff --git a/frontend/views/blog/view.php b/frontend/views/blog/view.php index 48e36dd..a771069 100755 --- a/frontend/views/blog/view.php +++ b/frontend/views/blog/view.php @@ -1,22 +1,22 @@ title = $model->title; - -$this->params['breadcrumbs'][] = [ - 'label' => 'Блог', - 'url' => Url::to(['/blog']), -]; -$this->params['breadcrumbs'][] = $this->title; + + /** + * @var Blog $model + * @var View $this + */ + use common\models\Blog; + use common\models\Comments; + use common\modules\comment\widgets\CommentWidget; + use yii\helpers\Url; + use yii\web\View; + + $this->title = $model->title; + + $this->params[ 'breadcrumbs' ][] = [ + 'label' => 'Блог', + 'url' => Url::to([ '/blog' ]), + ]; + $this->params[ 'breadcrumbs' ][] = $this->title; ?> @@ -24,14 +24,23 @@ $this->params['breadcrumbs'][] = $this->title;
title; ?>
-
- Дизайн интерьера - date)), ' ', date('d, Y', $model->date); +
+ categories as $category) { ?> + + name; ?> + + + date)), ' ', date('d, Y', $model->date); ?>
- body; ?> + body; ?>
  • -- libgit2 0.21.4