Eugeny Galkovskiy / kbenergy_new

Commit 2c12aaba4d202d6e1c06f52677179253db6fc2ce

Authored by Timur Kastemirov
1 parent 7dcbdea6

comments

Showing 11 changed files with 470 additions and 127 deletions   Show diff stats
Inline Side-by-side
backend/config/main.php
  Show/Hide comments   View file @2c12aab
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 'blog' => 'artbox\weblog\controllers\ArticleController', 26 'blog' => 'artbox\weblog\controllers\ArticleController',
27 'blog-category' => 'artbox\weblog\controllers\CategoryController', 27 'blog-category' => 'artbox\weblog\controllers\CategoryController',
28 'blog-tag' => 'artbox\weblog\controllers\TagController', 28 'blog-tag' => 'artbox\weblog\controllers\TagController',
  29 + 'comment' => 'artbox\webcomment\controllers\ManageController',
29 ], 30 ],
30 'components' => [ 31 'components' => [
31 'assetManager' => [ 32 'assetManager' => [
backend/views/comment/answer.php 0 → 100755
  Show/Hide comments   View file @2c12aab
  1 +<?php
  2 + use artbox\webcomment\models\CommentModel;
  3 + use yii\helpers\Html;
  4 + use yii\web\View;
  5 + use yii\widgets\ActiveForm;
  6 +
  7 + /**
  8 + * @var View $this
  9 + * @var CommentModel $model
  10 + * @var CommentModel $answer
  11 + */
  12 +
  13 + $this->title = \Yii::t('artbox-comment', 'Ответить на комментарий') . '# ' . $model->id;
  14 +
  15 + $this->params[ 'breadcrumbs' ][] = [
  16 + 'label' => \Yii::t('artbox-comment', 'Комментарии'),
  17 + 'url' => [ 'index' ],
  18 + ];
  19 + $this->params[ 'breadcrumbs' ][] = $this->title;
  20 +?>
  21 +
  22 +<div class="comment-answer">
  23 +
  24 + <?php $form = ActiveForm::begin(); ?>
  25 + <div class="form-group">
  26 + <?= $form->field($answer, 'text')
  27 + ->textarea() ?>
  28 +
  29 + <?= $form->field($answer, 'parent_id')
  30 + ->hiddenInput(
  31 + [
  32 + 'value' => $model->id,
  33 + ]
  34 + )
  35 + ->label(false) ?>
  36 +
  37 + <?= $form->field($answer, 'customer_id')
  38 + ->hiddenInput(
  39 + [
  40 + 'value' => 1,
  41 + ]
  42 + )
  43 + ->label(false) ?>
  44 +
  45 + <?= $form->field($answer, 'entity')
  46 + ->hiddenInput(
  47 + [
  48 + 'value' => $model->entity,
  49 + ]
  50 + )
  51 + ->label(false) ?>
  52 +
  53 + <?= $form->field($answer, 'entity_id')
  54 + ->hiddenInput(
  55 + [
  56 + 'value' => $model->entity_id,
  57 + ]
  58 + )
  59 + ->label(false) ?>
  60 +
  61 + <?= Html::submitButton(
  62 + \Yii::t('artbox-comment', 'Ответить'),
  63 + [ 'class' => 'btn btn-primary' ]
  64 + ) ?>
  65 + </div>
  66 +
  67 + <?php ActiveForm::end(); ?>
  68 +
  69 +</div>
backend/views/comment/index.php 0 → 100755
  Show/Hide comments   View file @2c12aab
  1 +<?php
  2 + use artbox\webcomment\models\CommentModel;
  3 + use artbox\webcomment\models\CommentModelSearch;
  4 + use MongoDB\Driver\Exception\ExecutionTimeoutException;
  5 + use yii\data\ActiveDataProvider;
  6 + use yii\grid\GridView;
  7 + use yii\helpers\Html;
  8 + use yii\helpers\StringHelper;
  9 + use yii\web\View;
  10 + use yii\widgets\Pjax;
  11 + use yii\helpers\Url;
  12 + use yii\helpers\Json;
  13 +
  14 + /**
  15 + * @var ActiveDataProvider $dataProvider
  16 + * @var CommentModelSearch $searchModel
  17 + * @var string $commentModel
  18 + * @var View $this
  19 + */
  20 + $this->title = \Yii::t('artbox-comment', 'Комментарии');
  21 +
  22 + $this->params[ 'breadcrumbs' ][] = $this->title;
  23 +
  24 + $statuses = [
  25 + $searchModel::STATUS_ACTIVE => \Yii::t('artbox-comment', 'Активный'),
  26 + $searchModel::STATUS_HIDDEN => \Yii::t('artbox-comment', 'Скрытый'),
  27 + $searchModel::STATUS_DELETED => \Yii::t('artbox-comment', 'Удаленный'),
  28 + ];
  29 + Pjax::begin();
  30 + if (( $success = \Yii::$app->session->getFlash('artbox_comment_success') ) != null) {
  31 + echo Html::tag('p', $success);
  32 + }
  33 + echo GridView::widget(
  34 + [
  35 + 'dataProvider' => $dataProvider,
  36 + 'filterModel' => $searchModel,
  37 + 'columns' => [
  38 + 'id',
  39 + [
  40 + 'attribute' => 'created_at',
  41 + 'format' => [
  42 + 'date',
  43 + 'php:d.m.Y',
  44 + ],
  45 + 'filter' => false,
  46 + ],
  47 + [
  48 + 'label' => \Yii::t('artbox-comment', 'Комментарий'),
  49 + 'content' => function (CommentModel $model) {
  50 + return StringHelper::truncate($model->text, 40, '...');
  51 + },
  52 + ],
  53 + [
  54 + 'label' => \Yii::t('artbox-comment', 'Сущность '),
  55 + 'content' => function (CommentModel $model) {
  56 + try {
  57 + $entity = call_user_func($model->entity . '::find');
  58 + } catch (Exception $exception) {
  59 + return \Yii::$app->formatter->asText('');
  60 + }
  61 + $item = $entity->where([ 'id' => $model->entity_id ])
  62 + ->with(
  63 + [
  64 + 'lang',
  65 + 'lang.alias',
  66 + ]
  67 + )
  68 + ->one();
  69 + if ($item !== null) {
  70 + if ($urlManagerFrontend = \Yii::$app->get('urlManagerFrontend', false)) {
  71 +
  72 + return "<a href='" . $urlManagerFrontend->createUrl(
  73 + Json::decode($item->lang->alias->route)
  74 + ) . "'>" . $item->lang->title . "</a>";
  75 + }
  76 +
  77 + return $item->lang->title;
  78 + }
  79 + return 'Товар удален';
  80 + },
  81 + ],
  82 + [
  83 + 'attribute' => 'customer_id',
  84 + 'value' => function ($model) {
  85 + /**
  86 + * @var CommentModel $model
  87 + */
  88 + if (!empty($model->customer)) {
  89 + return $model->customer->username . ' (id:' . $model->customer->id . ')';
  90 + } else {
  91 + return $model->username . ' ' . $model->email . ' (' . \Yii::t(
  92 + 'artbox-comment',
  93 + 'Гость'
  94 + ) . ')';
  95 + }
  96 + },
  97 + ],
  98 + [
  99 + 'attribute' => 'status',
  100 + 'filter' => $statuses,
  101 + 'value' => function ($model) use ($statuses) {
  102 + /**
  103 + * @var CommentModel $model
  104 + */
  105 + if (array_key_exists($model->status, $statuses)) {
  106 + return $statuses[ $model->status ];
  107 + } else {
  108 + return null;
  109 + }
  110 + },
  111 + ],
  112 + [
  113 + 'attribute' => 'ratingValue',
  114 + 'value' => function ($model) {
  115 + /**
  116 + * @var CommentModel $model
  117 + */
  118 + if (!empty($model->rating)) {
  119 + return $model->rating->value;
  120 + }
  121 + return null;
  122 + },
  123 + ],
  124 + [
  125 + 'attribute' => 'childrenCount',
  126 + 'value' => function ($model) {
  127 + /**
  128 + * @var CommentModel $model
  129 + */
  130 + return count($model->children);
  131 + },
  132 + ],
  133 + [
  134 + 'class' => 'yii\grid\ActionColumn',
  135 + 'buttons' => [
  136 + 'answer' => function (string $url) {
  137 + return Html::a(Html::tag('i', '', [ 'class' => 'glyphicon glyphicon-bullhorn' ]), $url);
  138 + },
  139 + ],
  140 + 'template' => '{update} {answer} {delete}',
  141 + ],
  142 + ],
  143 + ]
  144 + );
  145 + Pjax::end();
0 \ No newline at end of file 146 \ No newline at end of file
backend/views/comment/update.php 0 → 100755
  Show/Hide comments   View file @2c12aab
  1 +<?php
  2 + use artbox\webcomment\models\CommentModel;
  3 + use yii\helpers\Html;
  4 + use yii\widgets\ActiveForm;
  5 +
  6 + /**
  7 + * @var CommentModel $model
  8 + */
  9 + $statuses = [
  10 + $model::STATUS_ACTIVE => \Yii::t('artbox-comment', 'Активный'),
  11 + $model::STATUS_HIDDEN => \Yii::t('artbox-comment', 'Скрытый'),
  12 + $model::STATUS_DELETED => \Yii::t('artbox-comment', 'Удаленный'),
  13 + ];
  14 + $form = ActiveForm::begin();
  15 + echo $form->field($model, 'text')
  16 + ->textarea();
  17 + echo $form->field($model, 'status')
  18 + ->dropDownList($statuses);
  19 + echo Html::submitButton(\Yii::t('artbox-comment', 'Обновить'));
  20 + $form->end();
0 \ No newline at end of file 21 \ No newline at end of file
backend/views/layouts/menu_items.php
  Show/Hide comments   View file @2c12aab
@@ -110,5 +110,10 @@ @@ -110,5 +110,10 @@
110 'url' => ['/objectkb/index'], 110 'url' => ['/objectkb/index'],
111 'icon' => 'sun-o', 111 'icon' => 'sun-o',
112 ], 112 ],
  113 + [
  114 + 'label' => \Yii::t('core', 'Комментарии'),
  115 + 'url' => ['/comment/index'],
  116 + 'icon' => 'sun-o',
  117 + ],
113 ] 118 ]
114 ); 119 );
115 \ No newline at end of file 120 \ No newline at end of file
common/config/bootstrap.php
  Show/Hide comments   View file @2c12aab
