Skip to content

T
taskonsite-архив-перенесен
Commit 9709252b authored by john's avatar john
Browse files
Options

Merge branch 't_3031' 

3105 comments
parents 3385406f 727ddeaa
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 181 deletions
common/modules/documentation/controllers/PageController.php
View file @ 9709252b
...@@ -91,9 +91,9 @@ class PageController extends \common\components\BaseController ...@@ -91,9 +91,9 @@ class PageController extends \common\components\BaseController
'html' => '@common/modules/blog/mail/messageBlog-html', 'html' => '@common/modules/blog/mail/messageBlog-html',
'text' => '@common/modules/blog/mail/messageBlog-text'], ['model' => $model] 'text' => '@common/modules/blog/mail/messageBlog-text'], ['model' => $model]
) )
->setFrom([\common\models\Settings::getValue('bids-support-email-from') => 'Заявка на подключение']) ->setFrom([\common\models\Settings::getValue('bids-support-email-from') => 'Запрос на интеграцию'])
->setTo(\common\models\Settings::getValue('article-email')) ->setTo(\common\models\Settings::getValue('article-email'))
->setSubject("Заявка на подключения к TaskOn - " . $model->primaryKey) ->setSubject("Запрос на интеграция TaskOn2 - " . $model->primaryKey)
->send(); ->send();
$transaction->commit(); $transaction->commit();
......
common/modules/faq/assets/src/css/setup_recomends.css
View file @ 9709252b
/* cyrillic-ext */ /* cyrillic-ext */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFWJ0bbck.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFWJ0bbck.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
} }
/* cyrillic */ /* cyrillic */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFUZ0bbck.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFUZ0bbck.woff2) format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
} }
/* greek-ext */ /* greek-ext */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFWZ0bbck.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFWZ0bbck.woff2) format('woff2');
unicode-range: U+1F00-1FFF; unicode-range: U+1F00-1FFF;
} }
/* greek */ /* greek */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFVp0bbck.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFVp0bbck.woff2) format('woff2');
unicode-range: U+0370-03FF; unicode-range: U+0370-03FF;
} }
/* vietnamese */ /* vietnamese */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFWp0bbck.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFWp0bbck.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
} }
/* latin-ext */ /* latin-ext */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFW50bbck.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFW50bbck.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
} }
/* latin */ /* latin */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFVZ0b.woff2) format('woff2'); src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/Open Sans/mem8YaGs126MiZpBA-UFVZ0b.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
/* cyrillic-ext */ /* cyrillic-ext */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOX-hpOqc.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOX-hpOqc.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
} }
/* cyrillic */ /* cyrillic */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOVuhpOqc.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOVuhpOqc.woff2) format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
} }
/* greek-ext */ /* greek-ext */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOXuhpOqc.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOXuhpOqc.woff2) format('woff2');
unicode-range: U+1F00-1FFF; unicode-range: U+1F00-1FFF;
} }
/* greek */ /* greek */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOUehpOqc.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOUehpOqc.woff2) format('woff2');
unicode-range: U+0370-03FF; unicode-range: U+0370-03FF;
} }
/* vietnamese */ /* vietnamese */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOXehpOqc.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOXehpOqc.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
} }
/* latin-ext */ /* latin-ext */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOXOhpOqc.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOXOhpOqc.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
} }
/* latin */ /* latin */
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOUuhp.woff2) format('woff2'); src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/Open Sans/mem5YaGs126MiZpBA-UNirkOUuhp.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
.faq_sec .mb50 { .faq_sec .mb50 {
margin-bottom: 50px; margin-bottom: 50px;
...@@ -183,6 +183,10 @@ ...@@ -183,6 +183,10 @@
.faq_sec iframe { .faq_sec iframe {
margin-bottom: 20px; margin-bottom: 20px;
} }
.faq_sec ul:not([class]){
background: url(../images/ul_list_blue.png) no-repeat left 6px;
padding-left: 30px;
}
.faq_sec ul:not([class]), .faq_sec ol:not([class]) { .faq_sec ul:not([class]), .faq_sec ol:not([class]) {
margin-bottom: 20px; margin-bottom: 20px;
font-size: 17px; font-size: 17px;
...@@ -556,155 +560,175 @@ mark * { ...@@ -556,155 +560,175 @@ mark * {
/* new 02.04.19 */ /* new 02.04.19 */
.documentation_box { .documentation_box {
margin-top: 20px; margin-top: 20px;
margin-bottom: 40px; margin-bottom: 40px;
padding: 25px 75px 25px 30px; padding: 25px 75px 25px 30px;
background: url(../images/documentation_bg.png) 0 0 no-repeat; background: url(../images/documentation_bg.png) 0 0 no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
font-size: 18px; font-size: 18px;
line-height: 28px; line-height: 28px;
position: relative; position: relative;
} }
.documentation_box h5, .documentation_box h5,
.documentation_box h4 { .documentation_box h4 {
padding-right: 140px; padding-right: 140px;
} }
.documentation_box a:hover { .documentation_box a:hover {
color: #009ad4; color: #009ad4;
text-decoration: underline; text-decoration: underline;
} }
.documentation_box:before { .documentation_box:before {
content: ""; content: "";
position: absolute; position: absolute;
right: 90px; right: 90px;
top: -70px; top: -70px;
background: url(../images/documentation_bg_icon.png) 0 0 no-repeat; background: url(../images/documentation_bg_icon.png) 0 0 no-repeat;
width: 128px; width: 128px;
height: 141px; height: 141px;
display: block; display: block;
} }
.documentation_icon { .documentation_icon {
width: 23px; width: 23px;
height: 31px; height: 31px;
display: inline-block; display: inline-block;
position: relative; position: relative;
top: 5px; top: 5px;
margin-right: 25px; margin-right: 25px;
background: url(../images/documentation_icon.png) 0 0 no-repeat; background: url(../images/documentation_icon.png) 0 0 no-repeat;
} }
@media only screen and (max-width: 1000px) { @media only screen and (max-width: 1000px) {
.documentation_box h5, .documentation_box h5,
.documentation_box h4 { .documentation_box h4 {
padding-right: 20px; padding-right: 20px;
} }
.documentation_box:before { .documentation_box:before {
right: 10px; right: 10px;
top: -70px; top: -70px;
} }
} }
@media only screen and (max-width: 479px) { @media only screen and (max-width: 479px) {
.documentation_box { .documentation_box {
padding: 25px 15px 25px 15px; padding: 25px 15px 25px 15px;
} }
.documentation_box h5, .documentation_box h5,
.documentation_box h4 { .documentation_box h4 {
padding-right: 0px; padding-right: 0px;
} }
.documentation_box:before { .documentation_box:before {
display: none; display: none;
} }
} }
.btn_green_sm { .btn_green_sm {
color: #fff !important; color: #fff !important;
} }
.btn_info_box_lg { .btn_info_box_lg {
height: 85px; height: 85px;
display: block; display: block;
position: relative; position: relative;
background-color: #f3f5f7; background-color: #f3f5f7;
border-radius: 10px; border-radius: 10px;
margin-left: 10px; margin-left: 10px;
margin-bottom: 40px; margin-bottom: 40px;
} }
.btn_info_box_lg .btn_green_sm { .btn_info_box_lg .btn_green_sm {
position: absolute; position: absolute;
right: 25px; right: 25px;
top: 50%; top: 50%;
min-width: 170px; min-width: 170px;
-webkit-transform: translate(0, -50%); -webkit-transform: translate(0, -50%);
-ms-transform: translate(0, -50%); -ms-transform: translate(0, -50%);
-o-transform: translate(0, -50%); -o-transform: translate(0, -50%);
transform: translate(0, -50%); transform: translate(0, -50%);
} }
.btn_info_box_lg span { .btn_info_box_lg span {
top: 50%; top: 50%;
left: 0px; left: 0px;
position: absolute; position: absolute;
display: block; display: block;
font-family: "RobotoRegular"; font-family: "RobotoRegular";
z-index: 4; z-index: 4;
padding-left: 50px; padding-left: 50px;
padding-right: 235px; padding-right: 235px;
font-size: 30px; font-size: 30px;
line-height: 34px; line-height: 34px;
color: #243340; color: #243340;
-webkit-transform: translate(0, -50%); -webkit-transform: translate(0, -50%);
-ms-transform: translate(0, -50%); -ms-transform: translate(0, -50%);
-o-transform: translate(0, -50%); -o-transform: translate(0, -50%);
transform: translate(0, -50%); transform: translate(0, -50%);
} }
.btn_info_box_lg:before { .btn_info_box_lg:before {
content: ''; content: '';
display: block; display: block;
z-index: 3; z-index: 3;
position: absolute; position: absolute;
top: -30px; top: -30px;
left: -70px; left: -70px;
width: 220px; width: 220px;
height: 146px; height: 146px;
background: url(../images/btn_info_box_lg_icon.png) 0 0 no-repeat; background: url(../images/btn_info_box_lg_icon.png) 0 0 no-repeat;
} }
/*{ /*{
background-color: #f3f5f7; background-color: #f3f5f7;
}*/ }*/
@media only screen and (max-width: 970px) { @media only screen and (max-width: 970px) {
.btn_info_box_lg span { .btn_info_box_lg span {
font-size: 24px; font-size: 24px;
line-height: 30px; line-height: 30px;
} }
} }
@media only screen and (max-width: 768px) { @media only screen and (max-width: 768px) {
.btn_info_box_lg span { .btn_info_box_lg span {
font-size: 18px; font-size: 18px;
line-height: 24px; line-height: 24px;
} }
.btn_info_box_lg .btn_green_sm { .btn_info_box_lg .btn_green_sm {
min-width: 120px; min-width: 120px;
} }
.btn_info_box_lg span { .btn_info_box_lg span {
padding-right: 175px; padding-right: 175px;
padding-left: 30px; padding-left: 30px;
} }
} }
@media only screen and (max-width: 479px) { @media only screen and (max-width: 479px) {
.btn_info_box_lg span { .btn_info_box_lg span {
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
} }
.btn_info_box_lg span { .btn_info_box_lg span {
padding-right: 165px; padding-right: 165px;
padding-left: 15px; padding-left: 15px;
} }
} }
.icon_like { .icon_like {
background: url(../images/icon_like.png) 0 center no-repeat; background: url(../images/icon_like.png) 0 center no-repeat;
} }
.icon_not_like { .icon_not_like {
background: url(../images/icon_not_like.png) 0 center no-repeat; background: url(../images/icon_not_like.png) 0 center no-repeat;
}
.reference_right_box textarea {
border-radius: 3px;
}
.reference_left_box table:not([class]) {
margin-bottom: 20px;
}
.reference_left_box table:not([class]) tr th {
background-color: transparent;
border: none;
border-bottom: 2px solid #dee2e6;
border-top: 1px solid #dee2e6;
padding: .75rem;
}
.reference_left_box table:not([class]) tr td {
border-top: 1px solid #dee2e6;
padding: .75rem;
} }
\ No newline at end of file
common/modules/faq/assets/src/css/styles.css
View file @ 9709252b
...@@ -8200,7 +8200,7 @@ ol.linenums { ...@@ -8200,7 +8200,7 @@ ol.linenums {
} }
.offcanvas-wrapper ul:not([class])>li { .offcanvas-wrapper ul:not([class])>li {
background: url(../images/ul_list_blue.png) no-repeat left 6px;; background: url(../images/ul_list_blue.png) no-repeat left 6px;
padding-left: 30px; padding-left: 30px;
} }
......
frontend/messages/ru-RU/blog.php
View file @ 9709252b
...@@ -27,7 +27,7 @@ For example: write about CRM" => "Что хочу почитать? ...@@ -27,7 +27,7 @@ For example: write about CRM" => "Что хочу почитать?
'Connection request' => 'Запрос на подключение', 'Connection request' => 'Запрос на подключение',
'Request access' => 'Запросить доступ', 'Request access' => 'Запросить доступ',
'Access to the repository (the source code platform Task On 2) is sent on request.' 'Access to the repository (the source code platform Task On 2) is sent on request.'
=> 'Доступ к репозиторию (исходному коду платформы TaskOn 2) отправляется по запросу.', => 'Опишите в форме ниже задачу, которую требуется реализовать.',
'Describe briefly for which tasks you want to use the TaskOn platform? *' => 'Опишите коротко для каких задач вы хотите использовать платформу TaskOn?*', 'Describe briefly for which tasks you want to use the TaskOn platform? *' => 'Опишите коротко для каких задач вы хотите использовать платформу TaskOn?*',
'Connection request sent. We will consider it.' => 'Запрос на подключение отправлен. Мы обязательно его рассмотрим.', 'Connection request sent. We will consider it.' => 'Запрос на подключение отправлен. Мы обязательно его рассмотрим.',
]; ];
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 - ООО "Арт Проект"