Skip to content

T
taskonsite-архив-перенесен
Commit 7dc3cab1 authored by Шакарим Сапа's avatar Шакарим Сапа
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents bcf39fe8 493e7227
Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 100 deletions
common/modules/blog/controllers/PostController.php
View file @ 7dc3cab1
...@@ -138,7 +138,7 @@ class PostController extends BaseController ...@@ -138,7 +138,7 @@ class PostController extends BaseController
{ {
try try
{ {
$email = 'Levshin@kupitsite.ru'; $email = Settings::getValue('article-email');
$message = $this->renderPartial('_mail', [ $message = $this->renderPartial('_mail', [
'model' => $model 'model' => $model
......
common/modules/reviews/forms/ReviewForm.php
View file @ 7dc3cab1
...@@ -35,21 +35,22 @@ return [ ...@@ -35,21 +35,22 @@ return [
'items' => ['active' => 'Активен', 'hidden' => 'Скрыт'], 'items' => ['active' => 'Активен', 'hidden' => 'Скрыт'],
'class' => 'form-control' 'class' => 'form-control'
], ],
'rate_usability' => [ 'priority' => ['type' => 'text', 'class' => 'form-control'],
'type' => 'dropdownlist', // 'rate_usability' => [
'items' => Reviews::getSource('rate_usability'), // 'type' => 'dropdownlist',
'class' => 'form-control' // 'items' => Reviews::getSource('rate_usability'),
], // 'class' => 'form-control'
'rate_loyality' => [ // ],
'type' => 'dropdownlist', // 'rate_loyality' => [
'items' => Reviews::getSource('rate_loyality'), // 'type' => 'dropdownlist',
'class' => 'form-control' // 'items' => Reviews::getSource('rate_loyality'),
], // 'class' => 'form-control'
'rate_profit' => [ // ],
'type' => 'dropdownlist', // 'rate_profit' => [
'items' => Reviews::getSource('rate_profit'), // 'type' => 'dropdownlist',
'class' => 'form-control' // 'items' => Reviews::getSource('rate_profit'),
], // 'class' => 'form-control'
// ],
], ],
'buttons' => [ 'buttons' => [
'submit' => ['type' => 'submit', 'value' => 'Cохранить'] 'submit' => ['type' => 'submit', 'value' => 'Cохранить']
......
common/modules/reviews/models/Reviews.php
View file @ 7dc3cab1
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace common\modules\reviews\models; namespace common\modules\reviews\models;
use Yii; use Yii;
use yii\behaviors\TimestampBehavior;
/** /**
* This is the model class for table "reviews". * This is the model class for table "reviews".
...@@ -90,6 +91,12 @@ class Reviews extends \common\components\ActiveRecordModel ...@@ -90,6 +91,12 @@ class Reviews extends \common\components\ActiveRecordModel
'folder' => '/uploads/reviews/', 'folder' => '/uploads/reviews/',
'field' => 'photo' 'field' => 'photo'
], ],
'timestamp' => [
'class' => TimestampBehavior::className(),
'createdAtAttribute' => 'created_at',
'updatedAtAttribute' => 'updated_at',
'value' => time(),
],
]; ];
} }
...@@ -132,7 +139,7 @@ class Reviews extends \common\components\ActiveRecordModel ...@@ -132,7 +139,7 @@ class Reviews extends \common\components\ActiveRecordModel
'state' => Yii::t('reviews', 'Состояние'), 'state' => Yii::t('reviews', 'Состояние'),
'date' => Yii::t('reviews', 'Дата'), 'date' => Yii::t('reviews', 'Дата'),
'date_create' => Yii::t('reviews', 'Создана'), 'date_create' => Yii::t('reviews', 'Создана'),
'priority' => Yii::t('reviews', 'Priority'), 'priority' => Yii::t('reviews', 'Приоритет'),
'email' => Yii::t('reviews', 'Email'), 'email' => Yii::t('reviews', 'Email'),
'notification_date' => Yii::t('reviews', 'Notification Date'), 'notification_date' => Yii::t('reviews', 'Notification Date'),
'notification_send' => Yii::t('reviews', 'Notification Send'), 'notification_send' => Yii::t('reviews', 'Notification Send'),
......
frontend/views/layouts/block/about-reviews.php
View file @ 7dc3cab1
...@@ -4,7 +4,7 @@ use yii\helpers\Html; ...@@ -4,7 +4,7 @@ use yii\helpers\Html;
$reviews = Reviews::find() $reviews = Reviews::find()
->where(['state' => 'active']) ->where(['state' => 'active'])
->orderBy('created_at DESC') ->orderBy(['priority' => SORT_ASC])
->limit(1) ->limit(1)
->all(); ->all();
?> ?>
......
frontend/views/layouts/block/reviews.php
View file @ 7dc3cab1
...@@ -4,7 +4,7 @@ use yii\helpers\Html; ...@@ -4,7 +4,7 @@ use yii\helpers\Html;
$reviews = Reviews::find() $reviews = Reviews::find()
->where(['state' => 'active']) ->where(['state' => 'active'])
->orderBy('created_at DESC') ->orderBy(['priority' => SORT_ASC])
->all(); ->all();
?> ?>
<?php if($reviews) : ?> <?php if($reviews) : ?>
......
frontend/web/css/custom.css
View file @ 7dc3cab1
...@@ -1841,6 +1841,132 @@ a.keys_test_btn { ...@@ -1841,6 +1841,132 @@ a.keys_test_btn {
.support-block .form-control { .support-block .form-control {
float: none !important; float: none !important;
} }
.simple-section {
background: white;
color: #2d323a;
padding-top: 30px;
padding-bottom: 30px;
}
.simple-section p {
font-size: 17px;
line-height: 26px;
color: #2d323a;
}
.simple-section em {
font-style: italic;
}
.simple-section h1,
.simple-section h2,
.simple-section h3,
.simple-section h4,
.simple-section h5,
.simple-section h6 {
color: #444;
font-family: "RobotoBold";
margin: 30px 0 36px;
text-align: left;
}
.simple-section h1 {
font-size: 31px;
}
.simple-section h2 {
font-size: 28px;
}
.simple-section h3 {
font-size: 25px;
}
.simple-section h4 {
font-size: 22px;
}
.simple-section h5 {
font-size: 19px;
}
.simple-section h6 {
font-size: 16px;
}
.simple-section.dark {
background: url(../images/no_found_bg.jpg) repeat-y center center;
background-size: cover;
-moz-background-size: cover;
-webkit-background-size: cover;
-o-background-size: cover;
}
.simple-section ul {
list-style: none !important;
margin-top: 14px !important;
}
.simple-section ul li {
background: url(../images/how_rosneft_list.png) no-repeat left 6px;
padding-left: 27px !important;
margin-bottom: 14px !important;
font-size: 21px;
color: #2d323a;
font-family: "RobotoBold";
}
.simple-section ol {
margin-top: 14px !important;
padding-left: 47px !important;
list-style: none !important;
}
.simple-section ol li {
margin-bottom: 14px !important;
font-size: 21px;
color: #2d323a;
font-family: "RobotoBold";
position: relative;
}
.simple-section ol li:before {
counter-increment: myCounter;
content: counter(myCounter);
color: #fff;
font-size: 15px;
font-family: "RobotoBold";
background: #00AEC7;
display: block;
position: absolute;
top: -5px;
left: -37px;
text-align: center;
margin: 4px 12px 4px 4px;
line-height: 23px;
width: 23px;
height: 23px;
border-radius: 50px;
-moz-border-radius: 50px;
-webkit-border-radius: 50px;
-o-border-radius: 50px;
-ms-border-radius: 50px;
}
.simple-section table td {
font-size: 14px;
line-height: 20px;
background-color: #fff;
padding: 15px 20px;
border: 1px solid #c2c2c2;
}
.simple-section table tr:first-child td {
font-size: 16px;
line-height: 20px;
color: #fff;
font-family: "RobotoBold";
background-color: #49acc5;
padding: 15px 20px;
border: 1px solid #fff;
border-bottom: 0;
border-top: 0;
}
.simple-section table tr:first-child td:first-child {
border-left: 0;
}
...@@ -2199,6 +2325,7 @@ width: 95%; ...@@ -2199,6 +2325,7 @@ width: 95%;
color: #3698cf; color: #3698cf;
} }
.prom_b_cont h3 { .prom_b_cont h3 {
font-size: 30px; font-size: 30px;
line-height: 36px; line-height: 36px;
...@@ -2454,10 +2581,6 @@ width: 95%; ...@@ -2454,10 +2581,6 @@ width: 95%;
display: none; display: none;
} }
.bx-wrapper .bx-next:hover {
background: #00bce7 url(../images/arrow_right.png) no-repeat center center;
}
@media only screen and (max-width: 969px) { @media only screen and (max-width: 969px) {
...@@ -2484,7 +2607,9 @@ width: 95%; ...@@ -2484,7 +2607,9 @@ width: 95%;
.prom_b_laptop_text_2 { .prom_b_laptop_text_2 {
left: 342px; left: 342px;
} }
.top_prom_b_wr {
overflow: hidden;
}
} }
...@@ -2654,86 +2779,17 @@ width: 95%; ...@@ -2654,86 +2779,17 @@ width: 95%;
padding-bottom: 20px; padding-bottom: 20px;
} }
.up-button-container {
display: none;
} }
.prom_b_cont h2 {
.simple-section { font-size: 26px;
background: white;
color: #2d323a;
padding-top: 30px;
padding-bottom: 30px;
}
.simple-section p {
font-size: 17px;
line-height: 26px;
color: #2d323a;
}
.simple-section em {
font-style: italic;
}
.simple-section h1,
.simple-section h2,
.simple-section h3,
.simple-section h4,
.simple-section h5,
.simple-section h6 {
color: #444;
font-family: "RobotoBold";
margin: 30px 0 36px;
text-align: left;
}
.simple-section h1 {
font-size: 31px;
}
.simple-section h2 {
font-size: 28px;
}
.simple-section h3 {
font-size: 25px;
}
.simple-section h4 {
font-size: 22px;
}
.simple-section h5 {
font-size: 19px;
}
.simple-section h6 {
font-size: 16px;
}
.simple-section.dark {
background: url(../images/no_found_bg.jpg) repeat-y center center;
background-size: cover;
-moz-background-size: cover;
-webkit-background-size: cover;
-o-background-size: cover;
}
.simple-section ul {
list-style: none !important;
margin-top: 14px !important;
} }
.simple-section ul li {
background: url(../images/how_rosneft_list.png) no-repeat left 6px;
padding-left: 27px !important;
margin-bottom: 14px !important;
font-size: 21px;
color: #2d323a;
font-family: "RobotoBold";
} }
.simple-section ol { @media only screen and (max-width: 479px) and (min-width: 320px) {
margin-top: 14px !important; .container {
padding-left: 47px !important; width: 320px !important;
} }
.simple-section ol li {
margin-bottom: 14px !important;
font-size: 21px;
color: #2d323a;
font-family: "RobotoBold";
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"