Commit 99b10610293ac140c25f55db083eb4d19f6a2102
1 parent
b433e560
Блог
Showing
7 changed files
with
111 additions
and
8 deletions
Show diff stats
frontend/views/blog/_article.php
| @@ -29,15 +29,19 @@ | @@ -29,15 +29,19 @@ | ||
| 29 | <?php } ?> | 29 | <?php } ?> |
| 30 | 30 | ||
| 31 | <?php if (!empty($model->tags)) { | 31 | <?php if (!empty($model->tags)) { |
| 32 | + ?> | ||
| 33 | + <div class="post-tags"> | ||
| 34 | + <?php | ||
| 32 | foreach ($model->tags as $tag) { | 35 | foreach ($model->tags as $tag) { |
| 33 | ?> | 36 | ?> |
| 34 | - <p><a href="<?= Url::to( | 37 | + <p class="post-tag"><a href="<?= Url::to( |
| 35 | [ | 38 | [ |
| 36 | 'blog/tag', | 39 | 'blog/tag', |
| 37 | 'alias' => $tag->lang->alias, | 40 | 'alias' => $tag->lang->alias, |
| 38 | ] | 41 | ] |
| 39 | ) ?>"><?= $tag->lang->label ?></a></p> | 42 | ) ?>"><?= $tag->lang->label ?></a></p> |
| 40 | <?php } | 43 | <?php } |
| 44 | + ?></div><?php | ||
| 41 | } ?> | 45 | } ?> |
| 42 | </div> | 46 | </div> |
| 43 | <div class="col-sm-6"> | 47 | <div class="col-sm-6"> |
| @@ -83,12 +87,12 @@ | @@ -83,12 +87,12 @@ | ||
| 83 | ) ?> | 87 | ) ?> |
| 84 | </a> | 88 | </a> |
| 85 | </div> | 89 | </div> |
| 86 | - <p class="intro"><?= $model->lang->body_preview ?></p> | 90 | + <p class="intro"><?= \yii\helpers\StringHelper::truncate($model->lang->body_preview, 350) ?></p> |
| 87 | <p class="read-more"><a href="<?= Url::to( | 91 | <p class="read-more"><a href="<?= Url::to( |
| 88 | [ | 92 | [ |
| 89 | 'blog/article', | 93 | 'blog/article', |
| 90 | 'alias' => $model->lang->alias, | 94 | 'alias' => $model->lang->alias, |
| 91 | ] | 95 | ] |
| 92 | - ) ?>" class="btn btn-template-main">Continue reading</a> | 96 | + ) ?>" class="btn btn-template-main">Читать далее</a> |
| 93 | </p> | 97 | </p> |
| 94 | </section> | 98 | </section> |
frontend/views/blog/article.php
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | 13 | ||
| 14 | $this->params[ 'breadcrumbs' ][] = [ | 14 | $this->params[ 'breadcrumbs' ][] = [ |
| 15 | 'url' => [ 'blog/index' ], | 15 | 'url' => [ 'blog/index' ], |
| 16 | - 'label' => \Yii::t('app', 'Блог'), | 16 | + 'label' => \Yii::t('app', 'Статьи'), |
| 17 | ]; | 17 | ]; |
| 18 | 18 | ||
| 19 | $this->params[ 'breadcrumbs' ][] = $model->lang->title; | 19 | $this->params[ 'breadcrumbs' ][] = $model->lang->title; |
| @@ -53,6 +53,8 @@ _________________________________________________________ --> | @@ -53,6 +53,8 @@ _________________________________________________________ --> | ||
| 53 | 53 | ||
| 54 | </div> | 54 | </div> |
| 55 | <!-- /#post-content --> | 55 | <!-- /#post-content --> |
| 56 | + | ||
| 57 | + | ||
| 56 | 58 | ||
| 57 | <?php | 59 | <?php |
| 58 | echo CommentWidget::widget( | 60 | echo CommentWidget::widget( |
frontend/views/comment/artbox_comment_form.php
| @@ -28,6 +28,7 @@ | @@ -28,6 +28,7 @@ | ||
| 28 | ); | 28 | ); |
| 29 | ?> | 29 | ?> |
| 30 | <div class="form-comm-wr"> | 30 | <div class="form-comm-wr"> |
| 31 | + <h4 class="text-uppercase">Оставить комментарий</h4> | ||
| 31 | <?php | 32 | <?php |
| 32 | if (!empty($rating_model)) { | 33 | if (!empty($rating_model)) { |
| 33 | ?> | 34 | ?> |
| @@ -52,14 +53,14 @@ | @@ -52,14 +53,14 @@ | ||
| 52 | echo $form->field($comment_model, 'username', [ 'options' => [ 'class' => 'form-group input_bl' ] ]) | 53 | echo $form->field($comment_model, 'username', [ 'options' => [ 'class' => 'form-group input_bl' ] ]) |
| 53 | ->textInput(); | 54 | ->textInput(); |
| 54 | echo $form->field($comment_model, 'email', [ 'options' => [ 'class' => 'form-group input_bl' ] ]) | 55 | echo $form->field($comment_model, 'email', [ 'options' => [ 'class' => 'form-group input_bl' ] ]) |
| 55 | - ->textInput(); | 56 | + ->textInput([ 'options' => [ 'class' => 'form-control' ] ]); |
| 56 | } | 57 | } |
| 57 | echo $form->field($comment_model, 'text', [ 'options' => [ 'class' => 'form-group input_bl area_bl' ] ]) | 58 | echo $form->field($comment_model, 'text', [ 'options' => [ 'class' => 'form-group input_bl area_bl' ] ]) |
| 58 | ->textarea(); | 59 | ->textarea(); |
| 59 | echo Html::tag( | 60 | echo Html::tag( |
| 60 | 'div', | 61 | 'div', |
| 61 | Html::submitButton( | 62 | Html::submitButton( |
| 62 | - Yii::t('app', 'Submit comment') | 63 | + Yii::t('app', '<i class="fa fa-comment-o"></i> Отправить') |
| 63 | ), | 64 | ), |
| 64 | [ 'class' => 'input_bl submit_btn' ] | 65 | [ 'class' => 'input_bl submit_btn' ] |
| 65 | ); | 66 | ); |
frontend/views/comment/artbox_comment_item.php
| @@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
| 111 | if (!empty($child->customer)) { | 111 | if (!empty($child->customer)) { |
| 112 | echo $child->customer->$nameField; | 112 | echo $child->customer->$nameField; |
| 113 | } else { | 113 | } else { |
| 114 | - echo $child->username . ' (' . Yii::t('artbox-comment', 'Guest') . ')'; | 114 | + echo $child->username . ' (' . Yii::t('artbox-comment', 'Гость') . ')'; |
| 115 | } | 115 | } |
| 116 | ?> | 116 | ?> |
| 117 | </div> | 117 | </div> |
frontend/views/comment/artbox_comment_list.php
| @@ -23,6 +23,8 @@ | @@ -23,6 +23,8 @@ | ||
| 23 | if(( $success = \Yii::$app->session->getFlash('artbox_comment_success') ) != NULL) { | 23 | if(( $success = \Yii::$app->session->getFlash('artbox_comment_success') ) != NULL) { |
| 24 | echo Html::tag('p', $success); | 24 | echo Html::tag('p', $success); |
| 25 | } | 25 | } |
| 26 | + echo '<div class="comments-border"></div>'; | ||
| 27 | + echo '<h4 class="text-uppercase">Комментарии</h4>'; | ||
| 26 | echo ListView::widget([ | 28 | echo ListView::widget([ |
| 27 | 'dataProvider' => $comments, | 29 | 'dataProvider' => $comments, |
| 28 | 'itemOptions' => $item_options, | 30 | 'itemOptions' => $item_options, |
frontend/views/site/contact.php
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | MapAsset::register($this); | 15 | MapAsset::register($this); |
| 16 | $settings = Settings::getInstance(); | 16 | $settings = Settings::getInstance(); |
| 17 | 17 | ||
| 18 | - $this->title = \Yii::t('app', 'Contact'); | 18 | + $this->title = \Yii::t('app', 'Контакты'); |
| 19 | $this->params[ 'breadcrumbs' ][] = $this->title; | 19 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 20 | 20 | ||
| 21 | $js = <<< JS | 21 | $js = <<< JS |
frontend/web/css/custom.css
| @@ -199,6 +199,100 @@ | @@ -199,6 +199,100 @@ | ||
| 199 | ul.list-style-none { | 199 | ul.list-style-none { |
| 200 | padding: 0; | 200 | padding: 0; |
| 201 | } | 201 | } |
| 202 | +.read-more{ | ||
| 203 | + margin-top: 20px; | ||
| 204 | +} | ||
| 205 | +.post-tags{ | ||
| 206 | + margin-top: 15px; | ||
| 207 | + margin-bottom: 15px; | ||
| 208 | +} | ||
| 209 | +.post-tags:after{ | ||
| 210 | + content:''; | ||
| 211 | + display:block; | ||
| 212 | + clear:both; | ||
| 213 | +} | ||
| 214 | +.post-tag { | ||
| 215 | + float: left; | ||
| 216 | +} | ||
| 217 | +.post-tag a{ | ||
| 218 | + border: 1px solid #eeeeee; | ||
| 219 | + padding: 4px 12px; | ||
| 220 | + margin-right: 5px; | ||
| 221 | + position: relative; | ||
| 222 | + text-decoration: none; | ||
| 223 | +} | ||
| 224 | +.post-tag a:hover{ | ||
| 225 | + border: 1px solid #4fbfa8; | ||
| 226 | +} | ||
| 227 | +.artbox_form_container:after, .list-view:after,.input_bl.submit_btn:after, .form-comm-wr .input_bl:after{ | ||
| 228 | + content:''; | ||
| 229 | + display:block; | ||
| 230 | + clear:both; | ||
| 231 | +} | ||
| 232 | +.input_bl.stars-wr_{ | ||
| 233 | + float:none; | ||
| 234 | +} | ||
| 235 | +.artbox_list_container .list-view{ | ||
| 236 | + margin-bottom:40px; | ||
| 237 | +} | ||
| 238 | +.form-comm-wr .input_bl.submit_btn button[type='submit']{ | ||
| 239 | + background: none; | ||
| 240 | + border: 1px solid #d2d2d2; | ||
| 241 | + color: #7d7d7d; | ||
| 242 | + border-radius: 0px; | ||
| 243 | + text-transform: uppercase; | ||
| 244 | +} | ||
| 245 | +.form-comm-wr .input_bl.submit_btn button[type='submit']:hover{ | ||
| 246 | + background: #4fbfa8; | ||
| 247 | + border: 1px solid #4fbfa8; | ||
| 248 | + color: #fff; | ||
| 249 | +} | ||
| 250 | +.input_bl.submit_btn{ | ||
| 251 | + float: right; | ||
| 252 | + margin-top: 27px; | ||
| 253 | + width: 100%; | ||
| 254 | + text-align: center; | ||
| 255 | +} | ||
| 256 | +.form-comm-wr{ | ||
| 257 | + background:none; | ||
| 258 | + padding:0; | ||
| 259 | + width:100%; | ||
| 260 | +} | ||
| 261 | +.artbox_form_container{ | ||
| 262 | + padding: 0; | ||
| 263 | + margin-top: -10px; | ||
| 264 | +} | ||
| 265 | +.form-comm-wr .form-group { | ||
| 266 | + margin-bottom: 10px; | ||
| 267 | + position: relative; | ||
| 268 | + float: none; | ||
| 269 | +} | ||
| 270 | +.form-comm-wr .form-group label.control-label{ | ||
| 271 | + width: inherit; | ||
| 272 | + float: none; | ||
| 273 | + text-transform: none; | ||
| 274 | + font-size: 14px; | ||
| 275 | + color: black; | ||
| 276 | + margin: 5px 0px; | ||
| 277 | +} | ||
| 278 | +input[type="text"].form-control{ | ||
| 279 | + border-radius: 0; | ||
| 280 | + padding: 17px 13px; | ||
| 281 | +} | ||
| 282 | +.input_bl input{ | ||
| 283 | + width: 100%; | ||
| 284 | + max-width: 400px; | ||
| 285 | +} | ||
| 286 | +.area_bl textarea, .answer-form textarea{ | ||
| 287 | + border-radius: 0; | ||
| 288 | + width: 100%; | ||
| 289 | + height: 160px; | ||
| 290 | +} | ||
| 291 | +.tag-cloud li.active a { | ||
| 292 | + color: #fff!important; | ||
| 293 | + background-color: #4fbfa8; | ||
| 294 | + border-color: #4fbfa8!important; | ||
| 295 | +} | ||
| 202 | @media (max-width: 1199px){ | 296 | @media (max-width: 1199px){ |
| 203 | .header-kristal .container .img-responsive{ | 297 | .header-kristal .container .img-responsive{ |
| 204 | margin-bottom: -68px; | 298 | margin-bottom: -68px; |