From e11dfa18e0b7ae7378df14f1c72b4d6e324d9126 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Tue, 15 Mar 2016 14:59:53 +0200
Subject: [PATCH] test

---
 frontend/views/company/_blog_list_view.php   | 46 +++++++++++++++++++++++++++++++++++-----------
 frontend/views/performer/_blog_list_view.php | 46 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/frontend/views/company/_blog_list_view.php b/frontend/views/company/_blog_list_view.php
index 37cc481..13fb32a 100644
--- a/frontend/views/company/_blog_list_view.php
+++ b/frontend/views/company/_blog_list_view.php
@@ -1,28 +1,52 @@
 <?php
-use frontend\helpers\TextHelper;
-use yii\helpers\Html;
-use yii\helpers\StringHelper;
-use yii\helpers\Url;
+    /**
+     * @var Blog $model
+     */
+    use common\models\Blog;
+    use common\modules\comment\models\Comment;
+    use frontend\helpers\TextHelper;
+    use yii\helpers\Html;
+    use yii\helpers\Url;
 
 ?>
 <div class="blog-post-wr">
     <div class="blog-post-title style">
-        <?= Html::a($model->name, Url::toRoute(['company/blog-view','company_id'=>$this->params['company']->id,'link'=>$model->link]),['class'=>'blog-new-link']);?>
+        <?= Html::a($model->name, Url::toRoute([
+            'company/blog-view',
+            'company_id' => $this->params[ 'company' ]->id,
+            'link'       => $model->link,
+        ]), [ 'class' => 'blog-new-link' ]); ?>
     </div>
     <div class="blog-post-icons-wr style">
         <div class="blog-post-date">
-            <span></span><p><?=  $model->dateCreate?></p>
+            <span></span>
+            <p><?= \Yii::$app->formatter->asDate($model->dateCreate, 'php:d.m.Y') ?></p>
         </div>
         <div class="blog-post-views">
-            <span></span><p><?= $model->view_count?></p>
+            <span></span>
+            <p><?= $model->view_count ?></p>
         </div>
         <div class="blog-post-comm-num">
-            <span></span><p><?= $model->view_count?></p>
+            <span></span>
+            <p><?= Comment::find()
+                          ->where([
+                              'model'    => $model->className(),
+                              'model_id' => $model->getPrimaryKey(),
+                          ])
+                          ->count() ?></p>
         </div>
     </div>
     <div class="blog-post-content style">
-        <?= Html::a(Html::img($model->cover), Url::toRoute(['/company/blog-view','company_id'=>$this->params['company']->id,'link'=>$model->link]));?>
-        <?= TextHelper::truncateHtmlText($model->description, 1300)?>
+        <?= Html::a(Html::img($model->cover), Url::toRoute([
+            '/company/blog-view',
+            'company_id' => $this->params[ 'company' ]->id,
+            'link'       => $model->link,
+        ])); ?>
+        <?= TextHelper::truncateHtmlText($model->description, 1300) ?>
     </div>
-    <?= Html::a('<span>Подробнее</span>', Url::toRoute(['company/blog-view','company_id'=>$this->params['company']->id,'link'=>$model->link]),['class'=>'blog-post-see-all style']);?>
+    <?= Html::a('<span>Подробнее</span>', Url::toRoute([
+        'company/blog-view',
+        'company_id' => $this->params[ 'company' ]->id,
+        'link'       => $model->link,
+    ]), [ 'class' => 'blog-post-see-all style' ]); ?>
 </div>
\ No newline at end of file
diff --git a/frontend/views/performer/_blog_list_view.php b/frontend/views/performer/_blog_list_view.php
index bab8250..6e568f8 100644
--- a/frontend/views/performer/_blog_list_view.php
+++ b/frontend/views/performer/_blog_list_view.php
@@ -1,28 +1,52 @@
 <?php
-use frontend\helpers\TextHelper;
-use yii\helpers\Html;
-use yii\helpers\StringHelper;
-use yii\helpers\Url;
+    /**
+     * @var Blog $model
+     */
+    use common\models\Blog;
+    use common\modules\comment\models\Comment;
+    use frontend\helpers\TextHelper;
+    use yii\helpers\Html;
+    use yii\helpers\Url;
 
 ?>
 <div class="blog-post-wr">
     <div class="blog-post-title style">
-        <?= Html::a($model->name, Url::toRoute(['performer/blog-view','performer_id'=>$this->params['user']->id,'link'=>$model->link]),['class'=>'blog-new-link']);?>
+        <?= Html::a($model->name, Url::toRoute([
+            'performer/blog-view',
+            'performer_id' => $this->params[ 'user' ]->id,
+            'link'         => $model->link,
+        ]), [ 'class' => 'blog-new-link' ]); ?>
     </div>
     <div class="blog-post-icons-wr style">
         <div class="blog-post-date">
-            <span></span><p><?=  $model->dateCreate?></p>
+            <span></span>
+            <p><?= \Yii::$app->formatter->asDate($model->dateCreate, 'php:d.m.Y') ?></p>
         </div>
         <div class="blog-post-views">
-            <span></span><p><?= $model->view_count?></p>
+            <span></span>
+            <p><?= $model->view_count ?></p>
         </div>
         <div class="blog-post-comm-num">
-            <span></span><p><?= $model->view_count?></p>
+            <span></span>
+            <p><?= Comment::find()
+                          ->where([
+                              'model'    => $model->className(),
+                              'model_id' => $model->getPrimaryKey(),
+                          ])
+                          ->count() ?></p>
         </div>
     </div>
     <div class="blog-post-content style">
-        <?= Html::a(Html::img($model->cover), Url::toRoute(['/performer/blog-view','performer_id'=>$this->params['user']->id,'link'=>$model->link]));?>
-        <?= TextHelper::truncateHtmlText($model->description, 1300)?>
+        <?= Html::a(Html::img($model->cover), Url::toRoute([
+            '/performer/blog-view',
+            'performer_id' => $this->params[ 'user' ]->id,
+            'link'         => $model->link,
+        ])); ?>
+        <?= TextHelper::truncateHtmlText($model->description, 1300) ?>
     </div>
-    <?= Html::a('<span>Подробнее</span>', Url::toRoute(['performer/blog-view','performer_id'=>$this->params['user']->id,'link'=>$model->link]),['class'=>'blog-post-see-all style']);?>
+    <?= Html::a('<span>Подробнее</span>', Url::toRoute([
+        'performer/blog-view',
+        'performer_id' => $this->params[ 'user' ]->id,
+        'link'         => $model->link,
+    ]), [ 'class' => 'blog-post-see-all style' ]); ?>
 </div>
\ No newline at end of file
--
libgit2 0.21.4