@@ -9,4 +9,7 @@ @@ -9,4 +9,7 @@
9 } 9 }
10 if (!Yii::getAlias('@artbox/weblog', false)) { 10 if (!Yii::getAlias('@artbox/weblog', false)) {
11 Yii::setAlias('@artbox/weblog', dirname(dirname(__DIR__)) . '/artweb/artbox-weblog'); 11 Yii::setAlias('@artbox/weblog', dirname(dirname(__DIR__)) . '/artweb/artbox-weblog');
  12 + }
  13 + if (!Yii::getAlias('@artbox/webcomment', false)) {
  14 + Yii::setAlias('@artbox/webcomment', dirname(dirname(__DIR__)) . '/artweb/artbox-webcomment');
12 } 15 }
13 \ No newline at end of file 16 \ No newline at end of file
common/config/main.php
  Show/Hide comments   View file @2c12aab
@@ -17,6 +17,9 @@ @@ -17,6 +17,9 @@
17 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', 17 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css',
18 ], 18 ],
19 ], 19 ],
  20 + 'artbox-comment' => [
  21 + 'class' => 'artbox\webcomment\Module',
  22 + ],
20 ], 23 ],
21 'components' => [ 24 'components' => [
22 'cache' => [ 25 'cache' => [
@@ -36,6 +39,10 @@ @@ -36,6 +39,10 @@
36 'class' => 'yii\i18n\PhpMessageSource', 39 'class' => 'yii\i18n\PhpMessageSource',
37 'basePath' => '@artbox/weblog/messages', 40 'basePath' => '@artbox/weblog/messages',
38 ], 41 ],
  42 + 'artbox-comment' => [
  43 + 'class' => 'yii\i18n\PhpMessageSource',
  44 + 'basePath' => '@artbox/webcomment/messages',
  45 + ],
39 ], 46 ],
40 ], 47 ],
41 'filedb' => [ 48 'filedb' => [
common/models/User.php 0 → 100644
  Show/Hide comments   View file @2c12aab
  1 +<?php
  2 +
  3 + namespace common\models;
  4 + /**
  5 + * Created by PhpStorm.
  6 + * User: timur
  7 + * Date: 02.02.18
  8 + * Time: 9:00
  9 + */
  10 +
  11 + use artbox\core\models\User as ArtboxUser;
  12 +
  13 + class User extends ArtboxUser
  14 + {
  15 + public function getUserName(){}
  16 +
  17 + public $password;
  18 +
  19 + public function rules(){
  20 + return array_merge(
  21 + parent::rules(),
  22 + [
  23 + [['email', 'username'], 'string'],
  24 + ['email', 'email'],
  25 + ['password', 'safe']
  26 + ]
  27 + );
  28 + }
  29 + }
0 \ No newline at end of file 30 \ No newline at end of file
@@ -32,7 +32,8 @@ @@ -32,7 +32,8 @@
32 "2amigos/yii2-tinymce-widget": "~1.1", 32 "2amigos/yii2-tinymce-widget": "~1.1",
33 "kartik-v/yii2-widget-select2": "@dev", 33 "kartik-v/yii2-widget-select2": "@dev",
34 "artweb/artbox-core": "@dev", 34 "artweb/artbox-core": "@dev",
35 - "artweb/artbox-weblog": "@dev" 35 + "artweb/artbox-weblog": "@dev",
  36 + "artweb/artbox-webcomment": "@dev"
36 }, 37 },
37 "require-dev": { 38 "require-dev": {
38 "yiisoft/yii2-debug": "~2.0.0", 39 "yiisoft/yii2-debug": "~2.0.0",
@@ -58,6 +59,10 @@ @@ -58,6 +59,10 @@
58 { 59 {
59 "type": "vcs", 60 "type": "vcs",
60 "url": "git@gitlab.artweb.com.ua:Alexey/artbox-weblog.git" 61 "url": "git@gitlab.artweb.com.ua:Alexey/artbox-weblog.git"
  62 + },
  63 + {
  64 + "type": "vcs",
  65 + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-webcomment.git"
61 } 66 }
62 ] 67 ]
63 } 68 }
console/migrations/m180202_053527_create_customer_table.php 0 → 100644
  Show/Hide comments   View file @2c12aab
  1 +<?php
  2 +
  3 +use yii\db\Migration;
  4 +
  5 +/**
  6 + * Handles the creation of table `customer`.
  7 + */
  8 +class m180202_053527_create_customer_table extends Migration
  9 +{
  10 + /**
  11 + * @inheritdoc
  12 + */
  13 + public function safeUp()
  14 + {
  15 + $this->createTable(
  16 + 'customer',
  17 + [
  18 + 'id' => $this->primaryKey(),
  19 + 'username' => $this->string()
  20 + ->notNull()
  21 + ->unique(),
  22 + 'auth_key' => $this->string(32)
  23 + ->notNull(),
  24 + 'password_hash' => $this->string()
  25 + ->notNull(),
  26 + 'password_reset_token' => $this->string()
  27 + ->unique(),
  28 + 'email' => $this->string()
  29 + ->unique(),
  30 +
  31 + 'status' => $this->smallInteger()
  32 + ->notNull()
  33 + ->defaultValue(10),
  34 + 'created_at' => $this->integer()
  35 + ->notNull(),
  36 + 'updated_at' => $this->integer()
  37 + ->notNull(),
  38 + 'name' => $this->string(),
  39 + 'phone' => $this->string(),
  40 + 'gender' => $this->smallInteger(1),
  41 + 'birthday' => $this->integer(),
  42 + 'city' => $this->string(),
  43 + 'address' => $this->string(),
  44 + 'social_id' => $this->string(),
  45 + ]
  46 + );
  47 + }
  48 +
  49 + /**
  50 + * @inheritdoc
  51 + */
  52 + public function safeDown()
  53 + {
  54 + $this->dropTable('customer');
  55 + }
  56 +}
frontend/views/blog/view.php
  Show/Hide comments   View file @2c12aab
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * Date: 26.01.18 4 * Date: 26.01.18
5 * Time: 9:22 5 * Time: 9:22
6 * 6 *
7 - * @var Article $article 7 + * @var Article $article
8 * @var SeoComponent $seo 8 * @var SeoComponent $seo
9 */ 9 */
10 10
@@ -15,17 +15,17 @@ @@ -15,17 +15,17 @@
15 use common\models\Settings; 15 use common\models\Settings;
16 use artbox\core\components\SeoComponent; 16 use artbox\core\components\SeoComponent;
17 use yii\helpers\Url; 17 use yii\helpers\Url;
18 - 18 + use artbox\webcomment\widgets\CommentWidget;
19 19
20 $settings = Settings::getInstance(); 20 $settings = Settings::getInstance();
21 $seo = Yii::$app->get('seo'); 21 $seo = Yii::$app->get('seo');
22 22
23 $this->params[ 'breadcrumbs' ][] = [ 23 $this->params[ 'breadcrumbs' ][] = [
24 'label' => Yii::t('app', "menu-blog"), 24 'label' => Yii::t('app', "menu-blog"),
25 - 'url' => Url::toRoute(['blog/index']) 25 + 'url' => Url::toRoute([ 'blog/index' ]),
26 ]; 26 ];
27 $this->params[ 'breadcrumbs' ][] = $seo->h1 27 $this->params[ 'breadcrumbs' ][] = $seo->h1
28 - 28 +
29 ?> 29 ?>
30 30
31 <div id="content"> 31 <div id="content">
@@ -39,47 +39,28 @@ @@ -39,47 +39,28 @@
39 <div class="col-md-9" id="blog-post"> 39 <div class="col-md-9" id="blog-post">
40 40
41 <p class="lead"> 41 <p class="lead">
42 - <?=$article->lang->title?> 42 + <?= $article->lang->title ?>
43 </p> 43 </p>
44 44
45 <div id="post-content" class="post-blog"> 45 <div id="post-content" class="post-blog">
46 46
47 <p> 47 <p>
48 - <?=$article->image->getImg( 48 + <?= $article->image->getImg(
49 [ 49 [
50 - 'class' => "img-responsive" 50 + 'class' => "img-responsive",
51 ] 51 ]
52 - )?> 52 + ) ?>
53 </p> 53 </p>
54 54
55 - <?=$article->lang->body?> 55 + <?= $article->lang->body ?>
56 56
57 </div> 57 </div>
58 <!-- /#post-content --> 58 <!-- /#post-content -->
59 -  
60 - <div id="disqus_thread"></div>  
61 - <script>  
62 -  
63 - /**  
64 - * RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.  
65 - * LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/  
66 - /*  
67 - var disqus_config = function () {  
68 - this.page.url = PAGE_URL; // Replace PAGE_URL with your page's canonical URL variable  
69 - this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable  
70 - };  
71 - */  
72 - (function() { // DON'T EDIT BELOW THIS LINE  
73 - var d = document, s = d.createElement('script');  
74 - s.src = 'https://http-t13-artweb-com-ua.disqus.com/embed.js';  
75 - s.setAttribute('data-timestamp', +new Date());  
76 - (d.head || d.body).appendChild(s);  
77 - })();  
78 - </script>  
79 - <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>  
80 -  
81 -  
82 - <!-- <div id="disqus_thread"></div>--> 59 +
  60 + <?= CommentWidget::widget([ 'model' => $article ]) ?>
  61 +
  62 +
  63 +<!-- <div id="disqus_thread"></div>-->
