From 82eb32a71ecc1cc2f20d2cf039243f143a67805a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Mar 2016 09:15:24 +0100 Subject: [PATCH] ux(): initial pass at new card / list design, #4364 --- pkg/plugins/frontend_plugin.go | 12 ++- .../plugins/partials/plugin_list.html | 55 ++++++------- .../cloudwatch/img/amazon-web-services.png | Bin 0 -> 9559 bytes .../plugins/datasource/cloudwatch/plugin.json | 13 +++- .../datasource/elasticsearch/plugin.json | 2 +- .../plugins/datasource/graphite/plugin.json | 9 ++- .../datasource/influxdb/img/influxdb_logo.svg | 15 ++++ .../plugins/datasource/influxdb/plugin.json | 13 +++- .../datasource/opentsdb/img/opentsdb_logo.png | Bin 0 -> 11644 bytes .../plugins/datasource/opentsdb/plugin.json | 13 +++- .../prometheus/img/prometheus_logo.svg | 19 +++++ .../plugins/datasource/prometheus/plugin.json | 13 +++- public/app/plugins/panel/dashlist/plugin.json | 9 ++- public/app/plugins/panel/graph/plugin.json | 9 ++- .../app/plugins/panel/singlestat/plugin.json | 9 ++- public/app/plugins/panel/table/plugin.json | 9 ++- public/app/plugins/panel/text/plugin.json | 9 ++- public/img/plugin-default-logo_dark.svg | 26 +++++++ public/img/plugin-default-logo_light.svg | 24 ++++++ public/sass/_grafana.scss | 1 + public/sass/_variables.dark.scss | 13 +++- public/sass/_variables.light.scss | 6 ++ public/sass/_variables.scss | 2 +- public/sass/base/_fonts.scss | 7 ++ public/sass/components/_cards.scss | 73 ++++++++++++++++++ 25 files changed, 311 insertions(+), 50 deletions(-) create mode 100644 public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png create mode 100644 public/app/plugins/datasource/influxdb/img/influxdb_logo.svg create mode 100644 public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png create mode 100644 public/app/plugins/datasource/prometheus/img/prometheus_logo.svg create mode 100644 public/img/plugin-default-logo_dark.svg create mode 100644 public/img/plugin-default-logo_light.svg create mode 100644 public/sass/components/_cards.scss diff --git a/pkg/plugins/frontend_plugin.go b/pkg/plugins/frontend_plugin.go index aab3f851f60..5e1b4556a16 100644 --- a/pkg/plugins/frontend_plugin.go +++ b/pkg/plugins/frontend_plugin.go @@ -24,14 +24,22 @@ func (fp *FrontendPluginBase) initFrontendPlugin() { fp.handleModuleDefaults() - fp.Info.Logos.Small = evalRelativePluginUrlPath(fp.Info.Logos.Small, fp.BaseUrl) - fp.Info.Logos.Large = evalRelativePluginUrlPath(fp.Info.Logos.Large, fp.BaseUrl) + fp.Info.Logos.Small = getPluginLogoUrl(fp.Info.Logos.Small, fp.BaseUrl) + fp.Info.Logos.Large = getPluginLogoUrl(fp.Info.Logos.Large, fp.BaseUrl) for i := 0; i < len(fp.Info.Screenshots); i++ { fp.Info.Screenshots[i].Path = evalRelativePluginUrlPath(fp.Info.Screenshots[i].Path, fp.BaseUrl) } } +func getPluginLogoUrl(path, baseUrl string) string { + if path == "" { + return "public/img/plugin-default-logo_dark.svg" + } + + return evalRelativePluginUrlPath(path, baseUrl) +} + func (fp *FrontendPluginBase) setPathsBasedOnApp(app *AppPlugin) { appSubPath := strings.Replace(fp.PluginDir, app.StaticRootAbs, "", 1) fp.IncludedInAppId = app.Id diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html index 5c3d38b3459..e11860235e5 100644 --- a/public/app/features/plugins/partials/plugin_list.html +++ b/public/app/features/plugins/partials/plugin_list.html @@ -26,37 +26,26 @@ - - - - - - - - - - - - - - - - - -
NameType
- - {{plugin.name}} - - - {{plugin.type}} - - Enabled - Pinned - - - - Edit - -
- +
+
    +
  1. + +
    + + {{plugin.type}} +
    +
    +
    + +
    +
    +
    {{plugin.name}}
    +
    By {{plugin.info.author.name}}
    +
    +
    +     +
    2. +
