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
a76d6130
Commit
a76d6130
authored
Jan 26, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
404
parent
d76014ab
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2527 additions
and
203 deletions
+2527
-203
console/migrations/m160126_143450_fix_co_blocks_table.php
console/migrations/m160126_143450_fix_co_blocks_table.php
+23
-0
frontend/controllers/SiteController.php
frontend/controllers/SiteController.php
+1
-1
frontend/web/css/screen.css
frontend/web/css/screen.css
+928
-112
frontend/web/images/no_found_bg.jpg
frontend/web/images/no_found_bg.jpg
+0
-0
frontend/web/js/common.js
frontend/web/js/common.js
+24
-3
frontend/web/js/libs/magnific/jquery.magnific-popup.min.js
frontend/web/js/libs/magnific/jquery.magnific-popup.min.js
+945
-1
frontend/web/sass/screen.sass
frontend/web/sass/screen.sass
+606
-86
No files found.
console/migrations/m160126_143450_fix_co_blocks_table.php
0 → 100644
View file @
a76d6130
<?php
use
yii\db\Schema
;
use
yii\db\Migration
;
class
m160126_143450_fix_co_blocks_table
extends
Migration
{
public
function
safeUp
()
{
$tableOptions
=
null
;
if
(
$this
->
db
->
driverName
===
'mysql'
)
{
$tableOptions
=
'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB'
;
}
$this
->
alterColumn
(
'co_blocks'
,
'category_id'
,
Schema
::
TYPE_INTEGER
.
'(11) NULL'
);
}
public
function
safeDown
()
{
$this
->
alterColumn
(
'co_blocks'
,
'category_id'
,
Schema
::
TYPE_INTEGER
.
'(11) NOT NULL'
);
}
}
frontend/controllers/SiteController.php
View file @
a76d6130
...
@@ -91,7 +91,7 @@ class SiteController extends BaseController
...
@@ -91,7 +91,7 @@ class SiteController extends BaseController
$model
=
\common\modules\content\models\CoContent
::
findOne
([
'url'
=>
'site/error'
]);
$model
=
\common\modules\content\models\CoContent
::
findOne
([
'url'
=>
'site/error'
]);
$content
=
$model
->
getContent
();
$content
=
$model
->
getContent
();
$this
->
meta_title
=
$model
->
metaTags
->
title
;
$this
->
meta_title
=
$model
->
metaTags
->
title
.
' - '
.
\Yii
::
$app
->
params
[
'name'
]
;
$this
->
meta_description
=
$model
->
metaTags
->
description
;
$this
->
meta_description
=
$model
->
metaTags
->
description
;
$this
->
meta_keywords
=
$model
->
metaTags
->
keywords
;
$this
->
meta_keywords
=
$model
->
metaTags
->
keywords
;
...
...
frontend/web/css/screen.css
View file @
a76d6130
This diff is collapsed.
Click to expand it.
frontend/web/images/no_found_bg.jpg
0 → 100644
View file @
a76d6130
38.5 KB
frontend/web/js/common.js
View file @
a76d6130
...
@@ -358,6 +358,11 @@ $(document).ready(function() {
...
@@ -358,6 +358,11 @@ $(document).ready(function() {
container
:
'
.sh_reg_form
'
,
container
:
'
.sh_reg_form
'
,
});
});
});
});
$
(
function
()
{
window
.
validation
.
init
({
container
:
'
.keys_mail_form
'
,
});
});
$
(
"
.toggle-mnu
"
).
click
(
function
()
{
$
(
"
.toggle-mnu
"
).
click
(
function
()
{
$
(
"
.menu
"
).
toggleClass
(
"
menu_active
"
);
$
(
"
.menu
"
).
toggleClass
(
"
menu_active
"
);
});
});
...
@@ -378,13 +383,29 @@ $(window).scroll(function() {
...
@@ -378,13 +383,29 @@ $(window).scroll(function() {
var
st
=
$
(
this
).
scrollTop
();
var
st
=
$
(
this
).
scrollTop
();
$
(
"
.p5
"
).
css
({
$
(
"
.p5
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
*
1
+
"
%
"
"
transform
"
:
"
translate(0%, -
"
+
st
/
1
+
"
%
"
});
});
$
(
"
.p6
"
).
css
({
$
(
"
.p6
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
+
"
%
"
"
transform
"
:
"
translate(0%, -
"
+
st
/
3
+
"
%
"
});
});
$
(
"
.p7
"
).
css
({
$
(
"
.p7
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
/
0.8
+
"
%
"
"
transform
"
:
"
translate(0%, -
"
+
st
/
6
+
"
%
"
});
});
$
(
window
).
scroll
(
function
()
{
var
st
=
$
(
this
).
scrollTop
();
$
(
"
.kns_box4
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
/
1
+
"
%
"
});
$
(
"
.kns_box2
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
/
1
+
"
%
"
});
$
(
"
.kns_box1
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
/
10
+
"
%
"
});
$
(
"
.kns_box3
"
).
css
({
"
transform
"
:
"
translate(0%, -
"
+
st
/
13
+
"
%
"
});
});
});
});
jQuery
(
function
(
$
){
jQuery
(
function
(
$
){
...
...
frontend/web/js/libs/magnific/jquery.magnific-popup.min.js
View file @
a76d6130
This diff is collapsed.
Click to expand it.
frontend/web/sass/screen.sass
View file @
a76d6130
This diff is collapsed.
Click to expand it.
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