83 <!-- <script>--> 64 <!-- <script>-->
84 <!----> 65 <!---->
85 <!-- /**--> 66 <!-- /**-->
@@ -93,104 +74,126 @@ @@ -93,104 +74,126 @@
93 <!-- */--> 74 <!-- */-->
94 <!-- (function() { // DON'T EDIT BELOW THIS LINE--> 75 <!-- (function() { // DON'T EDIT BELOW THIS LINE-->
95 <!-- var d = document, s = d.createElement('script');--> 76 <!-- var d = document, s = d.createElement('script');-->
96 -<!-- s.src = 'https://new-kbenergy-test.disqus.com/embed.js';--> 77 +<!-- s.src = 'https://http-t13-artweb-com-ua.disqus.com/embed.js';-->
97 <!-- s.setAttribute('data-timestamp', +new Date());--> 78 <!-- s.setAttribute('data-timestamp', +new Date());-->
98 <!-- (d.head || d.body).appendChild(s);--> 79 <!-- (d.head || d.body).appendChild(s);-->
99 <!-- })();--> 80 <!-- })();-->
100 <!-- </script>--> 81 <!-- </script>-->
101 -<!-- <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>-->  
102 -  
103 -  
104 - 82 +<!-- <noscript>Please enable JavaScript to view the-->
  83 +<!-- <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>-->
  84 +
  85 +
  86 + <!-- <div id="disqus_thread"></div>-->
  87 + <!-- <script>-->
  88 + <!---->
  89 + <!-- /**-->
  90 + <!-- * RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.-->
  91 + <!-- * LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/-->
  92 + <!-- /*-->
  93 + <!-- var disqus_config = function () {-->
  94 + <!-- this.page.url = PAGE_URL; // Replace PAGE_URL with your page's canonical URL variable-->
  95 + <!-- this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable-->
  96 + <!-- };-->
  97 + <!-- */-->
  98 + <!-- (function() { // DON'T EDIT BELOW THIS LINE-->
  99 + <!-- var d = document, s = d.createElement('script');-->
  100 + <!-- s.src = 'https://new-kbenergy-test.disqus.com/embed.js';-->
  101 + <!-- s.setAttribute('data-timestamp', +new Date());-->
  102 + <!-- (d.head || d.body).appendChild(s);-->
  103 + <!-- })();-->
  104 + <!-- </script>-->
  105 + <!-- <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>-->
  106 +
  107 +
