Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
de22aed7
Commit
de22aed7
authored
Jun 25, 2019
by
Sergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
t_3325 - Правки(Логика chexbox'ов, мелкие правки по вёрстке, форма yandex и попап)
parent
a17dba49
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
161 additions
and
134 deletions
+161
-134
common/modules/bids/models/Bid.php
common/modules/bids/models/Bid.php
+1
-0
common/modules/content/models/CoContentLang.php
common/modules/content/models/CoContentLang.php
+2
-0
console/migrations/m190625_070337_add_confirm_column_to_bids.php
.../migrations/m190625_070337_add_confirm_column_to_bids.php
+24
-0
frontend/views/layouts/block/callback.php
frontend/views/layouts/block/callback.php
+10
-11
frontend/views/layouts/block/callback_yandex_form.php
frontend/views/layouts/block/callback_yandex_form.php
+10
-11
frontend/views/layouts/block/yandex-form.php
frontend/views/layouts/block/yandex-form.php
+23
-0
frontend/views/layouts/footer-index.php
frontend/views/layouts/footer-index.php
+89
-108
frontend/web/css/screen.css
frontend/web/css/screen.css
+0
-1
frontend/web/css/style_form.css
frontend/web/css/style_form.css
+0
-1
frontend/web/js/dropzone.js
frontend/web/js/dropzone.js
+2
-2
No files found.
common/modules/bids/models/Bid.php
View file @
de22aed7
...
...
@@ -101,6 +101,7 @@ class Bid extends \common\components\ActiveRecordModel
[[
'email'
],
'string'
,
'max'
=>
70
],
[[
'form'
],
'string'
,
'max'
=>
50
],
[[
'file'
],
'safe'
],
[[
'confirm'
],
'required'
],
];
}
...
...
common/modules/content/models/CoContentLang.php
View file @
de22aed7
...
...
@@ -134,6 +134,8 @@ class CoContentLang extends \common\components\ActiveRecordModel
}
}
$arrWhatReplaceNext
[]
=
'[yandex-form]'
;
$arrReplaceNext
[]
=
CoBlocks
::
printStaticBlock
(
'yandex-form'
);
$arrWhatReplaceNext
[]
=
'[about-reviews]'
;
$arrReplaceNext
[]
=
CoBlocks
::
printStaticBlock
(
'about-reviews'
);
$arrWhatReplaceNext
[]
=
'[reviews]'
;
...
...
console/migrations/m190625_070337_add_confirm_column_to_bids.php
0 → 100644
View file @
de22aed7
<?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 @
de22aed7
...
...
@@ -51,17 +51,16 @@ use common\modules\bids\models\Bid;
'class'
=>
'input_st'
])
->
label
(
false
);
?>
<div
class=
"form-group field-bid-check"
>
<input
class=
"footer_form__check"
type=
"checkbox"
id=
"check"
>
<label
for=
"check"
>
Я согласен с условиями обработки
<br>
<a
href=
"javascript:;"
>
персональных данных
</a>
.
</label>
</div>
<?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>.'
);
?>
<?php
echo
Html
::
submitButton
(
Yii
::
t
(
'footer'
,
'Submit'
),
[
'class'
=>
'save-button popup_bt_send'
]);
?>
...
...
frontend/views/layouts/block/callback_yandex_form.php
View file @
de22aed7
...
...
@@ -51,17 +51,16 @@ use common\modules\bids\models\Bid;
'class'
=>
'input_st'
])
->
label
(
false
);
?>
<div
class=
"form-group field-bid-check"
>
<input
class=
"footer_form__check"
type=
"checkbox"
id=
"check"
>
<label
for=
"check"
>
Я согласен с условиями обработки
<br>
<a
href=
"javascript:;"
>
персональных данных
</a>
.
</label>
</div>
<?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>.'
);
?>
<?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 @
de22aed7
<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 @
de22aed7
This diff is collapsed.
Click to expand it.
frontend/web/css/screen.css
View file @
de22aed7
...
...
@@ -105,7 +105,6 @@ ol {
}
body
{
background
:
#344555
;
font-size
:
17px
;
color
:
#f9f9fa
;
font-family
:
"RobotoRegular"
;
...
...
frontend/web/css/style_form.css
View file @
de22aed7
...
...
@@ -44,7 +44,6 @@
.footer_form__check
{
position
:
absolute
;
opacity
:
0
;
visibility
:
hidden
;
}
.footer_form__check
+
label
{
font-size
:
14px
;
...
...
frontend/web/js/dropzone.js
View file @
de22aed7
...
...
@@ -117,8 +117,8 @@
url
:
null
,
method
:
"
post
"
,
withCredentials
:
false
,
parallelUploads
:
2
,
uploadMultiple
:
fals
e
,
parallelUploads
:
3
,
uploadMultiple
:
tru
e
,
maxFilesize
:
256
,
paramName
:
"
file
"
,
createImageThumbnails
:
true
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment