Alexey Boroda / kristal-estet

Commit 3248e2e07ac3a39da78492e6fa7a239bacfbc59f

Authored by Alexey Boroda
2 parents 90c36c56 3cb0ab69

Merge remote-tracking branch 'origin/master'

Showing 5 changed files with 50 additions and 26 deletions   Show diff stats
Inline Side-by-side
frontend/views/blog/_article.php
  Show/Hide comments   View file @3248e2e
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 } else { 64 } else {
65 echo '0'; 65 echo '0';
66 } 66 }
67 - ?> Comments</a> 67 + ?> комментариев</a>
68 </p> 68 </p>
69 </div> 69 </div>
70 </div> 70 </div>
frontend/views/layouts/main.php
  Show/Hide comments   View file @3248e2e
@@ -304,7 +304,7 @@ _________________________________________________________ --&gt; @@ -304,7 +304,7 @@ _________________________________________________________ --&gt;
304 'url' => [ 'site/price' ], 304 'url' => [ 'site/price' ],
305 ]; 305 ];
306 $items[] = [ 306 $items[] = [
307 - 'label' => \Yii::t('app', 'Блог'), 307 + 'label' => \Yii::t('app', 'Статьи'),
308 'url' => [ 'blog/index' ], 308 'url' => [ 'blog/index' ],
309 ]; 309 ];
310 $items[] = [ 310 $items[] = [
frontend/views/site/comment/artbox_comment_form.php
  Show/Hide comments   View file @3248e2e
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 echo Html::tag( 59 echo Html::tag(
60 'div', 60 'div',
61 Html::submitButton( 61 Html::submitButton(
62 - Yii::t('app', 'Submit comment') 62 + Yii::t('app', 'Отправить отзыв')
63 ), 63 ),
64 [ 'class' => 'input_bl submit_btn' ] 64 [ 'class' => 'input_bl submit_btn' ]
65 ); 65 );
frontend/views/site/comments.php
  Show/Hide comments   View file @3248e2e
@@ -10,27 +10,33 @@ @@ -10,27 +10,33 @@
10 */ 10 */
11 11
12 ?> 12 ?>
  13 +<div id="content" class="feedback-wr">
  14 + <div class="container">
  15 + <div class="row">
  16 + <div class="col-md-12">
  17 + <h4 class="text-uppercase title-comment">Отзывы</h4>
  18 + <?php
  19 + echo CommentWidget::widget(
  20 + [
  21 + 'model' => $model,
  22 + 'display_name' => 'name',
  23 + 'entityIdAttribute' => 'id',
  24 + 'reply' => true,
  25 + 'layout' => "{list}<div class='comments-border'></div><h4 class='text-uppercase title-comment'>Оставить отзыв</h4>{form} {reply_form}",
  26 + 'delete' => false,
  27 + 'more' => [
  28 + 'show_' => true,
  29 + 'key' => 2,
  30 + ],
  31 + 'formView' => '@frontend/views/site/comment/artbox_comment_form',
  32 + 'listView' => '@frontend/views/site/comment/artbox_comment_list',
  33 + 'replyView' => '@frontend/views/site/comment/artbox_comment_reply',
  34 + 'itemView' => '@frontend/views/site/comment/artbox_comment_item',
  35 + ]
  36 + );
  37 + ?>
13 38
14 -<div>  
15 -  
16 - <?php  
17 - echo CommentWidget::widget(  
18 - [  
19 - 'model' => $model,  
20 - 'display_name' => 'name',  
21 - 'entityIdAttribute' => 'id',  
22 - 'reply' => true,  
23 - 'delete' => false,  
24 - 'more' => [  
25 - 'show_' => true,  
26 - 'key' => 2,  
27 - ],  
28 - 'formView' => '@frontend/views/site/comment/artbox_comment_form',  
29 - 'listView' => '@frontend/views/site/comment/artbox_comment_list',  
30 - 'replyView' => '@frontend/views/site/comment/artbox_comment_reply',  
31 - 'itemView' => '@frontend/views/site/comment/artbox_comment_item',  
32 - ]  
33 - );  
34 - ?>  
35 -  
36 -</div> 39 + </div>
  40 + </div>
  41 + </div>
  42 +</div>
37 \ No newline at end of file 43 \ No newline at end of file
frontend/web/css/custom.css
  Show/Hide comments   View file @3248e2e
@@ -324,4 +324,22 @@ input[type=&quot;text&quot;].form-control{ @@ -324,4 +324,22 @@ input[type=&quot;text&quot;].form-control{
324 } 324 }
325 .price-page{ 325 .price-page{
326 margin-bottom: 50px; 326 margin-bottom: 50px;
  327 +}
  328 +.artbox_list_container .artbox_list_container{
  329 + margin:25px 0px;
  330 +}
  331 +.title-comment{
  332 + width: 730px;
  333 + margin-left: auto;
  334 + margin-right: auto;
  335 +}
  336 +.feedback-wr .form-comm-wr{
  337 + margin-bottom: 60px;
  338 +}
  339 +.comments-wr {
  340 + margin-top: 20px;
  341 + margin-bottom: 20px;
  342 +}
  343 +.artbox_list_container #list-view{
  344 + padding-top:40px;
327 } 345 }
328 \ No newline at end of file 346 \ No newline at end of file