105 <!-- <div id="comments">--> 108 <!-- <div id="comments">-->
106 -<!-- <h4 class="text-uppercase">2 комментария</h4>-->  
107 -<!-- -->  
108 -<!-- -->  
109 -<!-- <div class="row comment">-->  
110 -<!-- <div class="col-sm-3 col-md-2 text-center-xs">-->  
111 -<!-- <p>-->  
112 -<!-- <img src="img/blog-avatar2.jpg" class="img-responsive img-circle" alt="">-->  
113 -<!-- </p>-->  
114 -<!-- </div>-->  
115 -<!-- <div class="col-sm-9 col-md-10">-->  
116 -<!-- <h5 class="text-uppercase">carolina</h5>-->  
117 -<!-- <p class="posted"><i class="fa fa-clock-o"></i> 23 сентября, 2011, 12:00</p>-->  
118 -<!-- <p>Спасибо! Давно хочу съездить в Норвегию. Вот и определилась куда.</p>-->  
119 -<!-- <p class="reply"><a href="blog-post.html#"><i class="fa fa-reply"></i> Ответить</a>-->  
120 -<!-- </p>-->  
121 -<!-- </div>-->  
122 -<!-- </div>-->  
123 -  
124 -<!-- -->  
125 -<!-- -->  
126 -<!-- <div class="row comment last">-->  
127 -<!-- -->  
128 -<!-- <div class="col-sm-3 col-md-2 text-center-xs">-->  
129 -<!-- <p>-->  
130 -<!-- <img src="img/blog-avatar.jpg" class="img-responsive img-circle" alt="">-->  
131 -<!-- </p>-->  
132 -<!-- </div>-->  
133 -<!-- -->  
134 -<!-- <div class="col-sm-9 col-md-10">-->  
135 -<!-- <h5 class="text-uppercase">gigi2</h5>-->  
136 -<!-- <p class="posted"><i class="fa fa-clock-o"></i> 23 сентября, 2011, 12:00</p>-->  
137 -<!-- <p>Даже и не знал, что на рыбалку лучше ехать в Квальвику. У меня туда друг часто катается со своей женой, может с ними теперь поеду. Давно не занимался рыбалкой зарубежом.</p>-->  
138 -<!-- <p class="reply"><a href="blog-post.html#"><i class="fa fa-reply"></i> Ответить</a>-->  
139 -<!-- </p>-->  
140 -<!-- </div>-->  
141 -<!-- -->  
142 -<!-- </div>-->  
143 -<!-- </div>--> 109 + <!-- <h4 class="text-uppercase">2 комментария</h4>-->
  110 + <!-- -->
  111 + <!-- -->
  112 + <!-- <div class="row comment">-->
  113 + <!-- <div class="col-sm-3 col-md-2 text-center-xs">-->
  114 + <!-- <p>-->
  115 + <!-- <img src="img/blog-avatar2.jpg" class="img-responsive img-circle" alt="">-->
  116 + <!-- </p>-->
  117 + <!-- </div>-->
  118 + <!-- <div class="col-sm-9 col-md-10">-->
  119 + <!-- <h5 class="text-uppercase">carolina</h5>-->
  120 + <!-- <p class="posted"><i class="fa fa-clock-o"></i> 23 сентября, 2011, 12:00</p>-->
  121 + <!-- <p>Спасибо! Давно хочу съездить в Норвегию. Вот и определилась куда.</p>-->
  122 + <!-- <p class="reply"><a href="blog-post.html#"><i class="fa fa-reply"></i> Ответить</a>-->
  123 + <!-- </p>-->
  124 + <!-- </div>-->
  125 + <!-- </div>-->
  126 +
  127 + <!-- -->
  128 + <!-- -->
  129 + <!-- <div class="row comment last">-->
  130 + <!-- -->
  131 + <!-- <div class="col-sm-3 col-md-2 text-center-xs">-->
  132 + <!-- <p>-->
  133 + <!-- <img src="img/blog-avatar.jpg" class="img-responsive img-circle" alt="">-->
  134 + <!-- </p>-->
  135 + <!-- </div>-->
  136 + <!-- -->
  137 + <!-- <div class="col-sm-9 col-md-10">-->
  138 + <!-- <h5 class="text-uppercase">gigi2</h5>-->
  139 + <!-- <p class="posted"><i class="fa fa-clock-o"></i> 23 сентября, 2011, 12:00</p>-->
  140 + <!-- <p>Даже и не знал, что на рыбалку лучше ехать в Квальвику. У меня туда друг часто катается со своей женой, может с ними теперь поеду. Давно не занимался рыбалкой зарубежом.</p>-->
  141 + <!-- <p class="reply"><a href="blog-post.html#"><i class="fa fa-reply"></i> Ответить</a>-->
  142 + <!-- </p>-->
  143 + <!-- </div>-->
  144 + <!-- -->
  145 + <!-- </div>-->
  146 + <!-- </div>-->
