Skip to content

T
taskonsite-архив-перенесен
Commit 445c9700 authored by Виталий Мурашко's avatar Виталий Мурашко
Browse files
Options

Merge branch 'master' of http://git.task-on.com/ktask/task-on.com

parents e4a4094a 88a272fc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2690 additions and 719 deletions
common/modules/bids/models/Bid.php
View file @ 445c9700
......@@ -26,6 +26,8 @@ class Bid extends \common\components\ActiveRecordModel
const FORM_PROJECT = 'project';
const FORM_MESSAGE = 'message';
const TAG_INVOLVEMENT = 'Вовлечение';
const FILE_FOLDER = '/uploads/bids/';
public $file;
......@@ -37,6 +39,11 @@ class Bid extends \common\components\ActiveRecordModel
self::FORM_MESSAGE => 'Сообщение с сайта',
];
public static $tag_titles = [
self::TAG_INVOLVEMENT => 'Вовлечение',
self::FORM_SUBSCRIBE => 'Ошибки',
];
/**
* @inheritdoc
*/
......@@ -129,7 +136,7 @@ class Bid extends \common\components\ActiveRecordModel
"Content-Transfer-Encoding: 8bit\r\n".
"Content-Type: text/html; charset=\"UTF-8\"\r\n".
"X-Mailer: PHP v.".phpversion()."\r\n".
"From: Заявка с сайта TaskOn <robot@task-on.com>\r\n";
"From: Заявка с сайта TaskOn <".Settings::getValue('bids-support-email-from').">\r\n";
$subject = "Заявка с сайта TaskOn";
......
common/modules/blog/views/post/_subscribe.php
View file @ 445c9700
......@@ -11,18 +11,23 @@ use common\modules\bids\models\Bid;
<?php
$model = new Bid;
$model->scenario = Bid::SCENARIO_SUBSCRIBE;
$model->setScenario(Bid::SCENARIO_SUBSCRIBE);
$model->form = Bid::FORM_SUBSCRIBE;
$form = ActiveForm::begin([
'action' => '/',
'enableClientValidation' => false,
'options' => [
'class' => 'subsc_blog_form bids-form',
'data-title' => $title,
'data-form' => 'Подпись на обновления в блоге',
'data-tag' => Bid::TAG_INVOLVEMENT
],
]); ?>
<?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
<?php echo Html::hiddenInput('Bid[form]', Bid::FORM_SUBSCRIBE, ['class' => 'not_clear']); ?>
<?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
<?php echo $form->field($model, 'email', [
'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
......
common/modules/blog/views/post/index.php
View file @ 445c9700
......@@ -57,7 +57,7 @@ use yii\helpers\Url;
<?php endforeach; ?>
<?=$this->render('_subscribe')?>
<?=$this->render('_subscribe', ['title' => 'Страница Блог'])?>
</section>
</div>
......@@ -68,6 +68,6 @@ use yii\helpers\Url;
</div>
</div>
<div class="end_keys_neft"></div>
<!-- <div class="end_keys_neft"></div> -->
<?=$this->render('@app/views/layouts/footer');?>
\ No newline at end of file
common/modules/blog/views/post/tag.php
View file @ 445c9700
......@@ -57,7 +57,7 @@ use yii\helpers\Url;
<?php endforeach; ?>
<?=$this->render('_subscribe')?>
<?=$this->render('_subscribe', ['title' => 'Тег: ' . $model->name])?>
</section>
</div>
......@@ -68,6 +68,6 @@ use yii\helpers\Url;
</div>
</div>
<div class="end_keys_neft"></div>
<!-- <div class="end_keys_neft"></div> -->
<?=$this->render('@app/views/layouts/footer');?>
\ No newline at end of file
common/modules/blog/views/post/view.php
View file @ 445c9700
......@@ -50,8 +50,7 @@ use yii\helpers\Html;
</div>
</article>
<?=$this->render('_subscribe')?>
<?=$this->render('_subscribe', ['title' => 'Запись в блоге: ' . $model->lang->title])?>
</section>
</div>
......@@ -62,6 +61,6 @@ use yii\helpers\Html;
</div>
</div>
<div class="end_keys_neft"></div>
<!-- <div class="end_keys_neft"></div> -->
<?=$this->render('@app/views/layouts/footer');?>
frontend/views/layouts/block/case-more.php
View file @ 445c9700
......@@ -72,3 +72,9 @@ $more = CoContent::find()
</div>
</div>
</section>
<style type="text/css">
.field-bid-email,
.field-bid-email input {
margin-bottom: 0;
}
</style>
\ No newline at end of file
frontend/views/layouts/block/case-subscribe.php
View file @ 445c9700
......@@ -11,18 +11,23 @@ use common\modules\bids\models\Bid;
<p>Процесс создания кейса очень трудоемкий.Поэтому мы занимаемся созданием кейсов свободное от работы время. Подпишитесь, чтобы следить за обновлениями.</p>
<?php
$model = new Bid;
$model->scenario = Bid::SCENARIO_SUBSCRIBE;
$model->setScenario(Bid::SCENARIO_SUBSCRIBE);
$model->form = Bid::FORM_SUBSCRIBE;
$form = ActiveForm::begin([
'action' => '/',
'enableClientValidation' => false,
'options' => [
'class' => 'keys_mail_form bids-form',
'data-title' => 'Страница Кейсы',
'data-form' => 'Подпись на обновления в кейсах',
'data-tag' => Bid::TAG_INVOLVEMENT
],
]); ?>
<?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
<?php echo Html::hiddenInput('Bid[form]', Bid::FORM_SUBSCRIBE, ['class' => 'not_clear']); ?>
<?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
<?php echo $form->field($model, 'email', [
'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
......
frontend/views/layouts/block/reviews.php
View file @ 445c9700
......@@ -15,7 +15,7 @@ $reviews = Reviews::find()
<span class="rev_title"><?=Yii::t('reviews', 'References about us')?></span>
</div>
</div>
<?php foreach ($reviews as $review) : ?>
<?php foreach ($reviews as $i => $review) : ?>
<?php if(!$review->video) : ?>
<div class="row">
<?php if($review->photo) : ?>
......@@ -47,6 +47,15 @@ $reviews = Reviews::find()
</div>
</div>
<?php endif; ?>
<?php if($i<count($reviews)-1) : ?>
</div>
</section>
<div class="reviews-delimiter"></div>
<section class="rev_sec reviews-block">
<div class="container">
<?php else : ?>
<div class="reviews-deend"></div>
<?php endif; ?>
<?php endforeach; ?>
</div>
</section>
......
frontend/views/layouts/footer-index.php
View file @ 445c9700
......@@ -12,7 +12,7 @@ use common\modules\bids\models\Bid;
<div class="col-md-12 col-sm-12">
<div class="calk_form">
<span class="calk_form__title">Рассчитать проект</span>
<span class="calk_form_subtitle">Готовы обсудить любой проект. Есть идея или готовое ТЗ по проекту - отправьте его нам</span>
<span class="calk_form_subtitle">Готовы обсудить любой проект. Есть идея или готовое ТЗ по проекту - отправьте его нам!</span>
<?php
......
frontend/web/css/custom.css
View file @ 445c9700
......@@ -79,3 +79,18 @@ a.login_form_link, a.login_form_popup_link, a.reg_popup_link, a.reg_form_link{
.article_short_txt img {
width: auto !important;
}
.reviews-block {
background: #fff;
padding-bottom: 0;
}
.reviews-delimiter {
background: #fff url(../images/rev_bg.png) no-repeat top center;
widows: 100%;
height: 166px;
}
section.reviews-block .row {
margin-bottom: 0;
}
.reviews-deend {
padding-bottom: 60px;
}
\ No newline at end of file
frontend/web/css/screen.css
View file @ 445c9700
This diff is collapsed.
frontend/web/images/ros_inf3.png
View replaced file @ e4a4094a View file @ 445c9700
frontend/web/images/ros_inf3.png

4.56 KB | W: | H:

frontend/web/images/ros_inf3.png

3.67 KB | W: | H:

frontend/web/images/ros_inf3.png
frontend/web/images/ros_inf3.png
frontend/web/images/ros_inf3.png
frontend/web/images/ros_inf3.png
  • 2-up
  • Swipe
  • Onion skin
frontend/web/js/bids-form.js
View file @ 445c9700
......@@ -36,6 +36,30 @@ $('form.bids-form').on('beforeSubmit', function(e) {
{
form.find('input:not(.not_clear), textarea').val('');
$('.send_secce').show();
dataLayer.push({
'event': 'UA_event',
'Catagory': form.data('tag'),
'Action': form.data('title'),
'Label': 'Успешно'
});
form.find('.has-error').removeClass('has-error');
}
else
{
errors = [];
$.each(response, function(key, value) {
$('.field-'+key).addClass('has-error');
errors = errors.concat(value);
});
dataLayer.push({
'event': 'UA_event',
'Catagory': 'Ошибки',
'Action': form.data('form'),
'Label': errors
});
}
}
}
......
frontend/web/js/common.js
View file @ 445c9700
......@@ -15,7 +15,7 @@ $(document).ready(function() {
},
zoom: {
enabled: true,
duration: 300 // don't foget to change the duration also in CSS
duration: 500 // don't foget to change the duration also in CSS
}
});
......@@ -408,9 +408,6 @@ $(window).scroll(function() {
$(".p7").css({
"transform" : "translate(0%, -" + st /6 + "%"
});
});
$(window).scroll(function() {
var st = $(this).scrollTop();
$(".kns_box4").css({
"transform" : "translate(0%, -" + st /1 + "%"
......@@ -424,9 +421,6 @@ $(window).scroll(function() {
$(".kns_box3").css({
"transform" : "translate(0%, -" + st /13 + "%"
});
});
$(window).scroll(function() {
var st = $(this).scrollTop();
$(".appl_p1").css({
"transform" : "translate(0%, -" + st /6 + "%"
......@@ -440,6 +434,35 @@ $(window).scroll(function() {
$(".appl_p4").css({
"transform" : "translate(0%, -" + st /3 + "%"
});
$(".ops_p1").css({
"transform" : "translate(0%, -" + st /6 + "%"
});
$(".ops_p2").css({
"transform" : "translate(0%, -" + st /3 + "%"
});
$(".ops_p3").css({
"transform" : "translate(0%, -" + st /8 + "%"
});
$(".ops_p4").css({
"transform" : "translate(0%, -" + st /3 + "%"
});
$(".mail_p1").css({
"transform" : "translate(0%, -" + st /6 + "%"
});
$(".mail_p2").css({
"transform" : "translate(0%, -" + st /4 + "%"
});
$(".mail_p3").css({
"transform" : "translate(0%, -" + st /4 + "%"
});
$(".mail_p4").css({
"transform" : "translate(0%, -" + st /15 + "%"
});
$(".mail_p5").css({
"transform" : "translate(0%, -" + st /8 + "%"
});
});
jQuery(function($){
$(document).mouseup(function (e){
......
frontend/web/sass/screen.sass
View file @ 445c9700
This diff is collapsed.
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 - ООО "Арт Проект"