From 962b316bcf94a09fa6d46662597efba9ddefe4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 28 Feb 2015 14:00:04 +0100 Subject: [PATCH] Some clean up and polish of data source edit view --- .../features/org/partials/datasourceEdit.html | 76 ++++++++++++------- src/app/panels/graph/axisEditor.html | 4 +- .../elasticsearch/partials/config.html | 20 +++-- .../datasource/influxdb_08/funcEditor.js | 2 +- .../influxdb_08/partials/config.html | 50 ++++++++---- .../influxdb_08/partials/query.editor.html | 2 +- src/css/less/tightform.less | 12 ++- 7 files changed, 109 insertions(+), 57 deletions(-) diff --git a/src/app/features/org/partials/datasourceEdit.html b/src/app/features/org/partials/datasourceEdit.html index b0f30c214b3..542f6b742e4 100644 --- a/src/app/features/org/partials/datasourceEdit.html +++ b/src/app/features/org/partials/datasourceEdit.html @@ -9,39 +9,63 @@

Add data source

-

Edit {{current.name}}

+

Edit data source

-
-
- - -
-
- - -
- +
+
    +
  • + Name +
    • +
  • +
  • + +
    • + +
  • + Default  + + +
    • +
+
- -
-
- - -
-
- - -
+
+
    +
  • + Type +
    • +
  • + +
    • +
+
+
+
+
    +
  • + Url +
    • +
  • + +
    • +
  • + Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request +
    • +
  • + +
    • +
+
-
- - - - Cancel +
+ + + Cancel +

diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index c23daa77711..ff1fbad997d 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -142,7 +142,7 @@
-
+
  • Legend @@ -176,7 +176,7 @@
-
+
  • Legend values diff --git a/src/app/plugins/datasource/elasticsearch/partials/config.html b/src/app/plugins/datasource/elasticsearch/partials/config.html index dd2320d0d54..21b3d51e5cf 100644 --- a/src/app/plugins/datasource/elasticsearch/partials/config.html +++ b/src/app/plugins/datasource/elasticsearch/partials/config.html @@ -1,11 +1,15 @@ -
    -
    -
    Elastic search details
    -
    - - -
    -
    +

    Elastic search details

    + +
    +
      +
    • + Index name +
      • +
    • + +
      • +
    +
    diff --git a/src/app/plugins/datasource/influxdb_08/funcEditor.js b/src/app/plugins/datasource/influxdb_08/funcEditor.js index 615dcd2e75d..7d48f40792f 100644 --- a/src/app/plugins/datasource/influxdb_08/funcEditor.js +++ b/src/app/plugins/datasource/influxdb_08/funcEditor.js @@ -8,7 +8,7 @@ function (angular, _, $) { angular .module('grafana.directives') - .directive('influxdbFuncEditor', function($compile) { + .directive('influxdbFuncEditor08', function($compile) { var funcSpanTemplate = '{{target.function}}('; diff --git a/src/app/plugins/datasource/influxdb_08/partials/config.html b/src/app/plugins/datasource/influxdb_08/partials/config.html index a80b69afc18..b261ae7f79c 100644 --- a/src/app/plugins/datasource/influxdb_08/partials/config.html +++ b/src/app/plugins/datasource/influxdb_08/partials/config.html @@ -1,19 +1,37 @@ -
    -
    -
    InfluxDB Details
    -
    - - -
    -
    - - -
    -
    - - -
    -
    +

    InfluxDB Details

    + +
    +
      +
    • + Database +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + User +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Password +
      • +
    • + +
      • +
    +
    diff --git a/src/app/plugins/datasource/influxdb_08/partials/query.editor.html b/src/app/plugins/datasource/influxdb_08/partials/query.editor.html index 23b8c27868c..a48cc30c509 100644 --- a/src/app/plugins/datasource/influxdb_08/partials/query.editor.html +++ b/src/app/plugins/datasource/influxdb_08/partials/query.editor.html @@ -117,7 +117,7 @@ select
  • - +
    • diff --git a/src/css/less/tightform.less b/src/css/less/tightform.less index cfa70327331..bbad806823c 100644 --- a/src/css/less/tightform.less +++ b/src/css/less/tightform.less @@ -19,6 +19,12 @@ } } +.spaced-form { + .tight-form { + margin: 7px 0; + } +} + .borderless { .tight-form-item, .tight-form-input { @@ -140,13 +146,13 @@ input[type=text].tight-form-clear-input { [type=email], [type=number], [type=password] { - &.tight-form-input { border: none; border-right: 1px solid @grafanaTargetSegmentBorder; margin: 0px; border-radius: 0; - padding: 8px 4px; + padding: 18px 6px; + box-sizing: border-box; &.last { border-right: none; } @@ -163,7 +169,7 @@ select.tight-form-input { margin: 0px; border-radius: 0; height: 36px; - padding: 8px 5px; + padding: 8px 3px; &.last { border-right: none; }