diff options
author | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-17 09:59:09 +0200 |
---|---|---|
committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-17 09:59:09 +0200 |
commit | d05cb129040e99db7b78ec2eed85a4fad8dba0ba (patch) | |
tree | ba7a2926836612ab07c5e6b11004bec5a09ea633 /views/dashboard.ejs | |
parent | added jquery in case google doesn't respond (diff) | |
download | Divid-d05cb129040e99db7b78ec2eed85a4fad8dba0ba.tar.gz |
moved javascript and footer around. now closing body and html on every
page
Diffstat (limited to 'views/dashboard.ejs')
-rw-r--r-- | views/dashboard.ejs | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/views/dashboard.ejs b/views/dashboard.ejs index 7f12743..f424e8e 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -1,4 +1,5 @@ <% include header %> + </head> <body> <% include navbar %> @@ -36,19 +37,42 @@ </div><!-- /div.span5 --> <div class="span7"> <section class="chart"> - + <canvas id="myChart" width="400" height="400"></canvas> </section> <section calss="overview"> </section> </div><!-- /div.span7 --> - - - - - </div><!-- /div.row --> </div><!-- /div.#wrapper --> + <% include footer %> + <script src="/js/Chart.min.js"></script> + <script> + var data = { + labels : ["January","February","March","April","May","June","July"], + datasets : [ + { + fillColor : "rgba(220,220,220,0.5)", + strokeColor : "rgba(220,220,220,1)", + pointColor : "rgba(220,220,220,1)", + pointStrokeColor : "#fff", + data : [65,59,90,81,56,55,40] + }, + { + fillColor : "rgba(151,187,205,0.5)", + strokeColor : "rgba(151,187,205,1)", + pointColor : "rgba(151,187,205,1)", + pointStrokeColor : "#fff", + data : [28,48,40,19,96,27,100] + } + ] + } + //var myLine = new Chart(document.getElementById("myChart").getContext("2d")).Line(data); + var ctx = $("#myChart").get(0).getContext("2d"); + var myNewChart = new Chart(ctx).Line(data); + </script> +</body> +</html> |