Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 464ede30 8f9233b8
Showing 7 changed files with 127 additions and 11 deletions Show diff stats
frontend/views/blog/_article.php
frontend/views/blog/article.php
frontend/views/comment/artbox_comment_form.php
frontend/views/comment/artbox_comment_item.php
frontend/views/comment/artbox_comment_list.php
frontend/views/site/contact.php
frontend/web/css/custom.css
@@ -29,15 +29,19 @@
         <?php } ?>
         <?php if (!empty($model->tags)) {
+            ?>
+            <div class="post-tags">
+            <?php
             foreach ($model->tags as $tag) {
                 ?>
-              <p><a href="<?= Url::to(
+              <p class="post-tag"><a href="<?= Url::to(
                       [
                           'blog/tag',
                           'alias' => $tag->lang->alias,
                       ]
                   ) ?>"><?= $tag->lang->label ?></a></p>
             <?php }
+            ?></div><?php
         } ?>
     </div>
     <div class="col-sm-6">
@@ -83,12 +87,12 @@
                        ) ?>
     </a>
   </div>
-  <p class="intro"><?= $model->lang->body_preview ?></p>
+  <p class="intro"><?= \yii\helpers\StringHelper::truncate($model->lang->body_preview, 350) ?></p>
   <p class="read-more"><a href="<?= Url::to(
           [
               'blog/article',
               'alias' => $model->lang->alias,
           ]
-      ) ?>" class="btn btn-template-main">Continue reading</a>
+      ) ?>" class="btn btn-template-main">Читать далее</a>
   </p>
 </section>
@@ -13,7 +13,7 @@
     $this->params[ 'breadcrumbs' ][] = [
         'url'   => [ 'blog/index' ],
-        'label' => \Yii::t('app', 'Блог'),
+        'label' => \Yii::t('app', 'Статьи'),
     ];
     $this->params[ 'breadcrumbs' ][] = $model->lang->title;
@@ -53,6 +53,8 @@ _________________________________________________________ --&gt;
         </div>
         <!-- /#post-content -->
+        
+
           <?php
               echo CommentWidget::widget(
@@ -28,6 +28,7 @@
     );
 ?>
   <div class="form-comm-wr">
+      <h4 class="text-uppercase">Оставить комментарий</h4>
       <?php
           if (!empty($rating_model)) {
               ?>
@@ -52,14 +53,14 @@
               echo $form->field($comment_model, 'username', [ 'options' => [ 'class' => 'form-group input_bl' ] ])
                         ->textInput();
               echo $form->field($comment_model, 'email', [ 'options' => [ 'class' => 'form-group input_bl' ] ])
-                        ->textInput();
+                        ->textInput([ 'options' => [ 'class' => 'form-control' ] ]);
           }
           echo $form->field($comment_model, 'text', [ 'options' => [ 'class' => 'form-group input_bl area_bl' ] ])
                     ->textarea();
           echo Html::tag(
               'div',
               Html::submitButton(
-                Yii::t('app', 'Submit comment')
+                Yii::t('app', '<i class="fa fa-comment-o"></i> Отправить')
               ),
               [ 'class' => 'input_bl submit_btn' ]
           );
@@ -111,7 +111,7 @@
                           if (!empty($child->customer)) {
                               echo $child->customer->$nameField;
                           } else {
-                              echo $child->username . ' (' . Yii::t('artbox-comment', 'Guest') . ')';
+                              echo $child->username . ' (' . Yii::t('artbox-comment', 'Гость') . ')';
                           }
                       ?>
                   </div>
@@ -23,6 +23,8 @@
     if(( $success = \Yii::$app->session->getFlash('artbox_comment_success') ) != NULL) {
         echo Html::tag('p', $success);
     }
+echo '<div class="comments-border"></div>';
+echo '<h4 class="text-uppercase">Комментарии</h4>';
     echo ListView::widget([
         'dataProvider' => $comments,
         'itemOptions'  => $item_options,
@@ -48,7 +50,7 @@
                 return "<a id='hide_more_link' style='cursor:pointer'>Скрыть комментарии</a></div>";
             }
-}
+        }
     ]);
@@ -15,7 +15,7 @@
     MapAsset::register($this);
     $settings = Settings::getInstance();
-    $this->title = \Yii::t('app', 'Contact');
+    $this->title = \Yii::t('app', 'Контакты');
     $this->params[ 'breadcrumbs' ][] = $this->title;
     $js = <<< JS
@@ -95,7 +95,7 @@
     text-align: center;
     line-height: 50px;
     font-size: 32px;
-    background: #38a7bb;
+    background: #4fbfa8;
     color: #fff;
     cursor: pointer;
     text-decoration: none;
@@ -107,7 +107,8 @@
 }
 #back-to-top:hover {
-    background: #20616d;
+    transition:0.2s;
+    background: #206b5c;
     color: #fff;
 }
@@ -199,6 +200,112 @@
 ul.list-style-none {
     padding: 0;
 }
+.read-more{
+    margin-top: 20px;
+}
+.post-tags{
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
+.post-tags:after{
+    content:'';
+    display:block;
+    clear:both;
+}
+.post-tag {
+    float: left;
+}
+.post-tag a{
+    border: 1px solid #eeeeee;
+    padding: 4px 12px;
+    margin-right: 5px;
+    position: relative;
+    text-decoration: none;
+}
+.post-tag a:hover{
+    border: 1px solid #4fbfa8;
+}
+.artbox_form_container:after, .list-view:after,.input_bl.submit_btn:after, .form-comm-wr .input_bl:after{
+    content:'';
+    display:block;
+    clear:both;
+}
+.input_bl.stars-wr_{
+    float:none;
+}
+.artbox_list_container .list-view{
+    margin-bottom:40px;
+}
+.form-comm-wr .input_bl.submit_btn button[type='submit']{
+    background: none;
+    border: 1px solid #d2d2d2;
+    color: #7d7d7d;
+    border-radius: 0px;
+    text-transform: uppercase;
+}
+.form-comm-wr .input_bl.submit_btn button[type='submit']:hover{
+    background: #4fbfa8;
+    border: 1px solid #4fbfa8;
+    color: #fff;
+}
+.input_bl.submit_btn{
+    float: right;
+    margin-top: 27px;
+    width: 100%;
+    text-align: center;
+}
+.form-comm-wr{
+    background:none;
+    padding:0;
+    width:100%;
+}
+.artbox_form_container{
+    padding: 0;
+    margin-top: -10px;
+}
+.form-comm-wr .form-group {
+    margin-bottom: 10px;
+    position: relative;
+    float: none;
+}
+.form-comm-wr .form-group label.control-label{
+    width: inherit;
+    float: none;
+    text-transform: none;
+    font-size: 14px;
+    color: black;
+    margin: 5px 0px;
+}
+input[type="text"].form-control{
+    border-radius: 0;
+    padding: 17px 13px;
+}
+.input_bl input{
+    width: 100%;
+    max-width: 400px;
+}
+.area_bl textarea, .answer-form textarea{
+    border-radius: 0;
+    width: 100%;
+    height: 160px;
+}
+.tag-cloud li.active a {
+    color: #fff!important;
+    background-color: #4fbfa8;
+    border-color: #4fbfa8!important;
+}
+.post .image{
+    max-height:300px;
+    overflow:hidden;
+}
+.post .image a{
+    height: 300px;
+    overflow: hidden;
+    display: block;
+}
+.post .img-responsive{
+    width:100%;
+}
 @media (max-width: 1199px){
     .header-kristal .container .img-responsive{
         margin-bottom: -68px;