Skip to content

T
taskonsite-архив-перенесен
Commit 5be249a3 authored by Sergey's avatar Sergey
Browse files
Options

Merge branch 't_3325' 

# Conflicts:
#	frontend/views/layouts/block/callback.php
#	frontend/views/layouts/block/callback_yandex_form.php
#	frontend/views/layouts/footer-index.php
parents 34b8190c de22aed7
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 134 deletions
common/modules/bids/models/Bid.php
View file @ 5be249a3
...@@ -101,6 +101,7 @@ class Bid extends \common\components\ActiveRecordModel ...@@ -101,6 +101,7 @@ class Bid extends \common\components\ActiveRecordModel
[['email'], 'string', 'max' => 70], [['email'], 'string', 'max' => 70],
[['form'], 'string', 'max' => 50], [['form'], 'string', 'max' => 50],
[['file'], 'safe'], [['file'], 'safe'],
[['confirm'], 'required'],
]; ];
} }
......
common/modules/content/models/CoContentLang.php
View file @ 5be249a3
...@@ -134,6 +134,8 @@ class CoContentLang extends \common\components\ActiveRecordModel ...@@ -134,6 +134,8 @@ class CoContentLang extends \common\components\ActiveRecordModel
} }
} }
$arrWhatReplaceNext[] = '[yandex-form]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('yandex-form');
$arrWhatReplaceNext[] = '[about-reviews]'; $arrWhatReplaceNext[] = '[about-reviews]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('about-reviews'); $arrReplaceNext[] = CoBlocks::printStaticBlock('about-reviews');
$arrWhatReplaceNext[] = '[reviews]'; $arrWhatReplaceNext[] = '[reviews]';
......
console/migrations/m190625_070337_add_confirm_column_to_bids.php 0 → 100644
View file @ 5be249a3
<?php
use yii\db\Migration;
/**
* Class m190625_070337_add_confirm_column_to_bids
*/
class m190625_070337_add_confirm_column_to_bids extends Migration
{
/**
* {@inheritdoc}
*/
public function safeUp()
{
$this->addColumn('bids', 'confirm', $this->boolean()->notNull()->defaultValue(false)->after('text'));
}
/**
* {@inheritdoc}
*/
public function safeDown()
{
$this->dropColumn('bids', 'confirm');
}
}
frontend/views/layouts/block/callback.php
View file @ 5be249a3
...@@ -51,17 +51,16 @@ use common\modules\bids\models\Bid; ...@@ -51,17 +51,16 @@ use common\modules\bids\models\Bid;
'class' => 'input_st' 'class' => 'input_st'
])->label(false); ?> ])->label(false); ?>
<div class="form-group field-bid-check"> <?php echo $form->field($model, 'confirm',
<input class="footer_form__check" type="checkbox" id="check"> ['template' => '{input}{label}{error}{hint}']
<label for="check"> )->checkbox([
Я согласен с условиями обработки 'checked' => false,
<br> 'required' => true,
<a href="javascript:;"> 'class' => 'footer_form__check',
персональных данных ],
</a> false
. )->label(Yii::t('form', 'I agree to the terms of usung') . ' <a>' . \Yii::t('form', 'personal data') . '</a>.');
</label> ?>
</div>
<?php echo Html::submitButton(Yii::t('footer', 'Submit'), ['class' => 'save-button popup_bt_send']); ?> <?php echo Html::submitButton(Yii::t('footer', 'Submit'), ['class' => 'save-button popup_bt_send']); ?>
......
frontend/views/layouts/block/callback_yandex_form.php
View file @ 5be249a3
...@@ -51,17 +51,16 @@ use common\modules\bids\models\Bid; ...@@ -51,17 +51,16 @@ use common\modules\bids\models\Bid;
'class' => 'input_st' 'class' => 'input_st'
])->label(false); ?> ])->label(false); ?>
<div class="form-group field-bid-check"> <?php echo $form->field($model, 'confirm',
<input class="footer_form__check" type="checkbox" id="check"> ['template' => '{input}{label}{error}{hint}']
<label for="check"> )->checkbox([
Я согласен с условиями обработки 'checked' => false,
<br> 'required' => true,
<a href="javascript:;"> 'class' => 'footer_form__check',
персональных данных ],
</a> false
. )->label(Yii::t('form', 'I agree to the terms of usung') . ' <a>' . \Yii::t('form', 'personal data') . '</a>.');
</label> ?>
</div>
<?php echo Html::submitButton(Yii::t('footer', 'Submit'), ['class' => 'save-button popup_bt_send']); ?> <?php echo Html::submitButton(Yii::t('footer', 'Submit'), ['class' => 'save-button popup_bt_send']); ?>
......
frontend/views/layouts/block/yandex-form.php 0 → 100644
View file @ 5be249a3
<section class="claud_sec">
<div class="claud_wrap">
<div class="container">
<div class="claud_box">
<div class="claud_txt">
<h3>
Мы являемся официальным
<br>
партнером Яндекс.Облако
</h3>
<p>Закажите перенос вашего сайта или сервиса</p>
</div>
<div class="claud_img">
<img src="./img_form/claud_img.png" alt="">
</div>
<div class="claud_btn">
<a href="#zvonok_form_yandex" class="btn_claud popup-form">Заказать</a>
</div>
</div>
</div>
</div>
</section>
<?php echo $this->render('callback_yandex_form'); ?>
\ No newline at end of file
frontend/views/layouts/footer-index.php
View file @ 5be249a3
...@@ -11,125 +11,106 @@ FileUploadBundle::register($this); ...@@ -11,125 +11,106 @@ FileUploadBundle::register($this);
?> ?>
<footer class="footer"> <footer class="footer">
<div class="footer_top"> <div class="container">
<div class="claud_wrap"> <div class="row">
<div class="container"> <div class="col-md-12 col-sm-12">
<div class="claud_box"> <div class="calk_form calk_form_custom">
<div class="claud_txt"> <span class="calk_form__title"><?=\Yii::t('index', 'Have a project or idea - send us');?></span>
<h3> <span class="calk_form_subtitle"><?=\Yii::t('index', 'We are ready to talk about any idea or can prepare an offer for your project');?></span>
Мы являемся официальным
<br> <?php
партнером Яндекс.Облако $model = new Bid;
</h3> $model->scenario = Bid::SCENARIO_PROJECT;
<p>Закажите перенос вашего сайта или сервиса</p> $model->form = Bid::FORM_PROJECT;
</div>
<div class="claud_img"> $form = ActiveForm::begin([
<img src="./img_form/claud_img.png" alt=""> 'id' => 'form_foot',
</div> 'action' => '/bids/bid/add',
<div class="claud_btn">
<a href="#zvonok_form_yandex" class="btn_claud popup-form">Заказать</a> 'enableClientValidation' => false,
</div> 'options' => [
</div> 'class' => 'footer_form bids-form',
</div> 'data-title' => 'Рассчитать проект',
</div> 'data-form' => 'Рассчитать проект',
<div class="container"> 'enctype' => 'multipart/form-data',
<div class="row"> 'data-tag' => Bid::TAG_TREATMENT,
<div class="col-md-12 col-sm-12"> 'method' => 'post',
<div class="calk_form calk_form_custom"> 'name' => 'form_foot'
<span class="calk_form__title"><?=\Yii::t('index', 'Have a project or idea - send us');?></span> ],
<span class="calk_form_subtitle"><?=\Yii::t('index', 'We are ready to talk about any idea or can prepare an offer for your project');?></span> ]); ?>
<?php <div class="message-box send_secce">Ваша заявка на проект успешно отправлена!</div>
$model = new Bid; <div class="content">
$model->scenario = Bid::SCENARIO_PROJECT;
$model->form = Bid::FORM_PROJECT; <?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
$form = ActiveForm::begin([ <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
'id' => 'form_foot',
'action' => '/bids/bid/add', <?php echo $form->field($model, 'name', [
'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
'enableClientValidation' => false, 'errorOptions' => []
'options' => [ ])->textInput([
'class' => 'footer_form bids-form', 'placeholder' => \Yii::t('form', 'Your name'),
'data-title' => 'Рассчитать проект', 'class' => 'footer_form__input'
'data-form' => 'Рассчитать проект',
'enctype' => 'multipart/form-data',
'data-tag' => Bid::TAG_TREATMENT,
'method' => 'post',
'name' => 'form_foot'
],
]); ?> ]); ?>
<div class="message-box send_secce">Ваша заявка на проект успешно отправлена!</div> <?php echo $form->field($model, 'phone', [
<div class="content"> 'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
'errorOptions' => []
<?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?> ])->textInput([
'placeholder' => \Yii::t('form', 'Telephone'),
<?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?> 'class' => 'footer_form__input'
]); ?>
<?php echo $form->field($model, 'name', [
'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
'errorOptions' => []
])->textInput([
'placeholder' => \Yii::t('form', 'Your name'),
'class' => 'footer_form__input'
]); ?>
<?php echo $form->field($model, 'phone', [
'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
'errorOptions' => []
])->textInput([
'placeholder' => \Yii::t('form', 'Telephone'),
'class' => 'footer_form__input'
]); ?>
<?php echo $form->field($model, 'email', [
'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
'errorOptions' => []
])->textInput([
'placeholder' => 'E-mail*',
'class' => 'footer_form__input'
]); ?>
<?php echo $form->field($model, 'text')->textArea([
'placeholder' => \Yii::t('form', 'Short text about your project or idea'),
'class' => 'footer_form__textarea'
])->label(false); ?>
<div class="form-group field-bid-check">
<input class="footer_form__check" type="checkbox" id="check">
<label for="check">
<?=\Yii::t('form', 'I agree to the terms of usung')?>
<a href="javascript:;">
<?=\Yii::t('form', 'personal data')?>
</a>
.
</label>
</div>
<div class="file-upload_block dropzone" id="block_upload"> <?php echo $form->field($model, 'email', [
<div class="file_upload_bt"> 'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
<div class="file-upload"> 'errorOptions' => []
<label> ])->textInput([
<span><?=\Yii::t('form', 'Choose file')?></span> 'placeholder' => 'E-mail*',
</label> 'class' => 'footer_form__input'
</div> ]); ?>
<div class="file_drop"><?=\Yii::t('form', 'Drag any files here or choose in folder')?></div>
<?php echo $form->field($model, 'text')->textArea([
'placeholder' => \Yii::t('form', 'Short text about your project or idea'),
'class' => 'footer_form__textarea'
])->label(false); ?>
<?php echo $form->field($model, 'confirm',
['template' => '{input}{label}{error}{hint}']
)->checkbox([
'checked' => false,
'required' => true,
'class' => 'footer_form__check',
],
false
)->label(Yii::t('form', 'I agree to the terms of usung') . ' <a>' . \Yii::t('form', 'personal data') . '</a>.');
?>
<div class="file-upload_block dropzone" id="block_upload">
<div class="file_upload_bt">
<div class="file-upload">
<label>
<span><?=\Yii::t('form', 'Choose file')?></span>
</label>
</div> </div>
<div class="file_drop"><?=\Yii::t('form', 'Drag any files here or choose in folder')?></div>
</div> </div>
<div id="files-zone"> </div>
</div> <div id="files-zone">
<?php echo Html::submitButton(\Yii::t('index', 'Submit'), ['class' => 'btn-default save-button']); ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php echo Html::submitButton(\Yii::t('index', 'Submit'), ['class' => 'btn-default save-button']); ?>
</div> </div>
<?php ActiveForm::end(); ?>
</div> </div>
</div> </div>
</div>
</div>
<div class="footer_top">
<div class="container">
<div class="footer_top_wrap"> <div class="footer_top_wrap">
<div class="footer_top_column footer_top_column1"> <div class="footer_top_column footer_top_column1">
<h4>Рекомендуем посмотреть</h4> <h4>Рекомендуем посмотреть</h4>
......
frontend/web/css/screen.css
View file @ 5be249a3
...@@ -105,7 +105,6 @@ ol { ...@@ -105,7 +105,6 @@ ol {
} }
body { body {
background: #344555;
font-size: 17px; font-size: 17px;
color: #f9f9fa; color: #f9f9fa;
font-family: "RobotoRegular"; font-family: "RobotoRegular";
......
frontend/web/css/style_form.css
View file @ 5be249a3
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
.footer_form__check{ .footer_form__check{
position: absolute; position: absolute;
opacity: 0; opacity: 0;
visibility: hidden;
} }
.footer_form__check + label{ .footer_form__check + label{
font-size: 14px; font-size: 14px;
......
frontend/web/js/dropzone.js
View file @ 5be249a3
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
url: null, url: null,
method: "post", method: "post",
withCredentials: false, withCredentials: false,
parallelUploads: 2, parallelUploads: 3,
uploadMultiple: false, uploadMultiple: true,
maxFilesize: 256, maxFilesize: 256,
paramName: "file", paramName: "file",
createImageThumbnails: true, createImageThumbnails: true,
......
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 - ООО "Арт Проект"