144 <!-- /#comments --> 147 <!-- /#comments -->
145 148
146 149
147 -<!-- <div id="comment-form">-->  
148 -<!-- -->  
149 -<!-- <h4 class="text-uppercase">Оставить комментарий</h4>-->  
150 -<!-- -->  
151 -<!-- <form>-->  
152 -<!-- <div class="row">-->  
153 -<!-- -->  
154 -<!-- <div class="col-sm-6">-->  
155 -<!-- <div class="form-group">-->  
156 -<!-- <label for="name">Имя <span class="required">*</span>-->  
157 -<!-- </label>-->  
158 -<!-- <input type="text" class="form-control" id="name">-->  
159 -<!-- </div>-->  
160 -<!-- </div>-->  
161 -<!-- -->  
162 -<!-- </div>-->  
163 -<!-- -->  
164 -<!-- <div class="row">-->  
165 -<!-- <div class="col-sm-6">-->  
166 -<!-- <div class="form-group">-->  
167 -<!-- <label for="email">Email <span class="required">*</span>-->  
168 -<!-- </label>-->  
169 -<!-- <input type="text" class="form-control" id="email">-->  
170 -<!-- </div>-->  
171 -<!-- </div>-->  
172 -<!-- </div>-->  
173 -<!-- -->  
174 -<!-- <div class="row">-->  
175 -<!-- <div class="col-sm-12">-->  
176 -<!-- <div class="form-group">-->  
177 -<!-- <label for="comment">Текст комментария <span class="required">*</span>-->  
178 -<!-- </label>-->  
179 -<!-- <textarea class="form-control" id="comment" rows="4"></textarea>-->  
180 -<!-- </div>-->  
181 -<!-- </div>-->  
182 -<!-- </div>-->  
183 -<!-- -->  
184 -<!-- <div class="row">-->  
185 -<!-- <div class="col-sm-12 text-right">-->  
186 -<!-- <button class="btn btn-template-main"><i class="fa fa-comment-o"></i> Отправить</button>-->  
187 -<!-- </div>-->  
188 -<!-- </div>-->  
189 -<!-- -->  
190 -<!-- -->  
191 -<!-- </form>-->  
192 -<!-- -->  
193 -<!-- </div>--> 150 + <!-- <div id="comment-form">-->
  151 + <!-- -->
  152 + <!-- <h4 class="text-uppercase">Оставить комментарий</h4>-->
  153 + <!-- -->
  154 + <!-- <form>-->
  155 + <!-- <div class="row">-->
  156 + <!-- -->
  157 + <!-- <div class="col-sm-6">-->
  158 + <!-- <div class="form-group">-->
  159 + <!-- <label for="name">Имя <span class="required">*</span>-->
  160 + <!-- </label>-->
  161 + <!-- <input type="text" class="form-control" id="name">-->
  162 + <!-- </div>-->
  163 + <!-- </div>-->
  164 + <!-- -->
  165 + <!-- </div>-->
  166 + <!-- -->
  167 + <!-- <div class="row">-->
  168 + <!-- <div class="col-sm-6">-->
  169 + <!-- <div class="form-group">-->
  170 + <!-- <label for="email">Email <span class="required">*</span>-->
  171 + <!-- </label>-->
  172 + <!-- <input type="text" class="form-control" id="email">-->
  173 + <!-- </div>-->
  174 + <!-- </div>-->
  175 + <!-- </div>-->
  176 + <!-- -->
  177 + <!-- <div class="row">-->
  178 + <!-- <div class="col-sm-12">-->
  179 + <!-- <div class="form-group">-->
  180 + <!-- <label for="comment">Текст комментария <span class="required">*</span>-->
  181 + <!-- </label>-->
  182 + <!-- <textarea class="form-control" id="comment" rows="4"></textarea>-->
  183 + <!-- </div>-->
  184 + <!-- </div>-->
  185 + <!-- </div>-->
  186 + <!-- -->
  187 + <!-- <div class="row">-->
  188 + <!-- <div class="col-sm-12 text-right">-->
  189 + <!-- <button class="btn btn-template-main"><i class="fa fa-comment-o"></i> Отправить</button>-->
  190 + <!-- </div>-->
  191 + <!-- </div>-->
  192 + <!-- -->
  193 + <!-- -->
  194 + <!-- </form>-->
  195 + <!-- -->
  196 + <!-- </div>-->
194 <!-- /#comment-form --> 197 <!-- /#comment-form -->
195 198
196 199
@@ -207,11 +210,11 @@ @@ -207,11 +210,11 @@
207 <!-- *** MENUS AND WIDGETS *** 210 <!-- *** MENUS AND WIDGETS ***
208 _________________________________________________________ --> 211 _________________________________________________________ -->
209 212
210 - <?= SearchWidget::widget()?> 213 + <?= SearchWidget::widget() ?>
211 214
212 - <?= CategoryWidget::widget()?> 215 + <?= CategoryWidget::widget() ?>
213 216
214 - <?= TagWidget::widget()?> 217 + <?= TagWidget::widget() ?>
215 218
216 <!-- *** MENUS AND FILTERS END *** --> 219 <!-- *** MENUS AND FILTERS END *** -->
217 220