diff --git a/codepot/README b/codepot/README index a8417076..eb2213f3 100644 --- a/codepot/README +++ b/codepot/README @@ -107,6 +107,7 @@ LICENSE jQuery UI 1.8 MIT or GPL PHPGraphLib MIT CLOC 1.62 GPL + Flot https://github.com/flot/flot/blob/master/LICENSE.txt Chart.js MIT ------------------------------------------------------------------------ diff --git a/codepot/src/codepot/views/graph_main.php b/codepot/src/codepot/views/graph_main.php index b5d9825e..8ef5ded4 100644 --- a/codepot/src/codepot/views/graph_main.php +++ b/codepot/src/codepot/views/graph_main.php @@ -372,15 +372,19 @@ $this->load->view ( name)?> -
+
+ +
-
+
-
+
+
+
diff --git a/codepot/src/js/Makefile.am b/codepot/src/js/Makefile.am index 31a732cb..459452a0 100644 --- a/codepot/src/js/Makefile.am +++ b/codepot/src/js/Makefile.am @@ -5,6 +5,22 @@ www_DATA = \ creole.js \ jquery.min.js \ jquery-ui.min.js \ + jquery.flot.canvas.min.js \ + jquery.flot.min.js \ + jquery.flot.categories.min.js \ + jquery.flot.crosshair.min.js \ + jquery.flot.errorbars.min.js \ + jquery.flot.fillbetween.min.js \ + jquery.flot.image.min.js \ + jquery.flot.navigate.min.js \ + jquery.flot.pie.min.js \ + jquery.flot.resize.min.js \ + jquery.flot.selection.min.js \ + jquery.flot.stack.min.js \ + jquery.flot.symbol.min.js \ + jquery.flot.threshold.min.js \ + jquery.flot.time.min.js \ + excanvas.min.js \ Chart.js EXTRA_DIST = $(www_DATA) diff --git a/codepot/src/js/Makefile.in b/codepot/src/js/Makefile.in index 29727399..04ee78da 100644 --- a/codepot/src/js/Makefile.in +++ b/codepot/src/js/Makefile.in @@ -239,6 +239,22 @@ www_DATA = \ creole.js \ jquery.min.js \ jquery-ui.min.js \ + jquery.flot.canvas.min.js \ + jquery.flot.min.js \ + jquery.flot.categories.min.js \ + jquery.flot.crosshair.min.js \ + jquery.flot.errorbars.min.js \ + jquery.flot.fillbetween.min.js \ + jquery.flot.image.min.js \ + jquery.flot.navigate.min.js \ + jquery.flot.pie.min.js \ + jquery.flot.resize.min.js \ + jquery.flot.selection.min.js \ + jquery.flot.stack.min.js \ + jquery.flot.symbol.min.js \ + jquery.flot.threshold.min.js \ + jquery.flot.time.min.js \ + excanvas.min.js \ Chart.js EXTRA_DIST = $(www_DATA)