diff --git a/src/app/panels/singlestat/editor.html b/src/app/panels/singlestat/editor.html index 285479a675f..17e94f317f5 100644 --- a/src/app/panels/singlestat/editor.html +++ b/src/app/panels/singlestat/editor.html @@ -1,113 +1,189 @@
-
-
Big value
-
- - +
+
+
+
    +
  • + Big value +
    • +
  • + Prefix +
    • +
  • + +
    • +
  • + Value +
    • +
  • + +
    • +
  • + Postfix +
    • +
  • + +
    • +
+
+
+
+
    +
  • + Font size +
    • +
  • + Prefix +
    • +
  • + +
    • +
  • + Value +
    • +
  • + +
    • +
  • + Postfix +
    • +
  • + +
    • +
+
+
+
+
    +
  • + Unit +
    • +
  • +
    • +
+
+
-
- - -
-
- - -
-
- - -
+
-
-
Big value font size
-
- - +
+
+
+
+
    +
  • + Coloring +
    • +
  • + Background  + + +
    • +
  • + Value  + + +
    • +
  • + ThresholdsComma seperated values +
    • +
  • + +
    • +
  • + Colors +
    • +
  • + + + +
    • +
  • + invert order +
    • +
+
+
-
- - -
-
- - -
- -
-
Formats
-
- - -
-
-
-
Coloring
- - -
- - -
-
- - - - - invert order +
+
+
+
    +
  • + Spark lines +
    • +
  • + Show  + + +
    • +
  • + Background mode  + + +
    • +
  • + Line Color +
    • +
  • + +
    • +
  • + Fill Color +
    • +
  • + +
    • +
+
+
- -
-
Spark lines
- - -
- - -
-
- - -
-
-
-
Value to text mapping
-
- -
-
-
    -
  • - -
    • - -
  • - -
    • -
  • - -
    • -
  • - -
    • +
    +
    +
    +
      +
    • + Value to text mapping +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • -
    • - - - -
      • +
    • + + + +
      • -
    -
    -
    +
+
diff --git a/src/app/panels/singlestat/module.js b/src/app/panels/singlestat/module.js index 3568cc53c64..75e657094ef 100644 --- a/src/app/panels/singlestat/module.js +++ b/src/app/panels/singlestat/module.js @@ -57,6 +57,12 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) { }; _.defaults($scope.panel, _d); + $scope.unitFormats = kbn.getUnitFormats(); + + $scope.setUnitFormat = function(subItem) { + $scope.panel.format = subItem.value; + $scope.render(); + }; $scope.init = function() { panelSrv.init($scope); diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 450f553bfc2..ecb66db6f22 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -236,6 +236,9 @@ select.grafana-target-segment-input { border-radius: 0; height: 36px; padding: 8px 5px; + &.last { + border-right: none; + } } .grafana-target .dropdown {