From 14247ddabb6b5a75aa39fabc8b75628b6c0cd117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 2 Jul 2014 12:13:42 +0200 Subject: [PATCH] New legend display option 'Align as table' (Issue #136) --- CHANGELOG.md | 1 + src/app/panels/graph/axisEditor.html | 52 +++++++++-------- src/app/panels/graph/legend.html | 42 ++++++++++++-- src/app/panels/graph/module.html | 4 +- src/css/bootstrap.dark.min.css | 2 +- src/css/bootstrap.light.min.css | 2 +- src/css/default.min.css | 2 +- src/css/less/grafana.less | 54 +---------------- src/css/less/legend.less | 86 ++++++++++++++++++++++++++++ 9 files changed, 158 insertions(+), 87 deletions(-) create mode 100644 src/css/less/legend.less diff --git a/CHANGELOG.md b/CHANGELOG.md index 61e9d0c1f43..e7a81c09f3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ vNext **New features or improvements** - Allow [[..]] filter notation in all text panels (markdown/html/text) (Issue #511) +- New legend display option "Align as table" (Issue #136) **Changes** - Use unix epoch for Graphite from/to for absolute time ranges (Closes #536) diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index eb8ac3fb081..fb78152bd56 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -42,38 +42,17 @@
-
-
Grid thresholds
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
- -
-
Legend
+
Legend styles
+
+ +
@@ -100,6 +79,29 @@
+
+
Grid thresholds
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
Show Axes
diff --git a/src/app/panels/graph/legend.html b/src/app/panels/graph/legend.html index 84aab5020f6..aa31d09deac 100755 --- a/src/app/panels/graph/legend.html +++ b/src/app/panels/graph/legend.html @@ -1,5 +1,4 @@ - - + --> + +
+ +
+
+ + +
+
+ + {{series.alias}} + +
+
+ Current: {{series.current}} +
+
+ Min: {{series.min}} +
+
+ Max: {{series.max}} +
+
+ Total: {{series.total}} +
+
+ Avg: {{series.avg}} +
+
+ +
+