maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Switched traffic charts from jqPlot to flot

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2013-12-18 18:30:57 +01:00
parent 6902868e58
commit c7d00d4d11
37 changed files with 177 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/Sparkle/header.tpl vendored
View File

@@ -12,11 +12,7 @@
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<if isset($intrafficpage)>
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="js/excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="js/jquery.jqplot.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jqplot.barRenderer.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jqplot.categoryAxisRenderer.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jqplot.pointLabels.min.js"></script>
<link rel="stylesheet" type="text/css" href="css/jquery.jqplot.min.css" />
<script language="javascript" type="text/javascript" src="js/jquery.flot.min.js"></script>
<script language="javascript" type="text/javascript" src="templates/{$theme}/assets/js/traffic.js"></script>
</if>
<script language="javascript" type="text/javascript" src="templates/{$theme}/assets/js/tipper.min.js"></script>