+
+ diff --git a/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png b/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png new file mode 100644 index 0000000000000000000000000000000000000000..f11f40347510903c178610d44d261ef530db2dc5 GIT binary patch literal 9559 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 literal 0 HcmV?d00001 diff --git a/public/app/plugins/datasource/cloudwatch/plugin.json b/public/app/plugins/datasource/cloudwatch/plugin.json index 49c5341bd21..eb2f97335da 100644 --- a/public/app/plugins/datasource/cloudwatch/plugin.json +++ b/public/app/plugins/datasource/cloudwatch/plugin.json @@ -4,5 +4,16 @@ "id": "cloudwatch", "metrics": true, - "annotations": true + "annotations": true, + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + }, + "logos": { + "small": "img/amazon-web-services.png", + "large": "img/amazon-web-services.png" + } + } } diff --git a/public/app/plugins/datasource/elasticsearch/plugin.json b/public/app/plugins/datasource/elasticsearch/plugin.json index 3cd345e5cdf..d4b07ac8e00 100644 --- a/public/app/plugins/datasource/elasticsearch/plugin.json +++ b/public/app/plugins/datasource/elasticsearch/plugin.json @@ -6,7 +6,7 @@ "info": { "description": "Elasticsearch Data Source for Grafana", "author": { - "name": "Grafana Core", + "name": "Grafana Project", "url": "http://grafana.org" }, "keywords": ["elasticsearch"], diff --git a/public/app/plugins/datasource/graphite/plugin.json b/public/app/plugins/datasource/graphite/plugin.json index a1c35094701..a561a99372b 100644 --- a/public/app/plugins/datasource/graphite/plugin.json +++ b/public/app/plugins/datasource/graphite/plugin.json @@ -8,5 +8,12 @@ ], "metrics": true, - "annotations": true + "annotations": true, + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + } + } } diff --git a/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg b/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg new file mode 100644 index 00000000000..6fad144f8c7 --- /dev/null +++ b/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/app/plugins/datasource/influxdb/plugin.json b/public/app/plugins/datasource/influxdb/plugin.json index dd60a16b715..605ce168831 100644 --- a/public/app/plugins/datasource/influxdb/plugin.json +++ b/public/app/plugins/datasource/influxdb/plugin.json @@ -5,5 +5,16 @@ "defaultMatchFormat": "regex values", "metrics": true, - "annotations": true + "annotations": true, + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + }, + "logos": { + "small": "img/influxdb_logo.svg", + "large": "img/influxdb_logo.svg" + } + } } diff --git a/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png b/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..519d56a476c4c24558ca0bca4b50f9adfa948adc GIT binary patch literal 11644 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 Pqyewx)#NH;NP literal 0 HcmV?d00001 diff --git a/public/app/plugins/datasource/opentsdb/plugin.json b/public/app/plugins/datasource/opentsdb/plugin.json index 333e9d07536..02ba02e6e89 100644 --- a/public/app/plugins/datasource/opentsdb/plugin.json +++ b/public/app/plugins/datasource/opentsdb/plugin.json @@ -5,5 +5,16 @@ "metrics": true, "defaultMatchFormat": "pipe", - "annotations": true + "annotations": true, + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + }, + "logos": { + "small": "img/opentsdb_logo.png", + "large": "img/opentsdb_logo.png" + } + } } diff --git a/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg b/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg new file mode 100644 index 00000000000..29005ec3860 --- /dev/null +++ b/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/public/app/plugins/datasource/prometheus/plugin.json b/public/app/plugins/datasource/prometheus/plugin.json index 2ff198d5129..f39f8691661 100644 --- a/public/app/plugins/datasource/prometheus/plugin.json +++ b/public/app/plugins/datasource/prometheus/plugin.json @@ -8,5 +8,16 @@ ], "metrics": true, - "annotations": true + "annotations": true, + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + }, + "logos": { + "small": "img/prometheus_logo.svg", + "large": "img/prometheus_logo.svg" + } + } } diff --git a/public/app/plugins/panel/dashlist/plugin.json b/public/app/plugins/panel/dashlist/plugin.json index 1f1266d8444..9cac424ac68 100644 --- a/public/app/plugins/panel/dashlist/plugin.json +++ b/public/app/plugins/panel/dashlist/plugin.json @@ -1,5 +1,12 @@ { "type": "panel", "name": "Dashboard list", - "id": "dashlist" + "id": "dashlist", + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + } + } } diff --git a/public/app/plugins/panel/graph/plugin.json b/public/app/plugins/panel/graph/plugin.json index f603e5e4b06..baa9fe12a39 100644 --- a/public/app/plugins/panel/graph/plugin.json +++ b/public/app/plugins/panel/graph/plugin.json @@ -1,5 +1,12 @@ { "type": "panel", "name": "Graph", - "id": "graph" + "id": "graph", + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + } + } } diff --git a/public/app/plugins/panel/singlestat/plugin.json b/public/app/plugins/panel/singlestat/plugin.json index 8372e4b2c2d..ea9ae32853a 100644 --- a/public/app/plugins/panel/singlestat/plugin.json +++ b/public/app/plugins/panel/singlestat/plugin.json @@ -1,5 +1,12 @@ { "type": "panel", "name": "Singlestat", - "id": "singlestat" + "id": "singlestat", + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + } + } } diff --git a/public/app/plugins/panel/table/plugin.json b/public/app/plugins/panel/table/plugin.json index 7f8c0bb23cf..e25efdfbe36 100644 --- a/public/app/plugins/panel/table/plugin.json +++ b/public/app/plugins/panel/table/plugin.json @@ -1,5 +1,12 @@ { "type": "panel", "name": "Table", - "id": "table" + "id": "table", + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + } + } } diff --git a/public/app/plugins/panel/text/plugin.json b/public/app/plugins/panel/text/plugin.json index 4cf046cec36..485f42942f2 100644 --- a/public/app/plugins/panel/text/plugin.json +++ b/public/app/plugins/panel/text/plugin.json @@ -1,5 +1,12 @@ { "type": "panel", "name": "Text", - "id": "text" + "id": "text", + + "info": { + "author": { + "name": "Grafana Project", + "url": "http://grafana.org" + } + } } diff --git a/public/img/plugin-default-logo_dark.svg b/public/img/plugin-default-logo_dark.svg new file mode 100644 index 00000000000..d665aa30b07 --- /dev/null +++ b/public/img/plugin-default-logo_dark.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/plugin-default-logo_light.svg b/public/img/plugin-default-logo_light.svg new file mode 100644 index 00000000000..4573494ff16 --- /dev/null +++ b/public/img/plugin-default-logo_light.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index 42956f3c3fa..f8973c65dc7 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -30,6 +30,7 @@ @import "layout/page"; // COMPONENTS +@import "components/cards"; @import "components/buttons"; @import "components/navs"; @import "components/tabs"; diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 8823b336d83..8efd9f7e55d 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -67,9 +67,9 @@ $link-hover-color: $white; // Typography // ------------------------- -$headings-color: darken($white,11%); -$abbr-border-color: $gray-3 !default; -$text-muted: darken($link-color,30%); +$headings-color: darken($white,11%); +$abbr-border-color: $gray-3 !default; +$text-muted: darken($link-color,30%); $blockquote-small-color: $gray-3 !default; $blockquote-border-color: $gray-4 !default; @@ -252,3 +252,10 @@ $popover-help-color: $text-color; // images $checkboxImageUrl: '../img/checkbox.png'; + +// cards +$card-background: linear-gradient(135deg, #2f2f2f, #262626); +$card-background-hover: linear-gradient(135deg, #343434, #262626); +$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .3); + + diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index af66e2c2389..279e284b0be 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -279,3 +279,9 @@ $popover-help-color: $gray-6; // images $checkboxImageUrl: '../img/checkbox_white.png'; + +// cards +$card-background: linear-gradient(135deg, $gray-5, $gray-6); +$card-background-hover: linear-gradient(135deg, $gray-6, $gray-7); +$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .1); + diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 4f1002bdc67..9f96591a4b9 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -4,7 +4,7 @@ // // Quickly modify global styling by enabling or disabling optional features. -$enable-flex: false !default; +$enable-flex: true !default; $enable-rounded: true !default; $enable-shadows: false !default; $enable-gradients: false !default; diff --git a/public/sass/base/_fonts.scss b/public/sass/base/_fonts.scss index f7d172a523f..e442cbdce6c 100644 --- a/public/sass/base/_fonts.scss +++ b/public/sass/base/_fonts.scss @@ -176,3 +176,10 @@ content: "\e903"; } +.icon-gf-app:before { + content: "\e902"; +} +.icon-gf-datasource:before { + content: "\e607"; +} + diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss new file mode 100644 index 00000000000..12d3b0166ff --- /dev/null +++ b/public/sass/components/_cards.scss @@ -0,0 +1,73 @@ + + +.card-section { + margin-bottom: $spacer*2; +} + +.card-list { + display: flex; + flex-direction: row; + flex-wrap: wrap; + list-style-type: none; +} + +.card-item-wrapper { + width: 100%; + padding: 0 1.5rem 1.5rem 0rem; +} + +.card-item { + display: block; + height: 100%; + min-height: 12rem; + background: $card-background; + box-shadow: $card-shadow; + padding: 1rem; + border-radius: 4px; + + &:hover { + background: $card-background-hover; + } +} + +.card-item-figure { + margin: 0 $spacer $spacer 0; + img { + width: 6rem; + } +} + +.card-item-body { + display: flex; +} + +.card-item-details { +} + +.card-item-header { + color: $text-color-weak; + margin-bottom: $spacer; +} + +.card-item-name { + color: $headings-color; + font-size: $font-size-h3; +} + +.card-item-sub-name { + color: $text-color-weak; +} + +@include media-breakpoint-up(md) { + .card-item-wrapper { + width: 50%; + } +} + +@include media-breakpoint-up(lg) { + .card-item-wrapper { + width: 33%; + } +} + +