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
5ad0db98
Commit
5ad0db98
authored
Mar 15, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- test
parent
cafc0efb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
196 additions
and
190 deletions
+196
-190
frontend/views/layouts/foot.php
frontend/views/layouts/foot.php
+2
-2
frontend/web/js/custom.js
frontend/web/js/custom.js
+194
-188
No files found.
frontend/views/layouts/foot.php
View file @
5ad0db98
...
@@ -26,6 +26,6 @@
...
@@ -26,6 +26,6 @@
<?php
$this
->
registerJsFile
(
'/js/jquery.form.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/jquery.form.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/connect-form.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/connect-form.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/prism.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/prism.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
//
$this->registerJsFile('/plugins/fusioncharts-suite-xt/js/fusioncharts.js', ['position' => yii\web\View::POS_END ]);?>
<?php
$this
->
registerJsFile
(
'/plugins/fusioncharts-suite-xt/js/fusioncharts.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/custom.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
<?php
$this
->
registerJsFile
(
'/js/custom.js'
,
[
'position'
=>
yii\web\View
::
POS_END
]);
?>
\ No newline at end of file
frontend/web/js/custom.js
View file @
5ad0db98
...
@@ -109,193 +109,199 @@ $(document).ready(function() {
...
@@ -109,193 +109,199 @@ $(document).ready(function() {
});
});
});
});
FusionCharts
.
ready
(
function
()
{
if
(
$
(
'
#chart-container
'
).
length
>
0
)
var
revenueChart
=
new
FusionCharts
({
{
type
:
'
doughnut2d
'
,
FusionCharts
.
ready
(
function
()
{
renderAt
:
'
chart-container
'
,
var
revenueChart
=
new
FusionCharts
({
width
:
'
100%
'
,
type
:
'
doughnut2d
'
,
height
:
'
450
'
,
renderAt
:
'
chart-container
'
,
dataFormat
:
'
json
'
,
width
:
'
100%
'
,
dataSource
:
{
height
:
'
450
'
,
dataFormat
:
'
json
'
,
"
chart
"
:
{
dataSource
:
{
//"caption": "Expenditures Incurred in Publishing a Book",
"
bgcolor
"
:
"
FFFFFF
"
,
"
chart
"
:
{
"
showvalues
"
:
"
1
"
,
//"caption": "Expenditures Incurred in Publishing a Book",
"
showpercentvalues
"
:
"
1
"
,
"
bgcolor
"
:
"
FFFFFF
"
,
"
showborder
"
:
"
0
"
,
"
showvalues
"
:
"
1
"
,
"
showplotborder
"
:
"
0
"
,
"
showpercentvalues
"
:
"
1
"
,
//"showlegend": "1",
"
showborder
"
:
"
0
"
,
//"legendborder": "0",
"
showplotborder
"
:
"
0
"
,
//"legendposition": "bottom",
//"showlegend": "1",
"
enablesmartlabels
"
:
"
1
"
,
//"legendborder": "0",
"
use3dlighting
"
:
"
0
"
,
//"legendposition": "bottom",
"
showshadow
"
:
"
0
"
,
"
enablesmartlabels
"
:
"
1
"
,
//"legendbgcolor": "#CCCCCC",
"
use3dlighting
"
:
"
0
"
,
//"legendbgalpha": "20",
"
showshadow
"
:
"
0
"
,
//"legendborderalpha": "0",
//"legendbgcolor": "#CCCCCC",
//"legendshadow": "0",
//"legendbgalpha": "20",
//"legendnumcolumns": "3",
//"legendborderalpha": "0",
"
labelFont
"
:
"
RobotoBold
"
,
//"legendshadow": "0",
"
labelFontColor
"
:
"
2d323a
"
,
//"legendnumcolumns": "3",
"
labelFontSize
"
:
"
14
"
,
"
labelFont
"
:
"
RobotoBold
"
,
"
labelFontBold
"
:
"
1
"
,
"
labelFontColor
"
:
"
2d323a
"
,
"
labelFontSize
"
:
"
14
"
,
"
labelFontBold
"
:
"
1
"
,
"
palettecolors
"
:
"
#ff3030,#ff7711,#ffc600,#95d900,#97cbdd,#cdc9c4
"
,
"
palettecolors
"
:
"
#ff3030,#ff7711,#ffc600,#95d900,#97cbdd,#cdc9c4
"
,
"
showHoverEffect
"
:
"
1
"
,
"
showHoverEffect
"
:
"
1
"
,
},
},
"
data
"
:
[
"
data
"
:
[
{
{
"
label
"
:
"
Переходы из поисковых сетей
"
,
"
label
"
:
"
Переходы из поисковых сетей
"
,
"
value
"
:
"
71.75
"
"
value
"
:
"
71.75
"
},
},
{
{
"
label
"
:
"
Переходы по рекламе
"
,
"
label
"
:
"
Переходы по рекламе
"
,
"
value
"
:
"
12.28
"
"
value
"
:
"
12.28
"
},
},
{
{
"
label
"
:
"
Прямые заходы
"
,
"
label
"
:
"
Прямые заходы
"
,
"
value
"
:
"
12.19
"
"
value
"
:
"
12.19
"
},
},
{
{
"
label
"
:
"
Другие
"
,
"
label
"
:
"
Другие
"
,
"
value
"
:
"
2.26
"
"
value
"
:
"
2.26
"
},
},
{
{
"
label
"
:
"
Другие
"
,
"
label
"
:
"
Другие
"
,
"
value
"
:
"
0.76
"
"
value
"
:
"
0.76
"
},
},
{
{
"
label
"
:
"
Другие
"
,
"
label
"
:
"
Другие
"
,
"
value
"
:
"
0.76
"
"
value
"
:
"
0.76
"
}
}
]
]
}
}
}).
render
();
}).
render
();
});
});
}
FusionCharts
.
ready
(
function
()
{
if
(
$
(
'
#chart-container-2
'
).
length
>
0
)
var
revenueChart
=
new
FusionCharts
({
{
type
:
'
column2d
'
,
FusionCharts
.
ready
(
function
()
{
renderAt
:
'
chart-container-2
'
,
var
revenueChart
=
new
FusionCharts
({
width
:
'
100%
'
,
type
:
'
column2d
'
,
height
:
'
300
'
,
renderAt
:
'
chart-container-2
'
,
dataFormat
:
'
json
'
,
width
:
'
100%
'
,
dataSource
:
{
height
:
'
300
'
,
"
chart
"
:
{
dataFormat
:
'
json
'
,
//"caption": "Monthly revenue for last year",
dataSource
:
{
//"subCaption": "Harry's SuperMart",
"
chart
"
:
{
"
xAxisName
"
:
""
,
//"caption": "Monthly revenue for last year",
"
yAxisName
"
:
"
Визиты:
"
,
//"subCaption": "Harry's SuperMart",
//"numberPrefix": "",
"
xAxisName
"
:
""
,
"
paletteColors
"
:
"
#c3b0fa
"
,
"
yAxisName
"
:
"
Визиты:
"
,
"
bgColor
"
:
"
#ffffff
"
,
//"numberPrefix": "",
"
borderAlpha
"
:
"
20
"
,
"
paletteColors
"
:
"
#c3b0fa
"
,
"
canvasBorderAlpha
"
:
"
0
"
,
"
bgColor
"
:
"
#ffffff
"
,
"
usePlotGradientColor
"
:
"
0
"
,
"
borderAlpha
"
:
"
20
"
,
"
plotBorderAlpha
"
:
"
10
"
,
"
canvasBorderAlpha
"
:
"
0
"
,
"
placevaluesInside
"
:
"
1
"
,
"
usePlotGradientColor
"
:
"
0
"
,
"
rotatevalues
"
:
"
1
"
,
"
plotBorderAlpha
"
:
"
10
"
,
"
valueFontColor
"
:
"
#ffffff
"
,
"
placevaluesInside
"
:
"
1
"
,
"
showXAxisLine
"
:
"
1
"
,
"
rotatevalues
"
:
"
1
"
,
"
xAxisLineColor
"
:
"
#999999
"
,
"
valueFontColor
"
:
"
#ffffff
"
,
"
divlineColor
"
:
"
#999999
"
,
"
showXAxisLine
"
:
"
1
"
,
"
divLineIsDashed
"
:
"
1
"
,
"
xAxisLineColor
"
:
"
#999999
"
,
"
showAlternateHGridColor
"
:
"
0
"
,
"
divlineColor
"
:
"
#999999
"
,
"
subcaptionFontBold
"
:
"
0
"
,
"
divLineIsDashed
"
:
"
1
"
,
"
subcaptionFontSize
"
:
"
14
"
"
showAlternateHGridColor
"
:
"
0
"
,
},
"
subcaptionFontBold
"
:
"
0
"
,
"
data
"
:
[
"
subcaptionFontSize
"
:
"
14
"
{
},
"
label
"
:
"
Июн 14
"
,
"
data
"
:
[
"
value
"
:
"
3000
"
{
},
"
label
"
:
"
Июн 14
"
,
{
"
value
"
:
"
3000
"
"
label
"
:
""
,
},
"
value
"
:
"
3400
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
3400
"
"
label
"
:
"
Авг 14
"
,
},
"
value
"
:
"
7100
"
{
},
"
label
"
:
"
Авг 14
"
,
{
"
value
"
:
"
7100
"
"
label
"
:
""
,
},
"
value
"
:
"
9200
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
9200
"
"
label
"
:
"
Окт 14
"
,
},
"
value
"
:
"
3400
"
{
},
"
label
"
:
"
Окт 14
"
,
{
"
value
"
:
"
3400
"
"
label
"
:
""
,
},
"
value
"
:
"
2850
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
2850
"
"
label
"
:
"
Дек 14
"
,
},
"
value
"
:
"
2800
"
{
},
"
label
"
:
"
Дек 14
"
,
{
"
value
"
:
"
2800
"
"
label
"
:
""
,
},
"
value
"
:
"
2400
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
2400
"
"
label
"
:
"
Фев 15
"
,
},
"
value
"
:
"
3800
"
{
},
"
label
"
:
"
Фев 15
"
,
{
"
value
"
:
"
3800
"
"
label
"
:
""
,
},
"
value
"
:
"
3900
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
3900
"
"
label
"
:
"
Апр 15
"
,
},
"
value
"
:
"
3500
"
{
},
"
label
"
:
"
Апр 15
"
,
{
"
value
"
:
"
3500
"
"
label
"
:
""
,
},
"
value
"
:
"
3500
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
3500
"
"
label
"
:
"
Июн 15
"
,
},
"
value
"
:
"
4100
"
{
},
"
label
"
:
"
Июн 15
"
,
{
"
value
"
:
"
4100
"
"
label
"
:
""
,
},
"
value
"
:
"
5900
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
5900
"
"
label
"
:
"
Авг 15
"
,
},
"
value
"
:
"
5100
"
{
},
"
label
"
:
"
Авг 15
"
,
{
"
value
"
:
"
5100
"
"
label
"
:
""
,
},
"
value
"
:
"
4600
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
4600
"
"
label
"
:
"
Окт 15
"
,
},
"
value
"
:
"
2800
"
{
},
"
label
"
:
"
Окт 15
"
,
{
"
value
"
:
"
2800
"
"
label
"
:
""
,
},
"
value
"
:
"
4500
"
{
},
"
label
"
:
""
,
{
"
value
"
:
"
4500
"
"
label
"
:
"
Дек 15
"
,
},
"
value
"
:
"
5100
"
{
}
"
label
"
:
"
Дек 15
"
,
],
"
value
"
:
"
5100
"
"
trendlines
"
:
[
}
{
],
"
line
"
:
[
"
trendlines
"
:
[
{
{
"
startvalue
"
:
"
700000
"
,
"
line
"
:
[
"
color
"
:
"
#1aaf5d
"
,
{
"
valueOnRight
"
:
"
1
"
,
"
startvalue
"
:
"
700000
"
,
"
displayvalue
"
:
"
Monthly Target
"
"
color
"
:
"
#1aaf5d
"
,
}
"
valueOnRight
"
:
"
1
"
,
]
"
displayvalue
"
:
"
Monthly Target
"
}
}
]
]
}
}
}).
render
();
]
});
}
\ No newline at end of file
}).
render
();
});
}
\ No newline at end of file
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