maxmustermann/gentelella
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated Moris JS charts

Browse source
This commit is contained in:
Aigars Silkalns 2016-02-27 22:46:27 +02:00
parent fb5bacc269
commit 4350630ac3
7 changed files with 68 additions and 1845 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
production/js/jquery.min.js vendored
View file

File diff suppressed because one or more lines are too long

73
production/js/moris/example.js
View file

@ -2,16 +2,16 @@ $(function () {
/* data stolen from http://howmanyleft.co.uk/vehicle/jaguar_'e'_type */
var day_data = [
{"period": "2012-10-01", "licensed": 807, "sorned": 660},
{"period": "2012-09-30", "licensed": 1251, "sorned": 729},
{"period": "2012-09-29", "licensed": 1769, "sorned": 1018},
{"period": "2012-09-20", "licensed": 2246, "sorned": 1461},
{"period": "2012-09-19", "licensed": 2657, "sorned": 1967},
{"period": "2012-09-18", "licensed": 3148, "sorned": 2627},
{"period": "2012-09-17", "licensed": 3471, "sorned": 3740},
{"period": "2012-09-16", "licensed": 2871, "sorned": 2216},
{"period": "2012-09-15", "licensed": 2401, "sorned": 1656},
{"period": "2012-09-10", "licensed": 2115, "sorned": 1022}
{"period": "2016-10-01", "licensed": 807, "sorned": 660},
{"period": "2016-09-30", "licensed": 1251, "sorned": 729},
{"period": "2016-09-29", "licensed": 1769, "sorned": 1018},
{"period": "2016-09-20", "licensed": 2246, "sorned": 1461},
{"period": "2016-09-19", "licensed": 2657, "sorned": 1967},
{"period": "2016-09-18", "licensed": 3148, "sorned": 2627},
{"period": "2016-09-17", "licensed": 3471, "sorned": 3740},
{"period": "2016-09-16", "licensed": 2871, "sorned": 2216},
{"period": "2016-09-15", "licensed": 2401, "sorned": 1656},
{"period": "2016-09-10", "licensed": 2115, "sorned": 1022}
];
Morris.Bar({
element: 'graph_bar_group',
@ -27,15 +27,16 @@ $(function () {
Morris.Bar({
element: 'graph_bar',
data: [
{device: 'iPhone', geekbench: 136},
{device: 'iPhone 3G', geekbench: 137},
{device: 'iPhone 3GS', geekbench: 275},
{device: 'iPhone 4', geekbench: 380},
{device: 'iPhone 4S', geekbench: 655},
{device: 'iPhone 3GS', geekbench: 275},
{device: 'iPhone 4', geekbench: 380},
{device: 'iPhone 4S', geekbench: 655},
{device: 'iPhone 5', geekbench: 1571}
{device: 'iPhone 5', geekbench: 1571},
{device: 'iPhone 5S', geekbench: 655},
{device: 'iPhone 6', geekbench: 2154},
{device: 'iPhone 6 Plus', geekbench: 1144},
{device: 'iPhone 6S', geekbench: 2371},
{device: 'iPhone 6S Plus', geekbench: 1471},
{device: 'Other', geekbench: 1371}
],
xkey: 'device',
ykeys: ['geekbench'],
@ -49,10 +50,10 @@ $(function () {
Morris.Bar({
element: 'graphx',
data: [
{x: '2011 Q1', y: 2, z: 3, a: 4},
{x: '2011 Q2', y: 3, z: 5, a: 6},
{x: '2011 Q3', y: 4, z: 3, a: 2},
{x: '2011 Q4', y: 2, z: 4, a: 5}
{x: '2015 Q1', y: 2, z: 3, a: 4},
{x: '2015 Q2', y: 3, z: 5, a: 6},
{x: '2015 Q3', y: 4, z: 3, a: 2},
{x: '2015 Q4', y: 2, z: 4, a: 5}
],
xkey: 'x',
ykeys: ['y', 'z', 'a'],
@ -66,16 +67,16 @@ $(function () {
Morris.Area({
element: 'graph_area',
data: [
{period: '2010 Q1', iphone: 2666, ipad: null, itouch: 2647},
{period: '2010 Q2', iphone: 2778, ipad: 2294, itouch: 2441},
{period: '2010 Q3', iphone: 4912, ipad: 1969, itouch: 2501},
{period: '2010 Q4', iphone: 3767, ipad: 3597, itouch: 5689},
{period: '2011 Q1', iphone: 6810, ipad: 1914, itouch: 2293},
{period: '2011 Q2', iphone: 5670, ipad: 4293, itouch: 1881},
{period: '2011 Q3', iphone: 4820, ipad: 3795, itouch: 1588},
{period: '2011 Q4', iphone: 15073, ipad: 5967, itouch: 5175},
{period: '2012 Q1', iphone: 10687, ipad: 4460, itouch: 2028},
{period: '2012 Q2', iphone: 8432, ipad: 5713, itouch: 1791}
{period: '2014 Q1', iphone: 2666, ipad: null, itouch: 2647},
{period: '2014 Q2', iphone: 2778, ipad: 2294, itouch: 2441},
{period: '2014 Q3', iphone: 4912, ipad: 1969, itouch: 2501},
{period: '2014 Q4', iphone: 3767, ipad: 3597, itouch: 5689},
{period: '2015 Q1', iphone: 6810, ipad: 1914, itouch: 2293},
{period: '2015 Q2', iphone: 5670, ipad: 4293, itouch: 1881},
{period: '2015 Q3', iphone: 4820, ipad: 3795, itouch: 1588},
{period: '2015 Q4', iphone: 15073, ipad: 5967, itouch: 5175},
{period: '2016 Q1', iphone: 10687, ipad: 4460, itouch: 2028},
{period: '2016 Q2', iphone: 8432, ipad: 5713, itouch: 1791}
],
xkey: 'period',
ykeys: ['iphone', 'ipad', 'itouch'],
@ -108,12 +109,12 @@ $(function () {
hideHover: 'auto',
lineColors: ['#26B99A', '#34495E', '#ACADAC', '#3498DB'],
data: [
{year: '2008', value: 20},
{year: '2009', value: 10},
{year: '2010', value: 5},
{year: '2011', value: 5},
{year: '2012', value: 20}
{year: '2012', value: 20},
{year: '2013', value: 10},
{year: '2014', value: 5},
{year: '2015', value: 5},
{year: '2016', value: 20}
]
});
});
});

4
production/js/moris/jquery.min.js vendored
View file

File diff suppressed because one or more lines are too long

1767
production/js/moris/morris.js
View file

File diff suppressed because it is too large Load diff

8
production/js/moris/morris.min.js vendored
View file

File diff suppressed because one or more lines are too long

19
production/js/moris/raphael-min.js vendored
View file

File diff suppressed because one or more lines are too long

33
production/morisjs.html
View file

@ -8,31 +8,20 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Gentallela Alela! | </title>
<!-- Bootstrap core CSS -->
<title>Moris JS Chart Examples | Gentallela Alela! by Colorlib</title>
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="fonts/css/font-awesome.min.css" rel="stylesheet">
<link href="css/animate.min.css" rel="stylesheet">
<!-- Custom styling plus plugins -->
<link href="css/custom.css" rel="stylesheet">
<link href="css/icheck/flat/green.css" rel="stylesheet">
<script src="js/jquery.min.js"></script>
<!--[if lt IE 9]>
<script src="../assets/js/ie8-responsive-file-warning.js"></script>
<![endif]-->
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<![endif]-->
</head>
@ -251,7 +240,7 @@
<span class="time">3 mins ago</span>
</span>
<span class="message">
Film festivals used to be do-or-die moments for movie makers. They were where...
Film festivals used to be do-or-die moments for movie makers. They were where...
</span>
</a>
</li>
@ -265,7 +254,7 @@
<span class="time">3 mins ago</span>
</span>
<span class="message">
Film festivals used to be do-or-die moments for movie makers. They were where...
Film festivals used to be do-or-die moments for movie makers. They were where...
</span>
</a>
</li>
@ -279,7 +268,7 @@
<span class="time">3 mins ago</span>
</span>
<span class="message">
Film festivals used to be do-or-die moments for movie makers. They were where...
Film festivals used to be do-or-die moments for movie makers. They were where...
</span>
</a>
</li>
@ -293,7 +282,7 @@
<span class="time">3 mins ago</span>
</span>
<span class="message">
Film festivals used to be do-or-die moments for movie makers. They were where...
Film festivals used to be do-or-die moments for movie makers. They were where...
</span>
</a>
</li>
@ -541,24 +530,18 @@
</div>
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
<!-- icheck -->
<script src="js/icheck/icheck.min.js"></script>
<script src="js/custom.js"></script>
<!-- moris js -->
<script src="js/moris/raphael-min.js"></script>
<script src="js/moris/morris.js"></script>
<script src="js/moris/morris.min.js"></script>
<script src="js/moris/example.js"></script>
<!-- pace -->
<script src="js/pace/pace.min.js"></script>
</body>
</html>
</html>