From 59513ff963b7eb469e94b7bc02e2d41a460433f2 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 9 Aug 2017 14:28:23 +0200 Subject: [PATCH 01/40] tempvar: bug fix for duplicate template var and a fix for when selecting the same value twice in a template variable if it is not multi select. It threw an exception on the second selection --- public/app/core/directives/value_select_dropdown.js | 2 +- public/app/features/templating/editor_ctrl.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/core/directives/value_select_dropdown.js b/public/app/core/directives/value_select_dropdown.js index 8b1719c669d..a2bae1c34d3 100644 --- a/public/app/core/directives/value_select_dropdown.js +++ b/public/app/core/directives/value_select_dropdown.js @@ -122,7 +122,7 @@ function (angular, _, coreModule) { vm.selectValue = function(option, event, commitChange, excludeOthers) { if (!option) { return; } - option.selected = !option.selected; + option.selected = vm.variable.multi ? !option.selected: true; commitChange = commitChange || false; excludeOthers = excludeOthers || false; diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts index 9ef5327e7cc..beed1534f5d 100644 --- a/public/app/features/templating/editor_ctrl.ts +++ b/public/app/features/templating/editor_ctrl.ts @@ -106,7 +106,7 @@ export class VariableEditorCtrl { var clone = _.cloneDeep(variable.getSaveModel()); $scope.current = variableSrv.createVariableFromModel(clone); $scope.current.name = 'copy_of_'+variable.name; - $scope.variableSrv.addVariable($scope.current); + variableSrv.addVariable($scope.current); }; $scope.update = function() { From 1105bb371f8c6fec8cf0f241b3df2bee4d15af41 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 9 Aug 2017 18:47:11 +0200 Subject: [PATCH 02/40] mysqlds: adds support for template variables Fixes #8855 --- docs/sources/features/datasources/mysql.md | 68 ++++++++++++++++--- .../app/features/templating/query_variable.ts | 2 +- .../plugins/datasource/mysql/datasource.ts | 46 ++++++++++++- .../mysql/specs/datasource_specs.ts | 38 +++++++++++ 4 files changed, 143 insertions(+), 11 deletions(-) diff --git a/docs/sources/features/datasources/mysql.md b/docs/sources/features/datasources/mysql.md index 2072e6a4f7b..9c208ad3d37 100644 --- a/docs/sources/features/datasources/mysql.md +++ b/docs/sources/features/datasources/mysql.md @@ -29,8 +29,7 @@ data from a MySQL compatible database. The database user you specify when you add the data source should only be granted SELECT permissions on the specified database & tables you want to query. Grafana does not validate that the query is safe. The query could include any SQL statement. For example, statements like `USE otherdb;` and `DROP TABLE user;` would be -executed. To protect against this we **Highly** recommmend you create a specific mysql user with -restricted permissions. +executed. To protect against this we **Highly** recommmend you create a specific mysql user with restricted permissions. Example: @@ -49,11 +48,9 @@ Macro example | Description ------------ | ------------- *$__timeFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name. For example, *dateColumn > FROM_UNIXTIME(1494410783) AND dateColumn < FROM_UNIXTIME(1494497183)* -We plan to add many more macros. If you have suggestions for what macros you would like to see, please -[open an issue](https://github.com/grafana/grafana) in our GitHub repo. +We plan to add many more macros. If you have suggestions for what macros you would like to see, please [open an issue](https://github.com/grafana/grafana) in our GitHub repo. -The query editor has a link named `Generated SQL` that show up after a query as been executed, while in panel edit mode. Click -on it and it will expand and show the raw interpolated SQL string that was executed. +The query editor has a link named `Generated SQL` that show up after a query as been executed, while in panel edit mode. Click on it and it will expand and show the raw interpolated SQL string that was executed. ## Table queries @@ -109,8 +106,63 @@ This is something we plan to add. ## Templating -You can use variables in your queries but there are currently no support for defining `Query` variables -that target a MySQL data source. +Instead of hard-coding things like server, application and sensor name in you metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns makes it easy to change the data being displayed in your dashboard. + +Checkout the [Templating]({{< relref "reference/templating.md" >}}) documentation for an introduction to the templating feature and the different types of template variables. + +### Query Variable + +If you add a template variable of the type `Query`, you can write a MySQL query that can +return things like measurement names, key names or key values that are shown as a dropdown select box. + +For example, you can have a variable that contains all values for the `hostname` column in a table if you specify a query like this in the templating variable *Query* setting. + +```sql +SELECT hostname FROM my_host +``` + +A query can returns multiple columns and Grafana will automatically create a list from them. For example, the query below will return a list with values from `hostname` and `hostname2`. + +```sql +SELECT my_host.hostname, my_other_host.hostname2 FROM my_host JOIN my_other_host ON my_host.city = my_other_host.city +``` + +You can also create nested variables. For example if you had another variable named `region`. Then you could have +the hosts variable only show hosts from the current selected region with a query like this (if `region` is a multi-value variable then use the `IN` comparison operator rather than `=` to match against multiple values): + +```sql +SELECT hostname FROM my_host WHERE region IN($region) +``` + +### Using Variables in Queries + +Template variables are quoted automatically so if it is a string value do not wrap them in quotes in where clauses. If the variable is a multi-value variable then use the `IN` comparison operator rather than `=` to match against multiple values. + +There are two syntaxes: + +`$` Example with a template variable named `hostname`: + +```sql +SELECT + UNIX_TIMESTAMP(atimestamp) as time_sec, + aint as value, + avarchar as metric +FROM my_table +WHERE $__timeFilter(atimestamp) and hostname in($hostname) +ORDER BY atimestamp ASC +``` + +`[[varname]]` Example with a template variable named `hostname`: + +```sql +SELECT + UNIX_TIMESTAMP(atimestamp) as time_sec, + aint as value, + avarchar as metric +FROM my_table +WHERE $__timeFilter(atimestamp) and hostname in([[hostname]]) +ORDER BY atimestamp ASC +``` ## Alerting diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts index 04d642547b0..257f6b49dc6 100644 --- a/public/app/features/templating/query_variable.ts +++ b/public/app/features/templating/query_variable.ts @@ -128,7 +128,7 @@ export class QueryVariable implements Variable { } metricFindQuery(datasource, query) { - var options = {range: undefined}; + var options = {range: undefined, variable: this}; if (this.refresh === 2) { options.range = this.timeSrv.timeRange(); diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts index d2603bf8514..54857789a3c 100644 --- a/public/app/plugins/datasource/mysql/datasource.ts +++ b/public/app/plugins/datasource/mysql/datasource.ts @@ -14,11 +14,11 @@ export class MysqlDatasource { interpolateVariable(value) { if (typeof value === 'string') { - return '\"' + value + '\"'; + return '\'' + value + '\''; } var quotedValues = _.map(value, function(val) { - return '\"' + val + '\"'; + return '\'' + val + '\''; }); return quotedValues.join(','); } @@ -114,6 +114,48 @@ export class MysqlDatasource { return list; } + metricFindQuery(query, optionalOptions) { + let refId = 'tempvar'; + if (optionalOptions && optionalOptions.variable && optionalOptions.variable.name) { + refId = optionalOptions.variable.name; + } + + const interpolatedQuery = { + refId: refId, + datasourceId: this.id, + rawSql: this.templateSrv.replace(query, {}, this.interpolateVariable), + format: 'table', + }; + + return this.backendSrv.datasourceRequest({ + url: '/api/tsdb/query', + method: 'POST', + data: { + queries: [interpolatedQuery], + } + }) + .then(this.transformFindQueryResponse.bind(this, refId)); + } + + transformFindQueryResponse(refId, results) { + if (!results || results.data.length === 0 || results.data.results[refId].meta.rowCount === 0) { return []; } + + const rows = results.data.results[refId].tables[0].rows; + const res = []; + for (let i = 0; i < rows.length; i++) { + for (let j = 0; j < rows[i].length; j++) { + const value = rows[i][j]; + if ( res.indexOf( value ) === -1 ) { + res.push(value); + } + } + } + + return _.map(res, value => { + return { text: value}; + }); + } + testDatasource() { return this.backendSrv.datasourceRequest({ url: '/api/tsdb/query', diff --git a/public/app/plugins/datasource/mysql/specs/datasource_specs.ts b/public/app/plugins/datasource/mysql/specs/datasource_specs.ts index 3a82293fb61..a229e387b70 100644 --- a/public/app/plugins/datasource/mysql/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/mysql/specs/datasource_specs.ts @@ -76,4 +76,42 @@ describe('MySQLDatasource', function() { }); }); + describe('When performing metricFindQuery', function() { + let results; + const query = 'select * from atable'; + const response = { + results: { + tempvar: { + meta: { + rowCount: 3 + }, + refId: 'tempvar', + tables: [ + { + columns: [{text: 'time_sec'}, {text: 'title'}, {text: 'text'}], + rows: [ + ['aTitle', 'some text'], + ['aTitle2', 'some text2'], + ['aTitle3', 'some text3'] + ] + } + ] + } + } + }; + + beforeEach(function() { + ctx.backendSrv.datasourceRequest = function(options) { + return ctx.$q.when({data: response, status: 200}); + }; + ctx.ds.metricFindQuery(query).then(function(data) { results = data; }); + ctx.$rootScope.$apply(); + }); + + it('should return list of all column values', function() { + expect(results.length).to.be(6); + expect(results[0].text).to.be('aTitle'); + expect(results[5].text).to.be('some text3'); + }); + }); }); From 43fa852cc1287aea296e568dd4c1e025477fec1c Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 9 Aug 2017 19:33:09 +0200 Subject: [PATCH 03/40] mysql: change logging from into to debug for scan --- pkg/tsdb/mysql/mysql.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go index e38f37b96af..09ded090089 100644 --- a/pkg/tsdb/mysql/mysql.go +++ b/pkg/tsdb/mysql/mysql.go @@ -183,7 +183,7 @@ func (e MysqlExecutor) getTypedRowData(types []*sql.ColumnType, rows *core.Rows) values := make([]interface{}, len(types)) for i, stype := range types { - e.log.Info("type", "type", stype) + e.log.Debug("type", "type", stype) switch stype.DatabaseTypeName() { case mysql.FieldTypeNameTiny: values[i] = new(int8) From d2437d3cf1d562610302f596eece02d2e4e66c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 10 Aug 2017 12:04:46 +0200 Subject: [PATCH 04/40] fix: ad-hoc filters now works with data source variables, fixes #8052 --- .../templating/specs/template_srv_specs.ts | 25 +++++++++++++++ public/app/features/templating/templateSrv.js | 32 +++++++++++-------- .../app/features/templating/variable_srv.ts | 2 -- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/public/app/features/templating/specs/template_srv_specs.ts b/public/app/features/templating/specs/template_srv_specs.ts index 673273f240a..3c8b146dc18 100644 --- a/public/app/features/templating/specs/template_srv_specs.ts +++ b/public/app/features/templating/specs/template_srv_specs.ts @@ -51,6 +51,31 @@ describe('templateSrv', function() { }); }); + describe('getAdhocFilters', function() { + beforeEach(function() { + initTemplateSrv([ + {type: 'datasource', name: 'ds', current: {value: 'logstash', text: 'logstash'}}, + {type: 'adhoc', name: 'test', datasource: 'oogle', filters: [1]}, + {type: 'adhoc', name: 'test2', datasource: '$ds', filters: [2]}, + ]); + }); + + it('should return filters if datasourceName match', function() { + var filters = _templateSrv.getAdhocFilters('oogle'); + expect(filters).to.eql([1]); + }); + + it('should return empty array if datasourceName does not match', function() { + var filters = _templateSrv.getAdhocFilters('oogleasdasd'); + expect(filters).to.eql([]); + }); + + it('should return filters when datasourceName match via data source variable', function() { + var filters = _templateSrv.getAdhocFilters('logstash'); + expect(filters).to.eql([2]); + }); + }); + describe('replace can pass multi / all format', function() { beforeEach(function() { initTemplateSrv([{type: 'query', name: 'test', current: {value: ['value1', 'value2'] }}]); diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js index f47afc81574..31f8bdcbb13 100644 --- a/public/app/features/templating/templateSrv.js +++ b/public/app/features/templating/templateSrv.js @@ -15,7 +15,6 @@ function (angular, _, kbn) { this._index = {}; this._texts = {}; this._grafanaVariables = {}; - this._adhocVariables = {}; // default built ins this._builtIns = {}; @@ -30,24 +29,16 @@ function (angular, _, kbn) { this.updateTemplateData = function() { this._index = {}; this._filters = {}; - this._adhocVariables = {}; for (var i = 0; i < this.variables.length; i++) { var variable = this.variables[i]; - // add adhoc filters to it's own index - if (variable.type === 'adhoc') { - this._adhocVariables[variable.datasource] = variable; - continue; - } - if (!variable.current || !variable.current.isNone && !variable.current.value) { continue; } this._index[variable.name] = variable; } - }; this.variableInitialized = function(variable) { @@ -55,11 +46,26 @@ function (angular, _, kbn) { }; this.getAdhocFilters = function(datasourceName) { - var variable = this._adhocVariables[datasourceName]; - if (variable) { - return variable.filters || []; + var filters = []; + + for (var i = 0; i < this.variables.length; i++) { + var variable = this.variables[i]; + if (variable.type !== 'adhoc') { + continue; + } + + if (variable.datasource === datasourceName) { + filters = filters.concat(variable.filters); + } + + if (variable.datasource.indexOf('$') === 0) { + if (this.replace(variable.datasource) === datasourceName) { + filters = filters.concat(variable.filters); + } + } } - return []; + + return filters; }; function luceneEscape(value) { diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts index c147c5b6685..a0e2dfde23d 100644 --- a/public/app/features/templating/variable_srv.ts +++ b/public/app/features/templating/variable_srv.ts @@ -247,8 +247,6 @@ export class VariableSrv { } filter.operator = options.operator; - - variable.setFilters(filters); this.variableUpdated(variable, true); } From c7959ff06e1151fa1b0b99e916e55f5a21340cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 10 Aug 2017 14:12:31 +0200 Subject: [PATCH 05/40] fix: Using table cell links and ad hoc filters together now works & looks correct, fixes #8052 --- public/app/plugins/panel/table/renderer.ts | 12 ++++++------ public/sass/components/_panel_table.scss | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/app/plugins/panel/table/renderer.ts b/public/app/plugins/panel/table/renderer.ts index 02f0ceca72c..cab3f698ae6 100644 --- a/public/app/plugins/panel/table/renderer.ts +++ b/public/app/plugins/panel/table/renderer.ts @@ -157,9 +157,9 @@ export class TableRenderer { // because of the fixed table headers css only solution // there is an issue if header cell is wider the cell // this hack adds header content to cell (not visible) - var widthHack = ''; + var columnHtml = ''; if (addWidthHack) { - widthHack = '
' + this.table.columns[columnIndex].title + '
'; + columnHtml = '
' + this.table.columns[columnIndex].title + '
'; } if (value === undefined) { @@ -173,8 +173,6 @@ export class TableRenderer { cellClasses.push("table-panel-cell-pre"); } - var columnHtml = widthHack + value; - if (column.style && column.style.link) { // Render cell as link var scopedVars = this.renderRowVariables(rowIndex); @@ -185,11 +183,13 @@ export class TableRenderer { var cellTarget = column.style.linkTargetBlank ? '_blank' : ''; cellClasses.push("table-panel-cell-link"); - columnHtml = ` + columnHtml += ` - ${columnHtml} + ${value} `; + } else { + columnHtml += value; } if (column.filterable) { diff --git a/public/sass/components/_panel_table.scss b/public/sass/components/_panel_table.scss index cf81dca4465..77652bc634d 100644 --- a/public/sass/components/_panel_table.scss +++ b/public/sass/components/_panel_table.scss @@ -84,7 +84,7 @@ a { padding: 0.45em 0 0.45em 1.1em; height: 100%; - width: 100%; + display: inline-block; } } From b716a2595ad9c9cffcf6dcfb5c9d960b091bdb02 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 10 Aug 2017 14:39:36 +0200 Subject: [PATCH 06/40] mysqlds: add support for key/value template variables If the template variable query has two columns named __text and __value then return a list of key values. The value is used when the variable is interpolated in the query. Allows mapping of texts to ids. --- docs/sources/features/datasources/mysql.md | 8 + .../plugins/datasource/mysql/datasource.ts | 101 +------------ .../datasource/mysql/response_parser.ts | 143 ++++++++++++++++++ .../mysql/specs/datasource_specs.ts | 82 +++++++++- 4 files changed, 238 insertions(+), 96 deletions(-) create mode 100644 public/app/plugins/datasource/mysql/response_parser.ts diff --git a/docs/sources/features/datasources/mysql.md b/docs/sources/features/datasources/mysql.md index 9c208ad3d37..02e821050fa 100644 --- a/docs/sources/features/datasources/mysql.md +++ b/docs/sources/features/datasources/mysql.md @@ -106,6 +106,8 @@ This is something we plan to add. ## Templating +This feature is currently available in the nightly builds and will be included in the 5.0.0 release. + Instead of hard-coding things like server, application and sensor name in you metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns makes it easy to change the data being displayed in your dashboard. Checkout the [Templating]({{< relref "reference/templating.md" >}}) documentation for an introduction to the templating feature and the different types of template variables. @@ -127,6 +129,12 @@ A query can returns multiple columns and Grafana will automatically create a lis SELECT my_host.hostname, my_other_host.hostname2 FROM my_host JOIN my_other_host ON my_host.city = my_other_host.city ``` +Another option is a query that can create a key/value variable. The query should return two columns that are named `__text` and `__value`. The `__text` column value should be unique (if it is not unique then the first value is used). The options in the dropdown will have a text and value that allows you to have a friendly name as text and an id as the value. An example query with `hostname` as the text and `id` as the value: + +```sql +SELECT hostname AS __text, id AS __value FROM my_host +``` + You can also create nested variables. For example if you had another variable named `region`. Then you could have the hosts variable only show hosts from the current selected region with a query like this (if `region` is a multi-value variable then use the `IN` comparison operator rather than `=` to match against multiple values): diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts index 54857789a3c..dfc990b52e4 100644 --- a/public/app/plugins/datasource/mysql/datasource.ts +++ b/public/app/plugins/datasource/mysql/datasource.ts @@ -1,15 +1,18 @@ /// import _ from 'lodash'; +import ResponseParser from './response_parser'; export class MysqlDatasource { id: any; name: any; + responseParser: ResponseParser; /** @ngInject **/ constructor(instanceSettings, private backendSrv, private $q, private templateSrv) { this.name = instanceSettings.name; this.id = instanceSettings.id; + this.responseParser = new ResponseParser(this.$q); } interpolateVariable(value) { @@ -49,7 +52,7 @@ export class MysqlDatasource { to: options.range.to.valueOf().toString(), queries: queries, } - }).then(this.processQueryResult.bind(this)); + }).then(this.responseParser.processQueryResult); } annotationQuery(options) { @@ -72,46 +75,7 @@ export class MysqlDatasource { to: options.range.to.valueOf().toString(), queries: [query], } - }).then(this.transformAnnotationResponse.bind(this, options)); - } - - transformAnnotationResponse(options, data) { - const table = data.data.results[options.annotation.name].tables[0]; - - let timeColumnIndex = -1; - let titleColumnIndex = -1; - let textColumnIndex = -1; - let tagsColumnIndex = -1; - - for (let i = 0; i < table.columns.length; i++) { - if (table.columns[i].text === 'time_sec') { - timeColumnIndex = i; - } else if (table.columns[i].text === 'title') { - titleColumnIndex = i; - } else if (table.columns[i].text === 'text') { - textColumnIndex = i; - } else if (table.columns[i].text === 'tags') { - tagsColumnIndex = i; - } - } - - if (timeColumnIndex === -1) { - return this.$q.reject({message: 'Missing mandatory time column (with time_sec column alias) in annotation query.'}); - } - - const list = []; - for (let i = 0; i < table.rows.length; i++) { - const row = table.rows[i]; - list.push({ - annotation: options.annotation, - time: Math.floor(row[timeColumnIndex]) * 1000, - title: row[titleColumnIndex], - text: row[textColumnIndex], - tags: row[tagsColumnIndex] ? row[tagsColumnIndex].trim().split(/\s*,\s*/) : [] - }); - } - - return list; + }).then(data => this.responseParser.transformAnnotationResponse(options, data)); } metricFindQuery(query, optionalOptions) { @@ -134,26 +98,7 @@ export class MysqlDatasource { queries: [interpolatedQuery], } }) - .then(this.transformFindQueryResponse.bind(this, refId)); - } - - transformFindQueryResponse(refId, results) { - if (!results || results.data.length === 0 || results.data.results[refId].meta.rowCount === 0) { return []; } - - const rows = results.data.results[refId].tables[0].rows; - const res = []; - for (let i = 0; i < rows.length; i++) { - for (let j = 0; j < rows[i].length; j++) { - const value = rows[i][j]; - if ( res.indexOf( value ) === -1 ) { - res.push(value); - } - } - } - - return _.map(res, value => { - return { text: value}; - }); + .then(data => this.responseParser.parseMetricFindQueryResult(refId, data)); } testDatasource() { @@ -183,39 +128,5 @@ export class MysqlDatasource { } }); } - - processQueryResult(res) { - var data = []; - - if (!res.data.results) { - return {data: data}; - } - - for (let key in res.data.results) { - let queryRes = res.data.results[key]; - - if (queryRes.series) { - for (let series of queryRes.series) { - data.push({ - target: series.name, - datapoints: series.points, - refId: queryRes.refId, - meta: queryRes.meta, - }); - } - } - - if (queryRes.tables) { - for (let table of queryRes.tables) { - table.type = 'table'; - table.refId = queryRes.refId; - table.meta = queryRes.meta; - data.push(table); - } - } - } - - return {data: data}; - } } diff --git a/public/app/plugins/datasource/mysql/response_parser.ts b/public/app/plugins/datasource/mysql/response_parser.ts new file mode 100644 index 00000000000..1b89cc78599 --- /dev/null +++ b/public/app/plugins/datasource/mysql/response_parser.ts @@ -0,0 +1,143 @@ +/// + +import _ from 'lodash'; + +export default class ResponseParser { + constructor(private $q){} + + processQueryResult(res) { + var data = []; + + if (!res.data.results) { + return {data: data}; + } + + for (let key in res.data.results) { + let queryRes = res.data.results[key]; + + if (queryRes.series) { + for (let series of queryRes.series) { + data.push({ + target: series.name, + datapoints: series.points, + refId: queryRes.refId, + meta: queryRes.meta, + }); + } + } + + if (queryRes.tables) { + for (let table of queryRes.tables) { + table.type = 'table'; + table.refId = queryRes.refId; + table.meta = queryRes.meta; + data.push(table); + } + } + } + + return {data: data}; + } + + parseMetricFindQueryResult(refId, results) { + if (!results || results.data.length === 0 || results.data.results[refId].meta.rowCount === 0) { return []; } + + const columns = results.data.results[refId].tables[0].columns; + const rows = results.data.results[refId].tables[0].rows; + const textColIndex = this.findColIndex(columns, '__text'); + const valueColIndex = this.findColIndex(columns, '__value'); + + if (columns.length === 2 && textColIndex !== -1 && valueColIndex !== -1){ + return this.transformToKeyValueList(rows, textColIndex, valueColIndex); + } + + return this.transformToSimpleList(rows); + } + + transformToKeyValueList(rows, textColIndex, valueColIndex) { + const res = []; + + for (let i = 0; i < rows.length; i++) { + if (!this.containsKey(res, rows[i][textColIndex])) { + res.push({text: rows[i][textColIndex], value: rows[i][valueColIndex]}); + } + } + + return res; + } + + transformToSimpleList(rows) { + const res = []; + + for (let i = 0; i < rows.length; i++) { + for (let j = 0; j < rows[i].length; j++) { + const value = rows[i][j]; + if ( res.indexOf( value ) === -1 ) { + res.push(value); + } + } + } + + return _.map(res, value => { + return { text: value}; + }); + } + + findColIndex(columns, colName) { + for (let i = 0; i < columns.length; i++) { + if (columns[i].text === colName) { + return i; + } + } + + return -1; + } + + containsKey(res, key) { + for (let i = 0; i < res.length; i++) { + if (res[i].text === key) { + return true; + } + } + return false; + } + + transformAnnotationResponse(options, data) { + const table = data.data.results[options.annotation.name].tables[0]; + + let timeColumnIndex = -1; + let titleColumnIndex = -1; + let textColumnIndex = -1; + let tagsColumnIndex = -1; + + for (let i = 0; i < table.columns.length; i++) { + if (table.columns[i].text === 'time_sec') { + timeColumnIndex = i; + } else if (table.columns[i].text === 'title') { + titleColumnIndex = i; + } else if (table.columns[i].text === 'text') { + textColumnIndex = i; + } else if (table.columns[i].text === 'tags') { + tagsColumnIndex = i; + } + } + + if (timeColumnIndex === -1) { + return this.$q.reject({message: 'Missing mandatory time column (with time_sec column alias) in annotation query.'}); + } + + const list = []; + for (let i = 0; i < table.rows.length; i++) { + const row = table.rows[i]; + list.push({ + annotation: options.annotation, + time: Math.floor(row[timeColumnIndex]) * 1000, + title: row[titleColumnIndex], + text: row[textColumnIndex], + tags: row[tagsColumnIndex] ? row[tagsColumnIndex].trim().split(/\s*,\s*/) : [] + }); + } + + return list; + } +} diff --git a/public/app/plugins/datasource/mysql/specs/datasource_specs.ts b/public/app/plugins/datasource/mysql/specs/datasource_specs.ts index a229e387b70..11ddaa34086 100644 --- a/public/app/plugins/datasource/mysql/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/mysql/specs/datasource_specs.ts @@ -88,7 +88,7 @@ describe('MySQLDatasource', function() { refId: 'tempvar', tables: [ { - columns: [{text: 'time_sec'}, {text: 'title'}, {text: 'text'}], + columns: [{text: 'title'}, {text: 'text'}], rows: [ ['aTitle', 'some text'], ['aTitle2', 'some text2'], @@ -114,4 +114,84 @@ describe('MySQLDatasource', function() { expect(results[5].text).to.be('some text3'); }); }); + + describe('When performing metricFindQuery with key, value columns', function() { + let results; + const query = 'select * from atable'; + const response = { + results: { + tempvar: { + meta: { + rowCount: 3 + }, + refId: 'tempvar', + tables: [ + { + columns: [{text: '__value'}, {text: '__text'}], + rows: [ + ['value1', 'aTitle'], + ['value2', 'aTitle2'], + ['value3', 'aTitle3'] + ] + } + ] + } + } + }; + + beforeEach(function() { + ctx.backendSrv.datasourceRequest = function(options) { + return ctx.$q.when({data: response, status: 200}); + }; + ctx.ds.metricFindQuery(query).then(function(data) { results = data; }); + ctx.$rootScope.$apply(); + }); + + it('should return list of as text, value', function() { + expect(results.length).to.be(3); + expect(results[0].text).to.be('aTitle'); + expect(results[0].value).to.be('value1'); + expect(results[2].text).to.be('aTitle3'); + expect(results[2].value).to.be('value3'); + }); + }); + + describe('When performing metricFindQuery with key, value columns and with duplicate keys', function() { + let results; + const query = 'select * from atable'; + const response = { + results: { + tempvar: { + meta: { + rowCount: 3 + }, + refId: 'tempvar', + tables: [ + { + columns: [{text: '__text'}, {text: '__value'}], + rows: [ + ['aTitle', 'same'], + ['aTitle', 'same'], + ['aTitle', 'diff'] + ] + } + ] + } + } + }; + + beforeEach(function() { + ctx.backendSrv.datasourceRequest = function(options) { + return ctx.$q.when({data: response, status: 200}); + }; + ctx.ds.metricFindQuery(query).then(function(data) { results = data; }); + ctx.$rootScope.$apply(); + }); + + it('should return list of unique keys', function() { + expect(results.length).to.be(1); + expect(results[0].text).to.be('aTitle'); + expect(results[0].value).to.be('same'); + }); + }); }); From c4feef2541621d3397e73599b7217e7f4ef8e52b Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 11 Aug 2017 10:24:54 +0200 Subject: [PATCH 07/40] docs: http api /users - corrections + adds missing method --- docs/sources/http_api/user.md | 48 +++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/docs/sources/http_api/user.md b/docs/sources/http_api/user.md index fa20fd3e9b3..761ac938cd8 100644 --- a/docs/sources/http_api/user.md +++ b/docs/sources/http_api/user.md @@ -20,9 +20,9 @@ parent = "http_api" GET /api/users HTTP/1.1 Accept: application/json Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + Authorization: Basic YWRtaW46YWRtaW4= -Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. +Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. Requires basic authentication and that the authenticated user is a Grafana Admin. **Example Response**: @@ -55,10 +55,12 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter GET /api/users/search?perpage=10&page=1&query=mygraf HTTP/1.1 Accept: application/json Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + Authorization: Basic YWRtaW46YWRtaW4= Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the user list E.g. if `totalCount` is equal to 100 users and the `perpage` parameter is set to 10 then there are 10 pages of users. The `query` parameter is optional and it will return results where the query value is contained in one of the `name`, `login` or `email` fields. Query values with spaces need to be url encoded e.g. `query=Jane%20Doe`. +Requires basic authentication and that the authenticated user is a Grafana Admin. + **Example Response**: HTTP/1.1 200 @@ -94,7 +96,9 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter GET /api/users/1 HTTP/1.1 Accept: application/json Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + Authorization: Basic YWRtaW46YWRtaW4= + +Requires basic authentication and that the authenticated user is a Grafana Admin. **Example Response**: @@ -126,7 +130,9 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter GET /api/users/lookup?loginOrEmail=admin HTTP/1.1 Accept: application/json Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + Authorization: Basic YWRtaW46YWRtaW4= + +Requires basic authentication and that the authenticated user is a Grafana Admin. **Example Response**: @@ -152,7 +158,7 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter PUT /api/users/2 HTTP/1.1 Accept: application/json Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + Authorization: Basic YWRtaW46YWRtaW4= { "email":"user@mygraf.com", @@ -161,6 +167,8 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter "theme":"light" } +Requires basic authentication and that the authenticated user is a Grafana Admin. + **Example Response**: HTTP/1.1 200 @@ -178,7 +186,9 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter GET /api/users/1/orgs HTTP/1.1 Accept: application/json Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + Authorization: Basic YWRtaW46YWRtaW4= + +Requires basic authentication and that the authenticated user is a Grafana Admin. **Example Response**: @@ -246,11 +256,29 @@ Changes the password for the user {"message":"User password changed"} -## Switch user context +## Switch user context for a specified user -`POST /api/user/using/:organisationId` +`POST /api/users/:userId/using/:organizationId` -Switch user context to the given organisation. +Switch user context to the given organization. Requires basic authentication and that the authenticated user is a Grafana Admin. + +**Example Request**: + + POST /api/users/7/using/2 HTTP/1.1 + Authorization: Basic YWRtaW46YWRtaW4= + +**Example Response**: + + HTTP/1.1 200 + Content-Type: application/json + + {"message":"Active organization changed"} + +## Switch user context for signed in user + +`POST /api/user/using/:organizationId` + +Switch user context to the given organization. **Example Request**: From 02248273aece31ec709527dd19f35bf26b2f861f Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 11 Aug 2017 10:25:37 +0200 Subject: [PATCH 08/40] mysqlds: remove alpha state from plugin.json --- public/app/plugins/datasource/mysql/plugin.json | 1 - 1 file changed, 1 deletion(-) diff --git a/public/app/plugins/datasource/mysql/plugin.json b/public/app/plugins/datasource/mysql/plugin.json index e26823edbeb..5f35b3f709f 100644 --- a/public/app/plugins/datasource/mysql/plugin.json +++ b/public/app/plugins/datasource/mysql/plugin.json @@ -14,7 +14,6 @@ } }, - "state": "alpha", "alerting": true, "annotations": true, "metrics": true From 167995776fa05396f8717034c67d3c939ba2aa69 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 11 Aug 2017 11:30:30 +0200 Subject: [PATCH 09/40] docs: update to tag alias ref #9024 --- docs/sources/features/datasources/influxdb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/features/datasources/influxdb.md b/docs/sources/features/datasources/influxdb.md index 3f86b9ee703..8f4f5981124 100644 --- a/docs/sources/features/datasources/influxdb.md +++ b/docs/sources/features/datasources/influxdb.md @@ -88,7 +88,7 @@ You can switch to raw query mode by clicking hamburger icon and then `Switch edi - $m = replaced with measurement name - $measurement = replaced with measurement name - $col = replaced with column name -- $tag_exampletag = replaced with the value of the `exampletag` tag. To use your tag as an alias in the ALIAS BY field then the tag must be used to group by in the query. +- $tag_exampletag = replaced with the value of the `exampletag` tag. The syntax is `$tag_yourTagName` (must start with `$tag_`). To use your tag as an alias in the ALIAS BY field then the tag must be used to group by in the query. - You can also use [[tag_hostname]] pattern replacement syntax. For example, in the ALIAS BY field using this text `Host: [[tag_hostname]]` would substitute in the `hostname` tag value for each legend value and an example legend value would be: `Host: server1`. ### Table query / raw data From d4dd0222fa8f0f2b4d15d2d67ccb6d86a6926998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 11 Aug 2017 12:33:40 +0200 Subject: [PATCH 10/40] fix: prometheus does not have two editor modes, fixes #9025 --- public/app/features/dashboard/submenu/submenu.ts | 4 ---- .../plugins/datasource/prometheus/partials/query.editor.html | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/public/app/features/dashboard/submenu/submenu.ts b/public/app/features/dashboard/submenu/submenu.ts index 0082f120b5f..69081f01cab 100644 --- a/public/app/features/dashboard/submenu/submenu.ts +++ b/public/app/features/dashboard/submenu/submenu.ts @@ -29,10 +29,6 @@ export class SubmenuCtrl { var search = _.extend(this.$location.search(), {editview: editview}); this.$location.search(search); } - - exitBuildMode() { - this.dashboard.toggleEditMode(); - } } export function submenuDirective() { diff --git a/public/app/plugins/datasource/prometheus/partials/query.editor.html b/public/app/plugins/datasource/prometheus/partials/query.editor.html index 7992d5a8c12..35c6af1280b 100644 --- a/public/app/plugins/datasource/prometheus/partials/query.editor.html +++ b/public/app/plugins/datasource/prometheus/partials/query.editor.html @@ -1,4 +1,4 @@ - +
From 17cb3f6e6a9d0fa3eca56495545edebcb7fb1364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 11 Aug 2017 16:20:36 +0200 Subject: [PATCH 11/40] fix: graph fix for decimals, bug introduced by #61313478063b0e0721f204847f3c0298ea8f593f --- public/app/plugins/panel/graph/graph.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index 6b70ad36e4e..2887f2f4504 100755 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -498,7 +498,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) { logBase: panel.yaxes[0].logBase || 1, min: panel.yaxes[0].min ? _.toNumber(panel.yaxes[0].min) : null, max: panel.yaxes[0].max ? _.toNumber(panel.yaxes[0].max) : null, - tickDecimals: panel.yaxes[0].decimals !== null ? _.toNumber(panel.yaxes[0].decimals): null + tickDecimals: panel.yaxes[0].decimals }; options.yaxes.push(defaults); From f02be0251b735399339f358ece33d016a0b200f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 12:26:24 +0200 Subject: [PATCH 12/40] ux: use flexbox for sidenav, put logo in sidenav --- public/app/core/components/navbar/navbar.html | 5 - .../core/components/sidemenu/sidemenu.html | 134 ++++++++-------- .../features/plugins/partials/ds_list.html | 3 - public/sass/components/_sidemenu.scss | 37 +---- public/sass/layout/_page.scss | 8 +- public/views/index.html | 145 +++++++++--------- 6 files changed, 151 insertions(+), 181 deletions(-) diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index 1294fefddca..d2543b91868 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -1,9 +1,4 @@
- - - - - - - - +
  • + + + + + + +
    • + + + diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index f6748b37d61..2a8f728346e 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,5 +1,3 @@ - -

    Data Sources

    @@ -44,5 +42,4 @@
    No data sources defined
    -
    diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index f269cae82dd..a1347bc2633 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -1,47 +1,16 @@ -.sidemenu-canvas { - position: relative; -} .sidemenu-wrapper { - position: absolute; - top: 52px; - left: 0; - //border-top: 1px solid $tight-form-border; + display: flex; + flex-direction: column; width: $side-menu-width; background-color: $side-menu-bg; - z-index: 1000; - opacity: 0; - visibility: hidden; + z-index: 1; a:focus { text-decoration: none; } } -.sidemenu-open { - .sidemenu-wrapper { - visibility: visible; - //transform: translate3d(0, 0, 0); - opacity: 1; - transition: opacity 0.3s; - } -} - -.sidemenu-pinned { - .sidemenu-wrapper { - min-height: calc(100% - 54px); - } - .dashboard-container { - padding-left: $side-menu-width + 8px; - } - .page-container { - margin-left: $side-menu-width; - } - .search-container { - left: $side-menu-width; - } -} - .sidemenu { list-style: none; margin: 0; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 5702a1aa260..33a62e8fbc5 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -1,16 +1,18 @@ .grafana-app { - display: block; height: 100%; + display: flex; + align-items: stretch; + width: 100%; } .main-view { - // height: 100%; REMOVED FOR FOOTER TRW + flex-grow: 1; } .page-container { + @extend .container; background-color: $page-bg; padding: ($spacer * 2) ($spacer * 4); - max-width: 1060px; min-height: calc(100% - 54px); padding-bottom: $spacer * 5; background-image: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%) diff --git a/public/views/index.html b/public/views/index.html index b3c504740da..411481b2149 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -25,9 +25,7 @@ - +
    @@ -39,77 +37,80 @@
    -
    - -     +
    +
    - + +
    + - - - - - - + - [[if .GoogleTagManagerId]] - - - - - - [[end]] + + + + + + - + [[if .GoogleTagManagerId]] + + + + + + [[end]] + + From 8b8796434407fdd2e2c4da456d0fa147a1ba7575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 13:57:16 +0200 Subject: [PATCH 13/40] ux: testing roboto font --- ...Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2 | Bin 0 -> 1468 bytes ...OANh32k2VkgEoUBTbgVql8nDJpwnrE27mub0.woff2 | Bin 0 -> 1496 bytes .../fonts/roboto/CWB0XYA8bzo0kSThX0UTuA.woff2 | Bin 0 -> 14600 bytes ...8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2 | Bin 0 -> 11788 bytes ...TrIFD6DJsEVi07RTbgVql8nDJpwnrE27mub0.woff2 | Bin 0 -> 5464 bytes ...OpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2 | Bin 0 -> 5208 bytes ...aF0XFOW1gnuHF0SYE0-AqJ3nfInTTiDXDjU4.woff2 | Bin 0 -> 12728 bytes ...aF0XFOW1gnuHF0TTOQ_MqJVwkKsUn0wKzc2I.woff2 | Bin 0 -> 16756 bytes ...aF0XFOW1gnuHF0TUj_cnvWIuuBMVgbX098Mw.woff2 | Bin 0 -> 10828 bytes ...aF0XFOW1gnuHF0UbcKLIaa1LC45dFaAfauRA.woff2 | Bin 0 -> 1508 bytes ...aF0XFOW1gnuHF0Wo_sUJ8uO4YLWRInS22T3Y.woff2 | Bin 0 -> 7820 bytes ...aF0XFOW1gnuHF0Y4P5ICox8Kq3LLUNMylGO4.woff2 | Bin 0 -> 16112 bytes ...aF0XFOW1gnuHF0b6up8jxqWt8HVA3mDhkV_0.woff2 | Bin 0 -> 5564 bytes ...0UgQQhGj_SFdLWBTbgVql8nDJpwnrE27mub0.woff2 | Bin 0 -> 10448 bytes ...eo3R5zSexge8UUVtXRa8TVwTICgirnJhmVJw.woff2 | Bin 0 -> 14748 bytes ...C3KdtC7lMafG4dRTbgVql8nDJpwnrE27mub0.woff2 | Bin 0 -> 16880 bytes ...YbATG60EpZBSDyxJtnKITppOI_IvcXXDNrsc.woff2 | Bin 0 -> 15164 bytes ...nQTOVbaoxwdOr9xTbgVql8nDJpwnrE27mub0.woff2 | Bin 0 -> 7836 bytes ...GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2 | Bin 0 -> 15516 bytes ...g_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2 | Bin 0 -> 9848 bytes ...H69Zi6eEPBYVFhRJtnKITppOI_IvcXXDNrsc.woff2 | Bin 0 -> 5216 bytes ...uB63VIKFYnEMXrRJtnKITppOI_IvcXXDNrsc.woff2 | Bin 0 -> 7112 bytes ...QWvpCWqAhzHcCSBJtnKITppOI_IvcXXDNrsc.woff2 | Bin 0 -> 9920 bytes ...lrTefzLYmlVV1UBJtnKITppOI_IvcXXDNrsc.woff2 | Bin 0 -> 11712 bytes ...r2l75qb0YND9NyBJtnKITppOI_IvcXXDNrsc.woff2 | Bin 0 -> 1484 bytes ...0qHq_6dX7lKVByfesZW2xOQ-xsNqO47m55DA.woff2 | Bin 0 -> 16204 bytes ...SK0LLjjfeaxcREhTbgVql8nDJpwnrE27mub0.woff2 | Bin 0 -> 12636 bytes public/sass/_variables.scss | 6 +- public/sass/base/_fonts.scss | 268 +++++++----------- public/sass/components/_row.scss | 2 +- public/sass/pages/_dashboard.scss | 1 + 31 files changed, 110 insertions(+), 167 deletions(-) create mode 100644 public/fonts/roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2 create mode 100644 public/fonts/roboto/1hZf02POANh32k2VkgEoUBTbgVql8nDJpwnrE27mub0.woff2 create mode 100644 public/fonts/roboto/CWB0XYA8bzo0kSThX0UTuA.woff2 create mode 100644 public/fonts/roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2 create mode 100644 public/fonts/roboto/K23cxWVTrIFD6DJsEVi07RTbgVql8nDJpwnrE27mub0.woff2 create mode 100644 public/fonts/roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0SYE0-AqJ3nfInTTiDXDjU4.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0TTOQ_MqJVwkKsUn0wKzc2I.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0TUj_cnvWIuuBMVgbX098Mw.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0UbcKLIaa1LC45dFaAfauRA.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0Wo_sUJ8uO4YLWRInS22T3Y.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0Y4P5ICox8Kq3LLUNMylGO4.woff2 create mode 100644 public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0b6up8jxqWt8HVA3mDhkV_0.woff2 create mode 100644 public/fonts/roboto/OpXUqTo0UgQQhGj_SFdLWBTbgVql8nDJpwnrE27mub0.woff2 create mode 100644 public/fonts/roboto/RxZJdnzeo3R5zSexge8UUVtXRa8TVwTICgirnJhmVJw.woff2 create mode 100644 public/fonts/roboto/WxrXJa0C3KdtC7lMafG4dRTbgVql8nDJpwnrE27mub0.woff2 create mode 100644 public/fonts/roboto/ZLqKeelYbATG60EpZBSDyxJtnKITppOI_IvcXXDNrsc.woff2 create mode 100644 public/fonts/roboto/cDKhRaXnQTOVbaoxwdOr9xTbgVql8nDJpwnrE27mub0.woff2 create mode 100644 public/fonts/roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2 create mode 100644 public/fonts/roboto/mErvLBYg_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2 create mode 100644 public/fonts/roboto/mbmhprMH69Zi6eEPBYVFhRJtnKITppOI_IvcXXDNrsc.woff2 create mode 100644 public/fonts/roboto/mx9Uck6uB63VIKFYnEMXrRJtnKITppOI_IvcXXDNrsc.woff2 create mode 100644 public/fonts/roboto/oHi30kwQWvpCWqAhzHcCSBJtnKITppOI_IvcXXDNrsc.woff2 create mode 100644 public/fonts/roboto/oOeFwZNlrTefzLYmlVV1UBJtnKITppOI_IvcXXDNrsc.woff2 create mode 100644 public/fonts/roboto/rGvHdJnr2l75qb0YND9NyBJtnKITppOI_IvcXXDNrsc.woff2 create mode 100644 public/fonts/roboto/vPcynSL0qHq_6dX7lKVByfesZW2xOQ-xsNqO47m55DA.woff2 create mode 100644 public/fonts/roboto/vSzulfKSK0LLjjfeaxcREhTbgVql8nDJpwnrE27mub0.woff2 diff --git a/public/fonts/roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2 b/public/fonts/roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..870072d8bb0d57bdf83b37cafd8a5479bada0180 GIT binary patch literal 1468 zcmV;t1w;CGPew8T0RR9100q1N5&!@I014m#00mzF0RR9100000000000000000000 z0000QCL3@ZECyfzSO`=JgFF!o3WI2aN(&GG5)=V80we<*1Rw>13I`wzf=L^E2*{4a zbbEum6oe`BBY2*F&+pehIf=_FWgvI#c0@k&^Eo$9)Gyuswf5Wliiq4IdV-1EqT-D% z{t#v&QON&(i|dtTq>RQ@tWJD*)v&oeAoq z>)x+JP$U6>N(2i*5EKvq0Rjl%(Vd~_QDfrLkkRtarW$0lx~a4p8Eq(RsY6C+fPdt` z`jt&}NCCVq8U^+aigL8BmX% z3NYu)jxkGURgl`S&XxU4BV6-j}dbb&jIDdCFrPCLIdOLft2f6 z(k4)D8Bif>WUNb)*2h=?5uGQ3o0LBg>Y~C!@_#Zq(a`LQ7cXK#n2-*y3!gPkQ+seF{Z=esdfsUf^C=(7Odw< zS*^Fy;GtlrEC&&DHn(O9kW)Ph=gu`+mKct}uJDCX2&CFlqkg)tA2c4N^ zZl=BQy`^9bt!4@ko_Q!uSN>ot!9+Q0XUM$#K?g?F4MK;|DEJm6C>&I&L<#^KfF$4o zLxD9-4D@eeLIu?Fv^M9_v* zuRmta@lW*Vqgf1m40G($x%;z~$$P7O-k&||UD`i~89isLT!5r@=Gf?6KmP7-Z#Afe zXC&9yI&JB;4=x^RuSa*f8<+K$yS49JI^4Vc&U?I#i*xTkA>ud7AAR7ha`n6Z-**}x ze&p4p`fpH;&dT=Tw-sLuF5u*i`D)+Pv?!m0MUS?kEqV;d#{B1OSXNeMQq9)np|lsoDBz_%5QPdQ6xs7 zG@6q-*S*JKm{2EBqZX~xG@2^}JjXo#toyAH>AF+Byl&+4k^LBo8U&=}YebrZE}4%t zcABpq|L1@Jfop3}mbL)|P_42%S6?}4vHIZOof-!LJoi(kD+1n^8NdBg_y7BDcc&SI zivmEv-cSs{9sf^Vae~_&!F8~W3s}K7%fDbAVV4oI*?ghc69H^4rjl7m5de~)P_3~h z?B^jyw2OhSGAoh42)S4~o$(@vB7CEF)Pf-Ld68)@F%4wyBLYl~+lqQ;~ zq@FrxdeW61^r9bw5W64lxAiC%%N4W)`UZUHrr7;+97}1SkYXw*g<~^Kl*6-uN{T6^ zj%G?}hG!Ddgc42ysf5E`{YTv~0HCyv63m%V;26<~STvNQ9A+fB!&zpaleMu1ays## zL=EDwPPy(uC5-d36U;~%>1M6Rblzk?M?+?Mbha>5XIA6F2p3~!FYaF8W67Mp)k)q) z%uO5ZVWY#mwk5G1ragan#grv1_=?XhAIuUuX%$6_CH;EZnrO0AP;YxvomzTY@PiHz zXMK66h~IVX;jmh&IbIyoVdy5b#8YWAT}<~-37Uk~co;3F!{wBjY?CSd2u(suyqGSg WH>m`}gw}X-t6NAl7nP7|1^@so$)`vF literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/1hZf02POANh32k2VkgEoUBTbgVql8nDJpwnrE27mub0.woff2 b/public/fonts/roboto/1hZf02POANh32k2VkgEoUBTbgVql8nDJpwnrE27mub0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..1cab9b4bbfad9e29b94e2a7355dfd8232dc184e0 GIT binary patch literal 1496 zcmV;}1t1AO|1}fnHFR_|AhO%wiw4uM+IFpiiMRF5kk32~wIfQX%v zwV6{6b!@a;iZauzTURT^c)3){q$mlNOSR0bmuh}}cR1HFBhcQol0Q;!uANvZwR}FC z`Jq)2tJ0M8gx8sp-f&Qctbn?Cm1Qj~ms%IBwMQ)6W3F$^>$6P2|K(CIYk8bn&>8Lu z%cHdc8LG7c!Jt_upGdaLCty#|vdX0~zpOiaXkFS&!Pah+FwOSXss~hvnZ}AlV&l0% zc@*XXkz7ko@x+M_2-u|1xK#7&NY~NMTy@l{2I!2OA(vQzpjBHg9c3*&;kw$0EojZh zmC3?73gWToan7=-LUGoN^n@P_p|RotJ7;@^hbdHl*lGo2ZckX6XCLsA&aH6VRVG8? zev`rQR1vj-Tqsht@GS@w>?pAq9sq0rxB&-H3mlK5bNWMcw5n3SLsRi16TL>f&waqN z_rTiq_6@_H^KKP*bodfTu)H_~=RqrOUnT`3tP<-0T z-og0Zn}fG3?|tvRfud*7%a^$YtykB3XKXb(gm#L@Jx2`%};rm_*=}%wv z>BZ_J+F$;nSmL3^tlO`+HT1adSU4cQ?7rREe#5Ta-3@aa${WtJ_n8!+)q@TF|93zE zrk{&_ulMNhMV(%sFJXan1|@GWY_Q`-*BeOc!cwUWOevX5tq5YnHxbnoT6ITt+GJz< zwy8MhZ&7E8UGq}$PPzF_RWqWgxp`7Gb$~+G7?(1xUB*>zPZ9S1(s1yDz;Bi$YRIZr zH3R9YjCx#RWVQ~YQVN@>%hoOODs0QlaD!B=XX^Y+;^DO?|o^A)= znV)`wkQwC;$ksZJc(3BSo@LZ#;##8!f`7Udc*6E&c#~oIPp+ zzvy>PKZgKpTuci6=!iSGLqYLlP{D(!2+e`cLWqjl=~eNQX4Jeo1 zvxP|$cUGFn`4enp9V_x`O_JEpDz>wObvJFsWF{5NU>5UO6vL|8d2N%+2iCF^AKl7A zDyd|TzO{l0wlYzYxQYt4u$?u9+KH>!%nnwu0Tdg&DqKPv`P^93$$Bx0Oo%lCXlt20oUEou*DiyZ(7b=MXE literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/CWB0XYA8bzo0kSThX0UTuA.woff2 b/public/fonts/roboto/CWB0XYA8bzo0kSThX0UTuA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..e44dd20d0f93c2c4abc818f918e9b2aea842c710 GIT binary patch literal 14600 zcmV+jIrqkQPew8T0RR91067Q%5&!@I0EBb^063%o0RR9100000000000000000000 z0000QWE+`49D#5KU;u_p2viA!JP`~Efy_jKwR8)EL;w13I`wz zf=L@Hb_L^@C9rV-Fyi)9osF{qi)Kw~K-5qd?TqvW@fVqo!_SLP?BYFoB>JMigwg7?)qwXVITj z3(}*)(juR$)?H$gLT6yx$e-loXZoQl(%L zDU}i;HAd&Ckv-^9BO+wb8!AzPh=_niDh77?eQR0s45!k|wG2NwA{XyZp*n>s>gajk zx^LR+?9A+TX;-CPlkVhy_ubk#trMna02@Gg0VDvL1skvwKnzGq;~h4N!G?!mYTZz_ zZ*YLG{tYWT0Mp9lf^bNtUk07Qqm!q$J8Dx1gKI_UefLO*F_?6ke8&b~>ja{;v8{y9 zMJhg9?_X!{&j{Buf&fv?ZC;n~)xCxVHYmW7JdLytO1ni9>e8or=?O~7UI_owfBo{; z9^8KOGeOiUT3V=j+9Jv9TpIu=VEzC1n_rrQOe0bpYWF%O|7TNc zXEc(tGTh4~T%C2qDmoo;s7!a=71i$Fm3K9>l2;H|8TiF32PK6-c0lnFV26ePLIqbe zMBP=u9dgrM+cFkqbv)$X_`wmJ^)a{hx8U}PS_^_8$1uP!|4CI{|2s;wNtu=o>BE*a zQ`RG3_bKVqNPUt%8c-#e((B}pa{-QW0huZ-jMMAtGNqMq@h}GpcltZP7d!w=tQG_T z#aWC^4%%o$mprlbb)S0AS&L>}M#*-Fix9F>chm9RWi@R#ZlbTM2M-do_ZZvFX>%?L zUX`qXVb^{1?*N9G1T7Flt{`#ZK+>dvWXJ#^A%Wz|1<6+k(yR?kuLBSW3@{5|4iKP# z#DM@ak)?%Uvn|YQ0RN$JL;~PHlIRlz_>c353<3NY0N#a0JN9s52tWbhoI%hPnA@tn zoVW2eFXFYY_LVb5tq#@c`k<~Aoq)v*^;^Ln3xss&gl9z7y&y$FmX+8Jk^BSV$~MM{*ZP@_(h z7HuX>nXzES8jdY{j-0q~Q>I*nO1=8@yJ`T{pdrIXj2d&zbvI0zw&1okcdXm8?Y;*d zdSu@Lh)O=dKn)jl7@D{(;0D2_C|T&_hDmM`X-j(gg92Yk?O7fm&~$tpB?Xg&`lX%~4LdBzQVe zVxEzfSCFzuZZ>1UhKnxFiv0->Sm40w^QNCf!#ASGeR^7Jdj`epqQylEcbHWJ;_gvd> z-vbXlY7x+x34@|a%~DI6su{E9%%5495oH0E&$vuwm&Kg0*uK_%c;KN&Y#cf|EZoVQ zW1sKuoVh%>N-h3b&fuIIo&>U6KL6v|{{cKU=EQNQmsP(0b`kD<=jM72m`AAo zk9#NnI=8;BL7?o3{YdqH-mCx9SyiZR5k7nS04Z>1COo_3=N)$3v%7d^^8t%blQq@T z9{9z3SWDx*sR<`cF7~7k*v?wVI8*A`w@MERvc99r#Qd8ZjNAlZ4(Kds{_a}CI8sv7 z@P-CD-o}KduDv!gMc-nx<%H(SUvT+r9JIp=Gh1#1pZKTJX>S%2*dAxCx%fu;aEzLx zoLN?AFTOUT`-(#*IkYyZPhWq%snQAms-`Z^P1wt4LM#8b|2aKl`g9<}F>MtuBwlOo zuAJ7w71f$jrq@mKvA1otPZ6`#GRr$ZvhO{^mX9pHtdmV$9@*%qQNNb2;oqwWkdL`5 zq%ET?KFcJ7fyDxXo+%7wW#A;7#oz)(OjKyWFl2;}38R9{+=W=NAGN#4}j8a^}LwJY)77#gwk)(W1Q%+|nPK{M0Eg4T`2oS!q!Yh7{=%Wn{!o;VIgSH$}$1D%sHeIffEK34i5^kqpTblLb1a_5fo?p*bt%p(xPW z)Y`_k+`?M7qw@9^W^@N#Te^$I6>~T1%Ng$v9Y3sgKqCY7xTF0%09S+X7fJ$Wducz1 z2!PNcq;tnGitE%cEMV7K0$NuzgZXjJdkT^^YNzevy zzVW1aF83l}IXRo!2wU!GVFYx5CFfG$A8^E26F?O7AVAx&Q;Dh)IMC_02so%l%#VQt7BSrfTnE(F+ zg;|Me(yZTA)0V7z;X{!t)Cbkoptv+G%=C{=9qj(`A@3YtFm{nX)Wea?`REw~%E2 z>|5p>xgOiGYtOzs2Ur10iR-ysO2w>ZRgVea0&985Lmn9qCwB!71w1kHs3*PUL~r}R zCgV*>;CCq zuJUjH_uZJfCernwA7z&{1lKytE@)T5b=mQu;D+q@j^M`Z_@3Y<=VWd)kKktKWC660 z;8y2k5ww`#j_k>jg1fUP%L?vsPBuUr3hvFGY$murdvcoKf$YiSf(Nsgoa^h)L(Zv} zDo?CU-po15=FXO4Xt-ubk$J#8Q+MEsTB219OWP1vD}?S;Tm!EYr32?MjeYnwBmfYA zZ4pfDGk+xD|Lm0T18XuiU=X>T1wRG~;9eV8AP-jMH90NxNFU?!k$SY9En!!+6kV>> zIu*55&5 zC|Zp4_J!3xWLTO2(hf_i&wi(Dj6|Jgwft$&51#@2zXI9zQ$&38`VqqaLVat|7b)zw zzdJF{@!|LjkU${PvBt$Dfbr${-#K|d9oR~_aW~2=+v}&9*_G^E z8{3p|pYL;Ho$r%sE9F}A71z4%$Xy*pr;Jlslx*pFkjm9+Ry!vl`%b)sB z`ZVI5dGPH(S%l#z(3#wC%|JogBxWoX=_O&s1{pd8x*wEkfD->Tiyfo{1%xS$c_}w6 z6=mEY#0;t}NeskdNoqx$pRmb}8E~oI){=}e+z1GB18Ay)m7YaNNVh=sa;M3MkIPG% zm(i^FE?NC;zg78#Nm}Wvqr)z$Wjeno@P{Y2K5CV(r z07IJx+9b1t?3Nj17z{H`NLY@9Y8&FhxzQR~Tv%CJPt(NI+s4=V>MJnSqynf~{afez zu`t0GOtnTvDssF;32t9lO~ODH*%1ooq5H_zRt!s5XuVCyH~n`THW=dg z^i`On0AJ?t9_B49Ajk2l$v1Xqt$09CZPAafnpUVz+{Gg1XQRn_>$pZPwn05VRjvMe z7kxhYJ-E%Ck1qUw+$_%W*16H^N56h+k$RlM1-%z;vV(aZ^L<)YgSozp}h?VOIc zHdYW#ZW3A&)dEl|C%AJZ7iS5S@{gLYapQ=UX^ET|u8=Dsvf`^wZ_-CVmt2jDT`0mh z@1(t7`m!BhE=2BaaqPq{hZKqMnwyoNb~Kr?;+>4&DQJ&(l%>#r5O*u5`NmtC>}<`V zem#~_*)u0zfBT=TCv{H*>RZz~!Mx@318>M#CZu^Mq#7!31!XZFSf!_OMS&*gL z+7lQQ@cuwVEJ;w11bDT0?OHuuZ?(@Jy-NMph1GC#9w$b)*kC85)&43-%9AP0CX~)N zOF4JQo%7z6a1~N!L=Y+%0tr#rt%OB@Eb)Cxc}fMHlIW1H{8Yzl@rwDMS3^x=l@a1G zNXIrLhUl= z;@6J4dLO^K&(|Y#9{4zZ5IEVdEJax!JnCIYl@RW2*-^0pD3S0M zTZJjuVFv*7zHN@z9Ej9$onvz&a#@aihtU@q_^+naMk556Y+amK4CDZWhY;2Tmym67 zRjJEPiKOiF8toB^%N#yY5lTl?${hBEu{3$wJgV_h!^X@xqZR=r!Ykp;B_UP~HYKit z)l3Ct=n6QC2d0%BW0jLlE|TdmfwG0V$OkU33MIJGKfb$kZ?nR!$OPAeZxk9St<5m( zxwpQQ-)AvR$`GrokiTJrnvjRChz>%qvNS1eU{u-5;S<4BjTBKcFR^PH2MnyuojxH1 z(3gC;PJPA$pFN*kmNF!%L0S>Ru_*&zZ%(Hz7)*`swVd8=@h5}?B<2EpOT`KGpci%E z+~jMe{(G{zz{>ukQayO(|2tWnLAff-zU*bHje+SJKx!n39tN@Orn8;Sm0S0POj-2D z;aag{kzdzEiDGjDpf7KEsWq?O`jSK#k0}%uNTT>OC3bNrA!S*Fo#bfYy`y+v_`HNM*Rk~XoDD{jd&hzj>d=PV4Un9sKfn60kMRL)&KB= zIChwqQTkk*Dyo!sEyED2SBR1vSR?}{d@ByAXE{WK_rJ}P`4>5k6kM-e700RdZ5j=BLE>^p`yyLaCKNvCEuQP>w3XahU<4^>wx&zw29G3J%a2^54QV-&;ZT@><8M zf7$5RaT(KJYjs7HCcoUP7P13$pvZ>g3JqfC+OB+%d;1s=IdR_P-dIlhi)vH`@}xf1 zQ8-oeMgh`_aKzaoYEkm-YZL}YlHQh=oB9W{$ZMx5Pil$yq{}mBuNKCh>M|p#WgNX+ z=>Z+$nB@TWX?$q3Bob&D+76qOv>F#X9*)W?xsZTk)y@Sc)hUY|Bi$;D(`CH6fRln+ zUH##`cai+SyPA4@n-?O5^Mwe!I4$)sX-AXK5_#WJ^AMAs5aQ!QfF1`2vHv8XwjT;}A8@B&JxMNKx*gP@IO2J7H2#JpIgg{wN ze5{a9D0o}Imi;y`-=AufMKyV8=zT7efd?#K$f}Xd5DFC!vzq_Hz~eCYccQeoUL2(! zpr{h1v>4~qq$>GMo!Rx~wi|alu#YJ_o!s=-wJq@{OvL~gLNLqBm&c9B`!$LAF!}uLOx|WHn z^}dvYRE1P1%C4Hp`Ao1>rM%+;dx8s1WSBS6QS|Inwu*s@Rr;#`6R4XmkR|4Cl`id@m%I*6@FRy5<_;EB@+i^rTdA6g4D!DNu*Q*R;MM{a991!@xCHl{=4q(#ka3_ zFThkMSYKyslZ(=}pxrZXat`uyGw;Eksz0RPjm+udToh7Mpl5xT2~DsYA z|2H*YcZ?oE$xS8|=4YhTW|uU;+#?p-^ zESra4*w*gCb^aQa+ICqp+$Fm;h702jMw%bTB^8ZRDvBqp^zgn;=8O_+Fne`fm4eWnPv_?qfp6_r0q3p3Ko zia5RbgGr>w(9E1Y`(2Zp@2&78Rn?#g=blVY@HxmS4LQD*kn`Y&9*=Uj1<9J>RNd(# z_}Ay0KV9m=PvT6+>Yv8Nm(i;!Mbl1bG-F2ipLqqbgi-~u_<3&4R%yLvJsrI!z0-0- zdF8MhN*?j0N*)Q*+}_ntv|O$kE}evP4Gsv74)9F~a-u=aPZr0nZ>$UsGW>Yty2V7noJ{wpiGWvH+`;a~4_(XED#q!t?hL!Mwq7No8PYmQ;qt*-|NYFWd*%@`|<*$l6YX@H=T8Wul!>0OzgG6_KWQ-`n}6$;Qw ziivyx_tA-$!dufyqT(})>_BB-_eG}&%`(PDR&{8CWh$6y-fNx)2_vvdviJ|CqF%=lmbXH{B461Z_dwjopk4=M!ICH)bq%Ix}o}r=iz3~ z@}Hmz&9^P==S$NUIlY9AYRiN+t1#{t?_dt1Vp5x)o-;RYRjDt2ep6$MC1A^b-njBl_f_)A8y&+7a-(rXTQTJC>1#(dTVVF%-g~e(|s>XHWm-Rl^!eq*@)8;v^SNxTa2_d1)x>#8>7?m zU+W@~EM{@T%=U^_KW3hML+x+plrE>s;R9ILN{&yHyUG%?o5+aDn$%+8AHqK3p!hl=<>pVfHJ*3d!h=8FnAv0y1>CUdr`wW>K`n-b}55{20W z2+R~fVD2^e%9yrO_rPs{c+4U8UI2m)4{kha=)cu8V?vJ;;Uu=GH2#Af7|5s!@hIdDQCBPPphU@mRFVw3bj3I zge3M)p83yYm6|o&v^tXC4d}-sc#jBTxL1~!5#5SdF>e<=d5;cn{X~(lLw_l-t91}J z+AFbHvWxIY)Pr&UczR*_c4#pwu?HZ*7tPSTyo0mw35M$>w{yoWx;JgQN3zOp`)a0p zmBlbR3@|uHb@r9KkuM{@KFBT~`|yyle}K`yh!jv*vod{hvU>TltHjUO(o;7= z(iCX`2|l1ALb4aHy;1lvft;wkL!w&Nf3&XZ%c;EUYlhvyihdGrj{mb$ly>j<1pLY_ zym4qg&okRXUN_7xdmR(85?0y5St`uVSdd*qc+uNS?hU<4yWXR7z(jee2ll<6C<cChqYv{ex49~$bI?Iv*rP6J5r#S~9dqb&(b1rw4S69_@tTqA1Z zDgv5v<=+*xbo6kO7~u;cO3J4boi5Y9M8qaO(0sFJw58W!+uT;v!zld0hk_8cO^qQY zI)CMasobHdoQO8SB|hQ>&>d$2y>PAe|%Ns$EwxX!;+*)oIufwF-2EA{wq(fo)TpV8fl`m^(*t|916#-UAPAg825&@}K4R z3F02y+qk#v9CPOv1r!gx*>=PYSSzru{+GqP&jj=D0xDCa7ur zcD`A@_CV9m88g=iH-qlpF0jcp%Sthey4Q(zh#Ur7v%9-q^i2 zI2Dwf5E_tHorHpG*QXeK2y4i=d#52SD?5#pSKwE>vKHD>T9KArN~w>Tn{S9Mugu7) zs19zqHSg0T=p6-5m=3*EL6Frb3)+Lg}M+y0VwDy*rqf_FlpdZ_|=GYx0Ylh@OTQEl4`T7F|YR z?y9N6Jq|pk{1zBfZ^KJU7MZ#NR@5t4oVTHU9w8HncY2NiG<)`+!}b3P!iJyl)qPD3 z_18AWLZ~-3YMXjnDWzVnHcqZVxe4L1LAkEZ&N!cc8GVhXFzq^=?Tx4Udg{e69nDSH zwuY0$?iIR&>0+wMBHdwSVc5=eeR08bZPczhV0sXL8J`-Hmf#oK5z|Ld%uX~kS5jzV z@#{^?&8jXUX?XBiI>n#2J54VNvj+BB3a+8*hcR?iR z)`?<=pFmSztP8EUs=LyY5>j;HV3G`#cr<)3jk zk(>BXr>6bOYXkjDYXSmGDgFTz%D)rJCYMyzOiYz8nwk?#P2|p$*%B%V4V?{Xm1*^z zTwI^^tMrX~YU~K-`3OFSa(^@~U%ISXPwXf|RVRn|2L|HI2a3tI=yG2hQzH#ospCtk zrt)X&JzL@vb8BP$FB&@P@|K?=2X-gsWVR;-HAtDO>t8ZfR|v0#>#A}?420qM1z_RZjH}x z-5l<3yh;euy;3@@p+G^Y3u;y; z9j`AQ1t;}$d_p>qShI4LY-1PG#c|<|+HrL37pFfrf-1pN_SipqCV7_e`BRK49U!Q* zYvL!08Y^NG8Y{Aag8|KMeeD%}WPYeIDP_e_!PIqAoBw*ME0-_{?MhcbF#0p{z?DtK0YWo-ajBe*lHX@ z{x~ujF<>oct!3VC8?f;L97jAr4)oukl*e9vr=49Ns~uKhTyJvX?NKC@AB?*a;H(5! zj41Cx=kbeVW|gie7@qjSSnbjf`R6{Fl>In0cAr!h`f@ETtu;1WX11WwM@l zGG-fs8}Qf5?|4M>(IfiPJIdHZQx40R-C0#%JY9`06jlr@2f2tXe<}Iw;Db_M9{O)Z zOJX4~=@mv-uxZrQ(m;U13l4U52???15t4uk3MDhJl9`2Q_K4A4aw8T&g-{W? zCDXZWYQEM`zJ8^?;0k`+B+jF2%h$ttG=yst<-%k91A|<5$-BKKbTxXG0>Uc+ z+Y*}H+z7&yjP}E4I2!c5H9qKbP6H6%dc_rgPFBne5eEq%xbBhnUcEDldrN6*v=@I! zWjYzC6aI8o2)!^HcyHM*W@WQtabJt4S)2<>59+S(jzRdGg=jwacwfw$epEAEIh_&! z=bpLypTD0}aDpHE*R-sIAO8ucr%>0;m1gR??t?S$KoaI302*QP`$jk&(EcC=2|WuK zJJkN?AFH+)!oxN;F+xc%jOuE4Be&@J2p|wk4`fdlk+qm9DNT z56r5QT-3Ux>D$2U^E$0#mjT}+bYjx78Gx&-=mVMMvlNsUZO3kr%{wTElQo%ff?qPPm%ogE96G4i;6=b{gB!hc@3a1M#HWU zE&|8>ssbhFi*lpWs6y|w$b9QSU;LUZl0ys!7}x^PKB{!}|#pHmc(YS*&0B~D=y)}0!M{P`YDv1yYws?^s&=(z*E4z61@cRX1ED8&3J=6bDe{^fxUR@)BaS})#ux;MWnu$wMI@JYO-vG9`FCNDWYs`o?#}3PV%TFpQ!4**``_&c zvA-n|Py;uCAj~Oz8h{oM!H57595Mn%$9e&nLHn4RO>8(EYdpq&)8C z5yIhNw@(i6QdJT&;o)TR5-^4h$igLY4+DJQsUjrDPerC7T*CoQLu$W0L<9jk*3<=x z(*@AnUJJM6kOL|D1V=2izZ_B^hsY$XDfv+_NKVse<-UiILQ{!d^gSvf8i7nEqCFa? zh@Di^siBZnGYlAR6IA~D8Gv5F#-bNWKhy0MJznQIGAAclg_#86QDI%JYy|^N8ybw! zO*?SRVgr%!gaGk+&SfR;lL@{K@eS4h2qmmFh?9cI+61~1lNwx|&@x%E{!~zA)O|X& z_VEXV13|Nx2BTrfquKZ$0^;qE6!vC7qZ*4HJ1aP4&DWoxS0}Mpril+9P+U**&KN&M zLp-PiU-hWsihn?jj3@=WTB>kz61>byku)QgMeo2}NRmw6ZXF=KN>Xzo0hn|I1A*Tf zQXr8jnADVCw9Q{Y01}lHP_uvDLcdwD_*eFa z1fS{itjr_Z{307e{Bn;U-4zlNl0_7y_uTaldbp-Gyz&~1{F`5msW}!{e0lH+KEPK< z7row^ZdD#H{l9n0;U}SO=o?0dB+tC@QMPzg_|a{LwOHaO3xOTMwp*A|1L-*&XJ0E; z%e^pMaBzmo66QXk2e`2wyu)|PHkC7SK2^4srO_N9WFt_BM3~LqtRO0utO7INBQrgq zs1`8F1e6xVLigEP7N@O1b|)l{uC;r}R5q1DlJ<(Z^UbY>^^wD5Y;4ho!Ws+-`J7d7 zg{E6z4YD}w~|uTTrC>_ zx>;M!_Q!6Zk!lmLLehqOAnP@U6^6`){}3u8MA?1Y6K)APT6a23O=hNO?iGndX#DT8 z6wx^>*nGiLidrn;(m)WYIv+{EQdPTlsz zX3B!t9LYD$t&%#=eySvp7!07Zz_OZ6Z*G+-RUNpJ{DD*yyBc&Ftqw$jMYc$Gz$`8! zN>Wn5o7m{SKOdlPER?0M68I%^-k!0cVM9pO+*iy1#`0MvUKW5}rEm_hg8!2LM{%J> zg%pTYQm+BP^J05sYrsVI$XbBRy1CJYV7^Aiaz<5LLz+G;5BfMj=@8=#RaNjc-?Vbr z89deL*vYamQ(E%{tDk2(q|FEIVmE2m36X+;$LWYXm(vW^(xT&{Rh6@E*g%M#0~9P_ z@}{KxUxU;cQ&QkocWMeOdaFPo#Aj&00kIH6-%x|z%KQb(>)zgFV!!wPS)9QWowl4;^`;-m z06) z@lAjdVxqHVWd=r7c^=Gmt^JiEMJ#KfNEJtQQrxP(%(ditH~ccAm)kTpo$Jd-=j7}jnUB9~4eD%$Eo+tN^B4du{AEa$M zn={!G-&J9a?avfurpsf{QgCM;(;ef{18whK)sUW~lq3cswjgI0^oj38dk|Zhdv$v7 z`ae1m&HKgkXyew>ts%o%oo}Z*7ir|v`Dn);E^?=bH{>pXJf%9%X&n~E@8nENgSB-Z zITI)M1G-f{Il!;24*SS+_#%7GWtJ_g0S8pKp=+XD>2nTd4}Of6gwTda9zIvA(UTIK6*@4k=gR${_?h7 zh`HPK{fQh0F1Q@uziJ}f7Tm^+Wby5^vldRa3uL{wb zcvIw9>au>!d%q51)V$F|hm)8%va0; z)~81%FA3w;n|1SOj)q;S zN&Z37*t7U5%pook!F%re9|In;6C~)3s~{TEjxYle*(GX9Y~I@SdmMg^NH#rST3K&q zVbZ?FzOo<4W;)4Yb3(#*#P9 z&(NBZXPZZ*E5yc;$Gg!PBiUie_QzT%&sneAk}3utkU6&IJl<0Tp?bwh*)vlcv}*(p zDECzX)L0FgzL=UxdM@!u7=w?pw~JOeqdQBnZAcR{{RZ@_&vCx`a=y z>;_u>GI(QXcw_Ft|Lh3v6~eq&xIF1!mr&DlTXy5Kzyp0aC;gU7QDEtv(EU4NFPaxk zibs);Dbr)a92?z90@z|?A!{^v#Fm5oC@4#^oL(%o2P~V7^-*O#bdKT?RV>U)RqAt> z?1^QC?dQSJuV^Sw5^oO+Nz5Z3)yteq1Z%O_=P?+!lBHDAvAGLNqmWBZs%q(82dq_O zZEgFw^`32(ta1CHf0WyycShcZjaCnuB5wvd?~=QBZ^K>aFDtxRZmIM3R@aUg*Y0#v z()RnsoyNyxjBt^3vU%$SGDF^z0Fg4G2>!I~V;Zd?vY7tN!64r4e8BRWl$?pkz|5s% z+=hcCg31IX9}_sS=m2W^3^d8;6*>=cE0 ztL>n*t7E%UIcHcuVb>DEL@wLv!F@mpOjGAW=}kNAl15oOpQ81*OIm_CYbRz9d_Lnw zlM`5jM{^QyX}r{kbsVqWw(2eTDwTpos*+Zd-9|;-5fqvD2G5M{kaOhd{XK-+o*uUB zd1Bir$Ci^E9<1MT_Lqwr@_IAz+PIu=qDAZI9;WJq5~V|jajkj{SF2YsFU>D-Qm67n z-scl91VXwWubbv*4ffSNE^C*uyeH2RADOZ3Mw!huF$+HFk}i5HM;W$`5TmJ!7}Dsv zRlX-tT}K*{T6(*4>oe?$3&hm^LpA^dhHgZ%|6e_Gy#7=@h1V)O0NJW^n6Z(Ejr(h> zEoq`_?JmiSG`kh*&=)v9Td!Cwx_v`03ePlwGb0|D)gx)FOL)By82nC#^zVwf-9EBR z&R$~JOYV9Fx(1Y!&3V|=L-|w`+lb2dl0vZrP+?A93sRI*WI1C@z^6I)w>rU14w=fZ z&qU-QBJ5>$bh^o%r-f5)woXy15=|y&Oc&^>!ToK%9fT4UFH7hRcrByI>k&HY2Hn}f z>vCDojhoIe%H+l{Ir-0~TpfQ-z<IP%f#3{=}1j`k_r5K&ry4r8ZC)?^H)$lDlEr2b?geuM|C4yehXC4iaCW?1>9m3Saf0Q zF}0)R)B|Dz-1++5*}9CIx!cDmo$}d$h3(-ou8rk4cLA+~Qy;-EF9jUsx60Z}j@6#e zV8W@EDXTMlTZojwlw<8t6n~|+OFZH|y?9S6(j~MUHT9T&a4RdnMaFyawN-qb=G%AR z2PKw+s?fU3V2saCXTYJSif(irZC3s;!@N-?w-QDzhf}LVDZkW?&HP6L9(7)K^oy&D z61t9-L0fUD=3c7FmP)5$lYcy>5i?H3ki71wJbV$tmqTr(9`7l)WNxigR|_H1@@Wj4 zGj9$oJ`do49l>7Z-36m9>YRa1WQ(W-F!BHbsxyxRTlT0GV2u<2;QrT1U%sYWe8`KK0KnehJ#SH@d7#TMkh*u|?Eg`^`hV94TUR`S25kzypyjA4CxXgbE=_o-{cME>iDc*~u@4 z)+g05{YB2MFluB-j3v!OnA!YZ{P~a;ipY-)f&gB8goxlHf($bz^cgaTV@N7?g)BIC zTp7sQOrM_R{L^sWP(jD}GBhXT7h-%)wL2H<1gMpa7vqhj_w^;=CA8m4ytk*+6e`)zQk7p!HipWQTw;!PzpN~DSu(uM zIbwY{l;@=(HZC+P6H@FN@}~tk#i65kR)}k(Ep-$6zz~Lo@jMm$i^V&n%@0Kkxy?z5 yOe2RZ2!+f5|0B|6 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2 b/public/fonts/roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..719f8102afe81f4e2a3db0dd1000c7db4814f88d GIT binary patch literal 11788 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/K23cxWVTrIFD6DJsEVi07RTbgVql8nDJpwnrE27mub0.woff2 b/public/fonts/roboto/K23cxWVTrIFD6DJsEVi07RTbgVql8nDJpwnrE27mub0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..a7703272e8a0aa98065454426023f85580f3b945 GIT binary patch literal 5464 zcmV-e6{qTVPew8T0RR9102NpO5&!@I05RYI02KHD0RR9100000000000000000000 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 OIO^~*7FKlLf-(VJ|44BF literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2 b/public/fonts/roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..8857742844aab5f0250ecc136cc874ccc4443ca9 GIT binary patch literal 5208 zcmV-e6sPNVPew8T0RR9102EjN5&!@I05V(v02BBC0RR9100000000000000000000 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 S|6s4e%mYW?hX@AShX?@IDg7t_ literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0SYE0-AqJ3nfInTTiDXDjU4.woff2 b/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0SYE0-AqJ3nfInTTiDXDjU4.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..b98ef313d40c47d8eb71a6b8d011d51b16ffec85 GIT binary patch literal 12728 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≺P)93WCH5@l^AxPUrh-n`+lbki zX)7=<06wIP;k8BJze;xw<+EYhkmxsfn7pBUNLl6&ZIweFicB8pnY(e;#hGBiCc+iz;YGyniDb=&L! literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0TTOQ_MqJVwkKsUn0wKzc2I.woff2 b/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0TTOQ_MqJVwkKsUn0wKzc2I.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..5ced26c662bc0ad2131fe6d66dfa78eda59bcbf3 GIT binary patch literal 16756 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 bQBT$1svCK2NZE2F*Wh2C(sSfA_C5drljKO# literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0TUj_cnvWIuuBMVgbX098Mw.woff2 b/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0TUj_cnvWIuuBMVgbX098Mw.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..1569a426bdb0c2e1b08ef3e3ebc6eeac757f9034 GIT binary patch literal 10828 zcmV-SDznvhPew8T0RR9104huX5&!@I0AH8@04eAI0RR9100000000000000000000 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 W2ij!|T_ncNwwS_>l_{tM00020tk{eI literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0UbcKLIaa1LC45dFaAfauRA.woff2 b/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0UbcKLIaa1LC45dFaAfauRA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..cba4822edbf940a6d13615b800739a80f1f3bd0f GIT binary patch literal 1508 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0Y4P5ICox8Kq3LLUNMylGO4.woff2 b/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0Y4P5ICox8Kq3LLUNMylGO4.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..3aeef4aba91d58472f7e27d5a735e08d98d8e0a6 GIT binary patch literal 16112 zcmVl5&!@I0E%z`06vQV0RR9100000000000000000000 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 CPdX9+ literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0b6up8jxqWt8HVA3mDhkV_0.woff2 b/public/fonts/roboto/OLffGBTaF0XFOW1gnuHF0b6up8jxqWt8HVA3mDhkV_0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..abda765f1424134616df1a0ccf336dbb62fb8f3e GIT binary patch literal 5564 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 K)VKdQQV#%;dx3%g literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/OpXUqTo0UgQQhGj_SFdLWBTbgVql8nDJpwnrE27mub0.woff2 b/public/fonts/roboto/OpXUqTo0UgQQhGj_SFdLWBTbgVql8nDJpwnrE27mub0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..acd5632ffec9b22dc2280d595aa88eb73402cdb0 GIT binary patch literal 10448 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 G0000=dg&Vg literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/RxZJdnzeo3R5zSexge8UUVtXRa8TVwTICgirnJhmVJw.woff2 b/public/fonts/roboto/RxZJdnzeo3R5zSexge8UUVtXRa8TVwTICgirnJhmVJw.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..054ea7237eda24f42360b84449d25caa447e7c9f GIT binary patch literal 14748 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/WxrXJa0C3KdtC7lMafG4dRTbgVql8nDJpwnrE27mub0.woff2 b/public/fonts/roboto/WxrXJa0C3KdtC7lMafG4dRTbgVql8nDJpwnrE27mub0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..7cb23f75ea19a5f6d89a4cb0af75f7639a0777f8 GIT binary patch literal 16880 zcmV)AK*YayPew8T0RR910738o5&!@I0FlH106~lZ0RR9100000000000000000000 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/ZLqKeelYbATG60EpZBSDyxJtnKITppOI_IvcXXDNrsc.woff2 b/public/fonts/roboto/ZLqKeelYbATG60EpZBSDyxJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..d7558dc703cf22500e0a73b6a911989491cf8679 GIT binary patch literal 15164 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/cDKhRaXnQTOVbaoxwdOr9xTbgVql8nDJpwnrE27mub0.woff2 b/public/fonts/roboto/cDKhRaXnQTOVbaoxwdOr9xTbgVql8nDJpwnrE27mub0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..ee27202a26028aa8f202bd5c347b3fc505061b31 GIT binary patch literal 7836 zcmV;N9%JEmPew8T0RR9103MtG5&!@I06cU603JO60RR9100000000000000000000 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2 b/public/fonts/roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..e7d54f24fe95f4f0f0ec7001692ccc0fdb806a03 GIT binary patch literal 15516 zcmV;NJY&OmPew8T0RR9106d%k5&!@I0FN9106aJV0RR9100000000000000000000 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/mbmhprMH69Zi6eEPBYVFhRJtnKITppOI_IvcXXDNrsc.woff2 b/public/fonts/roboto/mbmhprMH69Zi6eEPBYVFhRJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..edf719fb30c59a5c56d568eaa78833e567ec3efb GIT binary patch literal 5216 zcmV-m6rbyNPew8T0RR9102E*V5&!@I05O0702BTI0RR9100000000000000000000 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/oHi30kwQWvpCWqAhzHcCSBJtnKITppOI_IvcXXDNrsc.woff2 b/public/fonts/roboto/oHi30kwQWvpCWqAhzHcCSBJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..ffa767737889b6438faf3d7600beccd4b1960d46 GIT binary patch literal 9920 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 z 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/oOeFwZNlrTefzLYmlVV1UBJtnKITppOI_IvcXXDNrsc.woff2 b/public/fonts/roboto/oOeFwZNlrTefzLYmlVV1UBJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..d897694a293123394ffe9810637722771f4e87ce GIT binary patch literal 11712 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 WM%VoO6wk@?OGu{!?Oi(X?g9Y!5Onka literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/rGvHdJnr2l75qb0YND9NyBJtnKITppOI_IvcXXDNrsc.woff2 b/public/fonts/roboto/rGvHdJnr2l75qb0YND9NyBJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..1eee0291498e4ba0faecfa82a7a941110153d64b GIT binary patch literal 1484 zcmV;-1vC10Pew8T0RR9100qnd5&!@I015;E00nRW0RR9100000000000000000000 z0000QCL3@ZECyfzSO{DRgFF!o3WIQiQwtCP5)=V80we<*1Rw>176%{Rr#2vL+U z(h#yAhq1He&e&)v-YUo!pL&ej;Ng2W`#Z@*fS_Ha-2)Xz*OV1APxDkiO&t*Cc3_NQ zDaL5ks^uaGgQP0X7M3YIdiRKFhL{w>Ak&kS?sNCjy)l2!y{dPYZ3Apg@Btiy|Fib& zdY*#TXwY0(3dJi@vjS+Xnzp682`2J|Z-+p^2LRMTpd%0n6u<&31Rwx6DcT}Cb?G&T z@WkZ{W)YscVDe1Dv&Ju)Ll_D0kDQn}dBGe^a2rSzscWK83n>XxBoPo2XGV18Jj>P! zs)#oMsyrrsLj&!E)(Au-J)*wMlmtQ!m@(%-*VnfzncG`_Q6~#i=7d5NaTY+f)NG5XA0T2UnRk-?z zFT_^^k-NgCe3v?(F+_~W9WBH-h7yCQG7L3F9@J8=BUzB z8O4)w!>BU!`>|>9a*W>;jGs=T56U5kzx&}i2kL(DPoVEk!T%r6f==s8e+Ga+dmm^=m< z2gybM&YD1R-v*+O2Votvg+}7XLpIS1?6qAx zJ$TUicicPP8pOJ{Jv-kND@S@5cBXiEeej?+M8&gc_Ot5bQD{bRL+2$wdX|2AUKOLa ziP7rZ{+~E+9PALfbx%#LTSwaQ(ty{GbPnB`6uNOZ!)yP^U+x#zE@Uwtcns=WRz<53CuhtmxUfZ`ZrSA1|g1*#!)=|L+3@$QIP(m%anla zdoPuCWF#s{w($+rpHJF}0t|79aqFz0{!(4FP}; z6qFSDi0%j~Lb^&}C{+qR!rN-!wuDNfj0%-bm_8Tz7-X6O=9&=VqJ2f_ZL&$GTWq!g zCYx%pS;kvnh{+aMXu7%Ph|-V*X&TXtRyL+iH`~cFUY%wUUp7xmlANXcOEBI%<4rWp zWC`Y4V5%guOgGVFb1XF3LP>h*uA|QS7^t)O$v=@o1%TYiB;Z=xsG$&v33Q_KNhqWk_`NPL33#@-K88vq>G()G?v!J{Lv-e mxnQgI-2WpWl3(PECE80bQqJFQjwo5=p9^8KifQMo#6kekRIKs< literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/vPcynSL0qHq_6dX7lKVByfesZW2xOQ-xsNqO47m55DA.woff2 b/public/fonts/roboto/vPcynSL0qHq_6dX7lKVByfesZW2xOQ-xsNqO47m55DA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..de66c7b90ea1247cedc41dc27ec558077b62a5c5 GIT binary patch literal 16204 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 literal 0 HcmV?d00001 diff --git a/public/fonts/roboto/vSzulfKSK0LLjjfeaxcREhTbgVql8nDJpwnrE27mub0.woff2 b/public/fonts/roboto/vSzulfKSK0LLjjfeaxcREhTbgVql8nDJpwnrE27mub0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..7b4c60a5ca6246e94d0dec3322437d771a66e4f9 GIT binary patch literal 12636 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 KOAd|z0000XUyg(T literal 0 HcmV?d00001 diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 4e99c8bf5ba..b4b123d6823 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -80,7 +80,7 @@ $enable-flex: false; // Typography // ------------------------- -$font-family-sans-serif: "Open Sans", Helvetica, Arial, sans-serif; +$font-family-sans-serif: "Roboto", Helvetica, Arial, sans-serif; $font-family-serif: Georgia, "Times New Roman", Times, serif; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; $font-family-base: $font-family-sans-serif !default; @@ -93,7 +93,7 @@ $font-size-sm: .875rem !default; $font-size-xs: .75rem !default; $line-height-base: 1.5 !default; -$font-weight-semi-bold: 600; +$font-weight-semi-bold: 500; $font-size-h1: 2.0rem !default; $font-size-h2: 1.75rem !default; @@ -116,7 +116,7 @@ $lead-font-size: 1.25rem !default; $lead-font-weight: 300 !default; $headings-margin-bottom: ($spacer / 2) !default; -$headings-font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +$headings-font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; $headings-font-weight: 400 !default; $headings-line-height: 1.1 !default; diff --git a/public/sass/base/_fonts.scss b/public/sass/base/_fonts.scss index 0457c86b9e7..0021ace5c27 100644 --- a/public/sass/base/_fonts.scss +++ b/public/sass/base/_fonts.scss @@ -20,285 +20,227 @@ }*/ -/* Open sans fonts*/ - /* cyrillic-ext */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTa-j2U0lmluP9RWlSytm3ho.woff2) format('woff2'); + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; } /* cyrillic */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTZX5f-9o1vgP2EXwfjgl7AY.woff2) format('woff2'); + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/mErvLBYg_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTRWV49_lSm1NYrwo-zkhivY.woff2) format('woff2'); + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); unicode-range: U+1F00-1FFF; } /* greek */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTaaRobkAwv3vxw3jMhVENGA.woff2) format('woff2'); + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/u0TOpm082MNkS5K0Q4rhqvesZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); unicode-range: U+0370-03FF; } /* vietnamese */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTf8zf_FOSsgRmwsS7Aa9k2w.woff2) format('woff2'); - unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTT0LW-43aMEzIO6XUTLjad8.woff2) format('woff2'); + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/opensans/DXI1ORHCpsQm3Vp6mXoaTegdm0LZdjqr5-oayXSOefg.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/CWB0XYA8bzo0kSThX0UTuA.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } /* cyrillic-ext */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/K88pR3goAWT7BTt32Z01mxJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/ZLqKeelYbATG60EpZBSDyxJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; } /* cyrillic */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/RjgO7rYTmqiVp7vzi-Q5URJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/oHi30kwQWvpCWqAhzHcCSBJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/LWCjsQkB6EMdfHrEVqA1KRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/rGvHdJnr2l75qb0YND9NyBJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); unicode-range: U+1F00-1FFF; } /* greek */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/xozscpT2726on7jbcb_pAhJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/mx9Uck6uB63VIKFYnEMXrRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); unicode-range: U+0370-03FF; } /* vietnamese */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/59ZRklaO5bWGqF5A9baEERJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); - unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/mbmhprMH69Zi6eEPBYVFhRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/u-WUoqrET9fUeobQW7jkRRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/oOeFwZNlrTefzLYmlVV1UBJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(../fonts/opensans/cJZKeOuBrn4kERxqtaUH3VtXRa8TVwTICgirnJhmVJw.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/RxZJdnzeo3R5zSexge8UUVtXRa8TVwTICgirnJhmVJw.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } /* cyrillic-ext */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNSq-j2U0lmluP9RWlSytm3ho.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/WxrXJa0C3KdtC7lMafG4dRTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; } /* cyrillic */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNSpX5f-9o1vgP2EXwfjgl7AY.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/OpXUqTo0UgQQhGj_SFdLWBTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNShWV49_lSm1NYrwo-zkhivY.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/1hZf02POANh32k2VkgEoUBTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); unicode-range: U+1F00-1FFF; } /* greek */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNSqaRobkAwv3vxw3jMhVENGA.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/cDKhRaXnQTOVbaoxwdOr9xTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); unicode-range: U+0370-03FF; } /* vietnamese */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNSv8zf_FOSsgRmwsS7Aa9k2w.woff2) format('woff2'); - unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB; + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/K23cxWVTrIFD6DJsEVi07RTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNSj0LW-43aMEzIO6XUTLjad8.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/vSzulfKSK0LLjjfeaxcREhTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/opensans/MTP_ySUJH_bn48VBG8sNSugdm0LZdjqr5-oayXSOefg.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), url(../fonts/roboto/vPcynSL0qHq_6dX7lKVByfesZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } /* cyrillic-ext */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzK-j2U0lmluP9RWlSytm3ho.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0TTOQ_MqJVwkKsUn0wKzc2I.woff2) format('woff2'); unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; } /* cyrillic */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzJX5f-9o1vgP2EXwfjgl7AY.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0TUj_cnvWIuuBMVgbX098Mw.woff2) format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzBWV49_lSm1NYrwo-zkhivY.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0UbcKLIaa1LC45dFaAfauRA.woff2) format('woff2'); unicode-range: U+1F00-1FFF; } /* greek */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzKaRobkAwv3vxw3jMhVENGA.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0Wo_sUJ8uO4YLWRInS22T3Y.woff2) format('woff2'); unicode-range: U+0370-03FF; } /* vietnamese */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzP8zf_FOSsgRmwsS7Aa9k2w.woff2) format('woff2'); - unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB; + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0b6up8jxqWt8HVA3mDhkV_0.woff2) format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzD0LW-43aMEzIO6XUTLjad8.woff2) format('woff2'); + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0SYE0-AqJ3nfInTTiDXDjU4.woff2) format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/opensans/k3k702ZOKiLJc3WVjuplzOgdm0LZdjqr5-oayXSOefg.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Open Sans'; + font-family: 'Roboto'; font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBjTOQ_MqJVwkKsUn0wKzc2I.woff2) format('woff2'); - unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url(../fonts/roboto/OLffGBTaF0XFOW1gnuHF0Y4P5ICox8Kq3LLUNMylGO4.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } -/* cyrillic */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBjUj_cnvWIuuBMVgbX098Mw.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* greek-ext */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBkbcKLIaa1LC45dFaAfauRA.woff2) format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBmo_sUJ8uO4YLWRInS22T3Y.woff2) format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBr6up8jxqWt8HVA3mDhkV_0.woff2) format('woff2'); - unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBiYE0-AqJ3nfInTTiDXDjU4.woff2) format('woff2'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/opensans/xjAJXh38I15wypJXxuGMBo4P5ICox8Kq3LLUNMylGO4.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; -} \ No newline at end of file diff --git a/public/sass/components/_row.scss b/public/sass/components/_row.scss index 0f54b93795d..963a8f83ba0 100644 --- a/public/sass/components/_row.scss +++ b/public/sass/components/_row.scss @@ -122,7 +122,7 @@ $dash-row-menu-animation-speed: 0.20s; min-height: 100%; transform: translate(-131px, 0); transition: 0.1s ease-out 0.4s; - z-index: 99; + z-index: 0; display: flex; flex-direction: row; diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index 284a21f2b59..60203641ed0 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -70,6 +70,7 @@ div.flot-text { .panel-title-text { cursor: pointer; + font-weight: $font-weight-semi-bold; &:hover { color: $link-hover-color; From 78ea1dc87d110ed031fcce1a726fe6d66047f5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 16:06:20 +0200 Subject: [PATCH 14/40] ux: new page header look wip --- .../features/plugins/partials/ds_edit.html | 156 ++++++++++-------- .../features/plugins/partials/ds_list.html | 96 ++++++----- public/sass/_variables.dark.scss | 2 +- public/sass/layout/_page.scss | 39 +++-- 4 files changed, 174 insertions(+), 119 deletions(-) diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 73691b16b2e..96c4d2b3836 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,85 +1,107 @@ - +
    -
    -

    Add data source

    -

    Edit data source

    - -
    - -
    -
    -
    -
    - Name - - - The name is used when you select the data source in panels. - The Default data source is preselected in new - panels. - -
    - -
    +
    + Name + + + The name is used when you select the data source in panels. + The Default data source is preselected in new + panels. + +
    + +
    -
    - Type -
    - -
    -
    -
    +
    + Type +
    + +
    +
    +
    -
    - This plugin is marked as being in alpha state, which means it is in early development phase and - updates will include breaking changes. -
    +
    + This plugin is marked as being in alpha state, which means it is in early development phase and + updates will include breaking changes. +
    - - - - + + + + -
    -
    Testing....
    -
    -
    {{ctrl.testing.title}}
    -
    -
    -
    +
    +
    Testing....
    +
    +
    {{ctrl.testing.title}}
    +
    +
    +
    -
    - - - - Cancel -
    +
    + + + + Cancel +
    - -
    +
    +
    +
    + + Configuration + +
    + +
    + + Data sources + +
    +
    + +

    + + Add data source + Settings +

    + + + + Add data source + + +
    + +
    +
    +
    + +
    -
    - -
    +
    + +
    diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index 2a8f728346e..ed8cad218f4 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,45 +1,61 @@ -
    -
    -

    Data Sources

    - - - Add data source - -
    +
    +
    +
    +
    + + Configuration + +
    +
    -
    +

    + + Data Sources +

    + + + + Add data source + + +
    +
    + + +
    +
    -
      -
    1. - -
      -
      - {{ds.type}} -
      -
      -
      -
      - -
      -
      -
      - {{ds.name}} - - default - -
      -
      - {{ds.url}} -
      -
      -
      -       -
      2. -
    -
    +
      +
    1. + +
      +
      + {{ds.type}} +
      +
      +
      +
      + +
      +
      +
      + {{ds.name}} + + default + +
      +
      + {{ds.url}} +
      +
      +
      +       +
      2. +
    + -
    - No data sources defined -
    +
    + No data sources defined +
    diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 5562078047d..d30be1c6dcc 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -48,7 +48,7 @@ $critical: #ed2e18; // Scaffolding // ------------------------- -$body-bg: rgb(20,20,20); +$body-bg: rgb(24,20,20); $page-bg: $dark-2; $body-color: $gray-4; $text-color: $gray-4; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 33a62e8fbc5..0fa4094e452 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -7,15 +7,20 @@ .main-view { flex-grow: 1; + background: linear-gradient(180deg,#282020 0,#1e0f05); } .page-container { @extend .container; - background-color: $page-bg; - padding: ($spacer * 2) ($spacer * 4); + + padding: $spacer; min-height: calc(100% - 54px); padding-bottom: $spacer * 5; - background-image: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%) +} + +.page-header-inner { + @include brand-bottom-border(); + @include clearfix(); } .page-body { @@ -38,21 +43,20 @@ } .page-header { - padding: $spacer 0 0 0; - margin-bottom: 2rem; - @include brand-bottom-border(); - @include clearfix(); + padding: 2rem 0 1rem 0; h1 { + font-size: $font-size-h2; flex-grow: 1; display: inline-block; margin-bottom: $spacer*1.5; } - button, a { - float: right; - margin-left: $spacer; - } +} + +.page-header__cta { + float: right; + margin-left: $spacer; } .page-heading { @@ -90,3 +94,16 @@ .page-sidebar-section { margin-bottom: $spacer*2; } + +.page-breadcrumb { + display: flex; + margin-bottom: $spacer; +} + +.page-breadcrumb__item { + a { + color: $text-color-weak; + } + padding-right: $spacer; +} + From 8d6a1cdbb4e1a469f22cd23850f5c43f223c399b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 18:11:35 +0200 Subject: [PATCH 15/40] ux: wip --- public/app/core/components/navbar/navbar.html | 46 +++--- public/app/core/components/navbar/navbar.ts | 6 - public/app/core/nav_model_srv.ts | 21 ++- .../features/dashboard/dashnav/dashnav.html | 137 ++++++++++-------- .../app/features/dashboard/dashnav/dashnav.ts | 11 ++ public/app/features/plugins/ds_edit_ctrl.ts | 2 +- .../features/plugins/partials/ds_edit.html | 23 +-- .../features/plugins/partials/ds_list.html | 16 +- public/sass/layout/_page.scss | 45 +++++- 9 files changed, 171 insertions(+), 136 deletions(-) diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index d2543b91868..a1469466caa 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -1,31 +1,27 @@ -
    +
    - +
    +
    + + {{::item.title}} + + -
    - - - - {{::ctrl.section.title}} - - - + + {{::item.title}} + + + +
    - -
    + diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts index fae27a8d5c7..8938ac4adcc 100644 --- a/public/app/core/components/navbar/navbar.ts +++ b/public/app/core/components/navbar/navbar.ts @@ -8,13 +8,9 @@ import {NavModel, NavModelItem} from '../../nav_model_srv'; export class NavbarCtrl { model: NavModel; - section: NavModelItem; - hasMenu: boolean; /** @ngInject */ constructor(private $scope, private $rootScope, private contextSrv) { - this.section = this.model.section; - this.hasMenu = this.model.menu.length > 0; } showSearch() { @@ -35,13 +31,11 @@ export function navbarDirective() { templateUrl: 'public/app/core/components/navbar/navbar.html', controller: NavbarCtrl, bindToController: true, - transclude: true, controllerAs: 'ctrl', scope: { model: "=", }, link: function(scope, elem) { - elem.addClass('navbar'); } }; } diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts index 67a221bfcb4..e64bb2f74c5 100644 --- a/public/app/core/nav_model_srv.ts +++ b/public/app/core/nav_model_srv.ts @@ -37,14 +37,19 @@ export class NavModelSrv { getDatasourceNav(subPage) { return { - section: { - title: 'Data Sources', - url: 'datasources', - icon: 'icon-gf icon-gf-datasources' - }, - menu: [ - {title: 'List view', active: subPage === 0, url: 'datasources', icon: 'fa fa-list-ul'}, - {title: 'Add data source', active: subPage === 1, url: 'datasources/new', icon: 'fa fa-plus'}, + items: [ + { + title: 'Configuration', + items: [ + {title: 'Data sources', active: subPage === 0, url: 'datasources', icon: 'fa fa-database'}, + {title: 'Users', active: subPage === 0, url: 'users', icon: 'fa fa-fw fa-users'}, + {title: 'Plugins', active: subPage === 0, url: 'plugins', icon: 'icon-gf icon-gf-apps'}, + ] + }, + { + title: 'Data sources', + url: 'datasources', + } ] }; } diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index c88af17f8da..9fe6cfb9a1e 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -1,64 +1,83 @@ - +
    +
    +
    -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    + + + + {{::ctrl.navModel.section.title}} + + - + +
    - +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    - + + + +
    +
    diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index ed623fd70f8..c52d3186142 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -144,6 +144,17 @@ export class DashNavCtrl { onFolderChange(folderId) { this.dashboard.folderId = folderId; } + + showSearch() { + this.$rootScope.appEvent('show-dash-search'); + } + + navItemClicked(navItem, evt) { + if (navItem.clickHandler) { + navItem.clickHandler(); + evt.preventDefault(); + } + } } export function dashNavDirective() { diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index b577ad3131b..e0d402bb802 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -44,7 +44,6 @@ export class DataSourceEditCtrl { ) { this.navModel = navModelSrv.getDatasourceNav(0); - this.isNew = true; this.datasources = []; this.tabIndex = 0; @@ -58,6 +57,7 @@ export class DataSourceEditCtrl { } initNewDatasourceModel() { + this.isNew = true; this.current = angular.copy(defaults); // We are coming from getting started diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 96c4d2b3836..549cc86f856 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,23 +1,10 @@ -
    -
    -
    -
    - - Configuration - -
    - -
    - - Data sources - -
    -
    + +
    +

    - Add data source - Settings + Settings (new)

    @@ -40,9 +27,7 @@
    -
    -
    diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index ed8cad218f4..d1b3949ce5a 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,13 +1,7 @@ -
    -
    -
    -
    - - Configuration - -
    -
    + +
    +

    Data Sources @@ -17,12 +11,8 @@ Add data source -

    -
    - -
    diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 0fa4094e452..d98629244a6 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -19,8 +19,6 @@ } .page-header-inner { - @include brand-bottom-border(); - @include clearfix(); } .page-body { @@ -43,7 +41,10 @@ } .page-header { - padding: 2rem 0 1rem 0; + padding: $spacer 0 0 0; + margin-bottom: 2rem; + @include brand-bottom-border(); + @include clearfix(); h1 { font-size: $font-size-h2; @@ -101,9 +102,43 @@ } .page-breadcrumb__item { - a { + > a { color: $text-color-weak; + display: block; + padding: 0.6rem 3rem 0.6rem 1rem;; + } + + &:hover a { + .page-breadcrumb__caret { + opacity: 1; + } + } + + background: black; + + &::after { + content: ""; + position: absolute; + top: 0; + left: 100%; + content: ''; + height: 0; + width: 0; + border: 24px solid transparent; + border-right-width: 0; + border-left-width: 20px; + transform: translateX(4px); + border-left-color: #ffffff; } - padding-right: $spacer; +} + +.page-breadcrumb__caret { + opacity: 0; + position: absolute; + display: block; + width: 16px; + height: 16px; + right: 20px; + top: 14px; } From 8aa73401a9c4bf80bf3e5c71ef3abb1df05d629f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 19:47:40 +0200 Subject: [PATCH 16/40] ux: new breadcrumb progress --- public/app/features/plugins/ds_list_ctrl.ts | 3 +- public/sass/layout/_page.scss | 64 ++++++++++++++++----- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/public/app/features/plugins/ds_list_ctrl.ts b/public/app/features/plugins/ds_list_ctrl.ts index b26883bd4b5..b178d47081f 100644 --- a/public/app/features/plugins/ds_list_ctrl.ts +++ b/public/app/features/plugins/ds_list_ctrl.ts @@ -15,8 +15,7 @@ export class DataSourcesCtrl { private $http, private backendSrv, private datasourceSrv, - private navModelSrv - ) { + private navModelSrv) { this.navModel = this.navModelSrv.getDatasourceNav(0); diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index d98629244a6..a383d17a4d6 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -101,34 +101,71 @@ margin-bottom: $spacer; } +$breadcrumb-hover-hl: #111; + .page-breadcrumb__item { + background: black; + > a { color: $text-color-weak; display: block; - padding: 0.6rem 3rem 0.6rem 1rem;; - } + padding: 0.6rem 1rem 0.6rem 3rem;; + position: relative; - &:hover a { - .page-breadcrumb__caret { - opacity: 1; + &::after { + content: ''; + position: absolute; + top: -53px; + left: 100%; + content: ''; + height: 0; + width: 0; + border: 46px solid transparent; + border-right-width: 0; + border-left-width: 41px; + z-index: 2; + border-left-color: black; } } - background: black; + &:first-child { + a { + padding-left: 1rem; + } + } &::after { - content: ""; + content: ''; position: absolute; - top: 0; + top: -53px; left: 100%; content: ''; height: 0; width: 0; - border: 24px solid transparent; + border: 46px solid transparent; border-right-width: 0; - border-left-width: 20px; + border-left-width: 41px; + z-index: 1; transform: translateX(4px); - border-left-color: #ffffff; + border-left-color: #282020; + margin: 0; + } + + &:hover { + background: $breadcrumb-hover-hl; + + .page-breadcrumb__caret { + opacity: 1; + } + + > a { + color: $text-color; + + &::after { + border-left-color: $breadcrumb-hover-hl; + color: $text-color; + } + } } } @@ -138,7 +175,8 @@ display: block; width: 16px; height: 16px; - right: 20px; - top: 14px; + right: -9px; + top: 12px; + z-index: 3; } From 097fa743908c3632189de98d9bd0f3c4e2de6f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 21:43:24 +0200 Subject: [PATCH 17/40] ux: minor navbar update --- public/app/core/components/navbar/navbar.html | 3 +-- public/app/features/plugins/ds_edit_ctrl.ts | 4 ++++ public/app/features/plugins/partials/ds_edit.html | 3 ++- public/sass/_variables.dark.scss | 2 +- tasks/options/watch.js | 5 ++++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index a1469466caa..0a3b8166125 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -1,7 +1,7 @@
    -
    +
    {{::item.title}} @@ -14,7 +14,6 @@
    • - {{::subItem.title}}
      • diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index e0d402bb802..8d02e7f29b8 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -59,6 +59,7 @@ export class DataSourceEditCtrl { initNewDatasourceModel() { this.isNew = true; this.current = angular.copy(defaults); + this.navModel.items.push({title: 'New data source'}); // We are coming from getting started if (this.$location.search().gettingstarted) { @@ -85,10 +86,13 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; + this.navModel.items.push({title: ds.name}); + if (datasourceCreated) { datasourceCreated = false; this.testDatasource(); } + return this.typeChanged(); }); } diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 549cc86f856..5c992713ae5 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -4,7 +4,8 @@

      - Settings (new) + New data source + {{ctrl.current.name}}

      diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index d30be1c6dcc..5619b4d95a7 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -230,7 +230,7 @@ $navbarButtonBackgroundHighlight: $body-bg; // Sidemenu // ------------------------- -$side-menu-bg: $dark-3; +$side-menu-bg: $black; $side-menu-item-hover-bg: $dark-2; // Menu dropdowns diff --git a/tasks/options/watch.js b/tasks/options/watch.js index 5b872cb212a..f7bea8af721 100644 --- a/tasks/options/watch.js +++ b/tasks/options/watch.js @@ -21,7 +21,10 @@ module.exports = function(config, grunt) { return; } - gaze(config.srcDir + '/**/*', function(err, watcher) { + gaze([ + config.srcDir + '/sass/**/*', + config.srcDir + '/app/**/*', + ], function(err, watcher) { console.log('Gaze watchers setup'); From e81cb9c929c96d7b440f0b2bc21f409a9f4f0776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 22:44:01 +0200 Subject: [PATCH 18/40] ux: testing fixed sidemenu and breadcrumbs --- public/app/core/components/navbar/navbar.html | 38 ++--- .../features/plugins/partials/ds_edit.html | 154 +++++++++--------- .../features/plugins/partials/ds_list.html | 90 +++++----- public/sass/_variables.dark.scss | 2 +- public/sass/_variables.scss | 2 +- public/sass/base/_reboot.scss | 2 + public/sass/components/_gf-form.scss | 1 + public/sass/components/_navbar.scss | 8 +- public/sass/layout/_page.scss | 33 ++-- public/views/index.html | 70 ++++---- 10 files changed, 207 insertions(+), 193 deletions(-) diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index 0a3b8166125..395b188538e 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -1,26 +1,26 @@ -
      +
      +
      +
      +
      + + {{::item.title}} + + -
      -
      - - {{::item.title}} - - + + {{::item.title}} + - - {{::item.title}} - - - + +
      - diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 5c992713ae5..1646dc49a78 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,93 +1,95 @@ -
      -
      -

      - - New data source - {{ctrl.current.name}} -

      +
      +
      +
      +

      + + New data source + {{ctrl.current.name}} +

      - - - Add data source - + + + Add data source + -
      - -
      -
      +
      + +
      +
      -
      +
      -
      -
      -
      -
      - Name - - - The name is used when you select the data source in panels. - The Default data source is preselected in new - panels. - -
      - -
      + +
      +
      +
      + Name + + + The name is used when you select the data source in panels. + The Default data source is preselected in new + panels. + +
      + +
      -
      - Type -
      - -
      -
      -
      +
      + Type +
      + +
      +
      +
      -
      - This plugin is marked as being in alpha state, which means it is in early development phase and - updates will include breaking changes. -
      +
      + This plugin is marked as being in alpha state, which means it is in early development phase and + updates will include breaking changes. +
      - - - - + + + + -
      -
      Testing....
      -
      -
      {{ctrl.testing.title}}
      -
      -
      -
      +
      +
      Testing....
      +
      +
      {{ctrl.testing.title}}
      +
      +
      +
      -
      - - - - Cancel -
      +
      + + + + Cancel +
      -
      -
      + +
      -
      - -
      +
      + +
      +
      diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index d1b3949ce5a..781f2403631 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,51 +1,53 @@ -
      -
      -

      - - Data Sources -

      +
      +
      +
      +

      + + Data Sources +

      - - - Add data source - -
      + + + Add data source + +
      -
      - +
      + -
        -
      1. - -
        -
        - {{ds.type}} -
        -
        -
        -
        - -
        -
        -
        - {{ds.name}} - - default - -
        -
        - {{ds.url}} -
        -
        -
        -         -
        2. -
      -
      +
        +
      1. + +
        +
        + {{ds.type}} +
        +
        +
        +
        + +
        +
        +
        + {{ds.name}} + + default + +
        +
        + {{ds.url}} +
        +
        +
        +         +
        2. +
      +
      -
      - No data sources defined -
      +
      + No data sources defined +
      +
      diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 5619b4d95a7..8179d105690 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -162,7 +162,7 @@ $btn-drag-image: '../img/grab_dark.svg'; // Forms // ------------------------- -$input-bg: $dark-4; +$input-bg: $black; $input-bg-disabled: $dark-3; $input-color: $gray-4; diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index b4b123d6823..c80bbf9148f 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -65,7 +65,7 @@ $container-max-widths: ( sm: 576px, md: 720px, lg: 940px, - xl: 1140px + xl: 1080px ) !default; // Grid columns diff --git a/public/sass/base/_reboot.scss b/public/sass/base/_reboot.scss index 806ba2aa43d..bc4ff489712 100644 --- a/public/sass/base/_reboot.scss +++ b/public/sass/base/_reboot.scss @@ -79,6 +79,8 @@ body { // By default, `` has no `background-color` so we set one as a best practice. background-color: $body-bg; height: 100%; + width: 100%; + position: absolute; } // Suppress the focus outline on elements that cannot be accessed via keyboard. diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index b04d2e4c88f..c8d5f4d7315 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -53,6 +53,7 @@ $gf-form-margin: 0.25rem; padding: $input-padding-y $input-padding-x; margin-right: $gf-form-margin; flex-shrink: 0; + font-weight: $font-weight-semi-bold; background-color: $input-label-bg; display: block; diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index c11a135aaac..357b2be3ce0 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -57,9 +57,7 @@ .navbar-brand-btn { display: block; - position: relative; - float: left; - margin: 0; + margin-bottom: 3rem; background-color: $side-menu-bg; padding: 0.4rem 1.0rem 0.4rem 1rem; min-height: $navbarHeight; @@ -68,10 +66,6 @@ font-size: 70%; } - .fa-chevron-left{ - display: none; - } - &:hover { background: $navbarButtonBackgroundHighlight; } diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index a383d17a4d6..56f1df5ecf1 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -1,21 +1,29 @@ .grafana-app { - height: 100%; display: flex; align-items: stretch; + position: absolute; width: 100%; + height: 100%; + top: 0; + left: 0; } .main-view { + position: relative; flex-grow: 1; - background: linear-gradient(180deg,#282020 0,#1e0f05); + background: inear-gradient(180deg, #1b1d25 0, #210d0d); } .page-container { @extend .container; + padding: $spacer $spacer $spacer $spacer*3; +} - padding: $spacer; - min-height: calc(100% - 54px); - padding-bottom: $spacer * 5; +.scroll-canvas { + position: absolute; + width: 100%; + height: calc(100% - 54px); + overflow: scroll; } .page-header-inner { @@ -96,15 +104,20 @@ margin-bottom: $spacer*2; } +$breadcrumb-hover-hl: #111; +$page-nav-bg: black; + +// .page-nav { +// background: $page-nav-bg; +// } + .page-breadcrumb { display: flex; - margin-bottom: $spacer; + padding: 0 $spacer; } -$breadcrumb-hover-hl: #111; - .page-breadcrumb__item { - background: black; + background: $page-nav-bg; > a { color: $text-color-weak; @@ -124,7 +137,7 @@ $breadcrumb-hover-hl: #111; border-right-width: 0; border-left-width: 41px; z-index: 2; - border-left-color: black; + border-left-color: $page-nav-bg; } } diff --git a/public/views/index.html b/public/views/index.html index 411481b2149..ad47baa3465 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -40,41 +40,41 @@
      - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      From 521c33a7e688b3d7fecdae5078e9db64db489392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 14 Aug 2017 22:47:04 +0200 Subject: [PATCH 19/40] ux: reduced size of sidemenu icons a bit --- public/sass/components/_sidemenu.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index a1347bc2633..65e3e8d52da 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -52,15 +52,15 @@ } .icon-circle { - width: 40px; - height: 40px; + width: 35px; + height: 35px; display: inline-block; i { color: $link-color; opacity: .7; position: relative; left: 7px; - font-size: 150%; + font-size: 130%; } .fa { @@ -79,7 +79,7 @@ .sidemenu-item { color: $link-color; - line-height: 47px; + line-height: 42px; padding: 0px 10px 0px 10px; display: block; position: relative; From 27d6492f403b83176ceed3a75044ef7f7918ee54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 09:10:39 +0200 Subject: [PATCH 20/40] ux: removed custom scrollbar look --- public/app/partials/dashboard.html | 2 +- public/sass/_grafana.scss | 1 - public/sass/components/_scrollbar.scss | 41 -------------------------- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 public/sass/components/_scrollbar.scss diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index b25ba94ff84..cecbc7aa28a 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -1,7 +1,7 @@
      -
      +
      diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index 22ed043b37b..f22036dd266 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -60,7 +60,6 @@ @import "components/filter-controls"; @import "components/filter-list"; @import "components/filter-table"; -@import "components/scrollbar"; @import "components/old_stuff"; @import "components/typeahead"; @import "components/modals"; diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss deleted file mode 100644 index 85227625a8d..00000000000 --- a/public/sass/components/_scrollbar.scss +++ /dev/null @@ -1,41 +0,0 @@ -// -// Srollbars -// - -::-webkit-scrollbar { - width: 8px; - height: 8px; -} - -::-webkit-scrollbar:hover { - height: 8px; -} - -::-webkit-scrollbar-button:start:decrement, -::-webkit-scrollbar-button:end:increment { display: none; } -::-webkit-scrollbar-button:horizontal:decrement { display: none; } -::-webkit-scrollbar-button:horizontal:increment { display: none; } -::-webkit-scrollbar-button:vertical:decrement { display: none; } -::-webkit-scrollbar-button:vertical:increment { display: none; } -::-webkit-scrollbar-button:horizontal:decrement:active { background-image: none; } -::-webkit-scrollbar-button:horizontal:increment:active { background-image: none; } -::-webkit-scrollbar-button:vertical:decrement:active { background-image: none; } -::-webkit-scrollbar-button:vertical:increment:active {background-image: none; } -::-webkit-scrollbar-track-piece { background-color: transparent; } - -::-webkit-scrollbar-thumb:vertical { - height: 50px; - background: -webkit-gradient(linear, left top, right top, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); - border: 1px solid $scrollbarBorder; - border-top: 1px solid $scrollbarBorder; - border-left: 1px solid $scrollbarBorder; -} - -::-webkit-scrollbar-thumb:horizontal { - width: 50px; - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); - border: 1px solid $scrollbarBorder; - border-top: 1px solid $scrollbarBorder; - border-left: 1px solid $scrollbarBorder; -} - From 547c61dc1acbb1b6fb7b7c55f8f79c9568fbae15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 09:46:38 +0200 Subject: [PATCH 21/40] ux: minor scroll fix --- public/sass/layout/_page.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 56f1df5ecf1..d823a8e457f 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -23,7 +23,7 @@ position: absolute; width: 100%; height: calc(100% - 54px); - overflow: scroll; + overflow: auto; } .page-header-inner { @@ -107,9 +107,9 @@ $breadcrumb-hover-hl: #111; $page-nav-bg: black; -// .page-nav { -// background: $page-nav-bg; -// } +.page-nav { + background: $page-nav-bg; + } .page-breadcrumb { display: flex; From f68dc5ca23cbd4019a84295c64c55b46f80484e4 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 15 Aug 2017 09:48:31 +0200 Subject: [PATCH 22/40] Starting to play with new form styles --- .gitignore | 3 +++ public/sass/_variables.dark.scss | 2 +- public/sass/components/_gf-form.scss | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0e6affc6120..cfa3a68c057 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ profile.cov /examples/*/dist /packaging/**/*.rpm /packaging/**/*.deb + +# Ignore OSX indexing +.DS_Store diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 8179d105690..9f9b508c141 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -166,7 +166,7 @@ $input-bg: $black; $input-bg-disabled: $dark-3; $input-color: $gray-4; -$input-border-color: $dark-4; +$input-border-color: $dark-3; $input-box-shadow: inset 1px 0px 0.3rem 0px rgba(150, 150, 150, 0.10); $input-border-focus: $input-border-color !default; $input-box-shadow-focus: rgba(102,175,233,.6) !default; diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index c8d5f4d7315..bbf9d72084d 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -51,14 +51,13 @@ $gf-form-margin: 0.25rem; .gf-form-label { padding: $input-padding-y $input-padding-x; - margin-right: $gf-form-margin; flex-shrink: 0; font-weight: $font-weight-semi-bold; background-color: $input-label-bg; display: block; font-size: $font-size-sm; - margin-right: $gf-form-margin; + margin-right: 0; border: $input-btn-border-width solid transparent; @include border-radius($label-border-radius-sm); @@ -112,7 +111,8 @@ $gf-form-margin: 0.25rem; background-color: $input-bg; background-image: none; background-clip: padding-box; - border: $input-btn-border-width solid $input-border-color; + border: 1px solid $input-border-color; + border-bottom: 0px; @include border-radius($input-border-radius-sm); @include box-shadow($input-box-shadow); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; From 588f35ef4fcdfb97b548c968d613eb55de4cb117 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 15 Aug 2017 10:54:13 +0200 Subject: [PATCH 23/40] Reduced size of breadcrumbs, additional form styling. Colors still need to be adjusted --- public/sass/components/_dropdown.scss | 4 ++++ public/sass/components/_gf-form.scss | 9 +++++---- public/sass/layout/_page.scss | 21 ++++++++++++--------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss index c12a0ef4141..8dee2bcc2b9 100644 --- a/public/sass/components/_dropdown.scss +++ b/public/sass/components/_dropdown.scss @@ -120,6 +120,10 @@ } } } + &--navbar { + background: $black; + font-size: $font-size-sm; + } } .dropdown-item-text { diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index bbf9d72084d..b2b17899308 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -1,4 +1,4 @@ -$gf-form-margin: 0.25rem; +$gf-form-margin: 0.1rem; .gf-form { margin-bottom: $gf-form-margin; @@ -54,10 +54,10 @@ $gf-form-margin: 0.25rem; flex-shrink: 0; font-weight: $font-weight-semi-bold; - background-color: $input-label-bg; + background-color: #23252d; //$input-label-bg; display: block; font-size: $font-size-sm; - margin-right: 0; + margin-right: $gf-form-margin; border: $input-btn-border-width solid transparent; @include border-radius($label-border-radius-sm); @@ -112,7 +112,8 @@ $gf-form-margin: 0.25rem; background-image: none; background-clip: padding-box; border: 1px solid $input-border-color; - border-bottom: 0px; + border-bottom: none; + border-left: none; @include border-radius($input-border-radius-sm); @include box-shadow($input-box-shadow); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index d823a8e457f..90d29d55108 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -11,7 +11,7 @@ .main-view { position: relative; flex-grow: 1; - background: inear-gradient(180deg, #1b1d25 0, #210d0d); + background: linear-gradient(180deg, #251f1f 0, #17181b); } .page-container { @@ -107,13 +107,15 @@ $breadcrumb-hover-hl: #111; $page-nav-bg: black; -.page-nav { - background: $page-nav-bg; - } +$page-breadcrumb__angle-1: 39px; +$page-breadcrumb__angle-ul: 31px; +$page-breadcrumb__angle-a: 30px; + .page-breadcrumb { display: flex; padding: 0 $spacer; + line-height: 0.5; } .page-breadcrumb__item { @@ -121,6 +123,7 @@ $page-nav-bg: black; > a { color: $text-color-weak; + font-size: $font-size-sm; display: block; padding: 0.6rem 1rem 0.6rem 3rem;; position: relative; @@ -133,9 +136,9 @@ $page-nav-bg: black; content: ''; height: 0; width: 0; - border: 46px solid transparent; + border: $page-breadcrumb__angle-1 solid transparent; border-right-width: 0; - border-left-width: 41px; + border-left-width: $page-breadcrumb__angle-a; z-index: 2; border-left-color: $page-nav-bg; } @@ -155,9 +158,9 @@ $page-nav-bg: black; content: ''; height: 0; width: 0; - border: 46px solid transparent; + border: $page-breadcrumb__angle-1 solid transparent; border-right-width: 0; - border-left-width: 41px; + border-left-width: $page-breadcrumb__angle-ul; z-index: 1; transform: translateX(4px); border-left-color: #282020; @@ -189,7 +192,7 @@ $page-nav-bg: black; width: 16px; height: 16px; right: -9px; - top: 12px; + top: 5px; z-index: 3; } From b949f019cfcea603e8df6ec1a09c1802d57c5be5 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 15 Aug 2017 11:04:26 +0200 Subject: [PATCH 24/40] Added drop shadown for sticky scrolling, moved colors into dark and light variables --- public/sass/_variables.dark.scss | 5 +++++ public/sass/_variables.light.scss | 5 +++++ public/sass/layout/_page.scss | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 9f9b508c141..97150d3c853 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -240,6 +240,11 @@ $menu-dropdown-hover-bg: $dark-2; $menu-dropdown-border-color: $dark-3; $menu-dropdown-shadow: 5px 5px 20px -5px $black; +// Breadcrumb +// ------------------------- +$page-nav-bg: $black; +$page-nav-shadow: 5px 5px 20px -5px $black; + // Pagination // ------------------------- diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 07d1c41f67b..c803639f8fc 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -192,6 +192,11 @@ $menu-dropdown-hover-bg: $gray-6; $menu-dropdown-border-color: $tight-form-border; $menu-dropdown-shadow: 5px 5px 20px -5px $gray-4; +// Breadcrumb +// ------------------------- +$page-nav-bg: $white; +$page-nav-shadow: 5px 5px 20px -5px $gray-4; + // search $search-shadow: 0 5px 30px 0 $gray-4; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 90d29d55108..474cdd90174 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -105,7 +105,6 @@ } $breadcrumb-hover-hl: #111; -$page-nav-bg: black; $page-breadcrumb__angle-1: 39px; $page-breadcrumb__angle-ul: 31px; @@ -120,6 +119,8 @@ $page-breadcrumb__angle-a: 30px; .page-breadcrumb__item { background: $page-nav-bg; + box-shadow: $page-nav-shadow; + > a { color: $text-color-weak; From 7bf6904119e9cbfc8e115211a1b14f3fc4bb2a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 11:51:47 +0200 Subject: [PATCH 25/40] ux: scrollbar stuff --- package.json | 1 + public/app/core/components/scroll/scroll.ts | 230 ++---------------- public/app/core/core.ts | 2 + .../features/dashboard/dashnav/dashnav.html | 1 + public/app/headers/common.d.ts | 5 + public/app/system.conf.js | 6 +- public/sass/_grafana.scss | 1 + public/sass/components/_scrollbar.scss | 148 +++++++++++ public/sass/layout/_page.scss | 3 - tasks/options/copy.js | 2 +- tasks/options/watch.js | 1 + yarn.lock | 36 ++- 12 files changed, 206 insertions(+), 230 deletions(-) create mode 100644 public/sass/components/_scrollbar.scss diff --git a/package.json b/package.json index e70633ac9a8..4b29ebdccfb 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "dependencies": { "eventemitter3": "^2.0.2", "gaze": "^1.1.2", + "gemini-scrollbar": "^1.5.2", "grunt-jscs": "3.0.1", "grunt-sass-lint": "^0.2.2", "grunt-sync": "^0.6.2", diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts index 914f3ba2dd9..06bdcb8c864 100644 --- a/public/app/core/components/scroll/scroll.ts +++ b/public/app/core/components/scroll/scroll.ts @@ -1,211 +1,19 @@ -// /// -// -// import _ from 'lodash'; -// -// var objectAssign = require('object-assign'); -// var Emitter = require('tiny-emitter'); -// var Lethargy = require('lethargy').Lethargy; -// var support = require('./support'); -// var clone = require('./clone'); -// var bindAll = require('bindall-standalone'); -// var EVT_ID = 'virtualscroll'; -// -// var keyCodes = { -// LEFT: 37, -// UP: 38, -// RIGHT: 39, -// DOWN: 40 -// }; -// -// function VirtualScroll(this: any, options) { -// _.bindAll(this, '_onWheel', '_onMouseWheel', '_onTouchStart', '_onTouchMove', '_onKeyDown'); -// -// this.el = window; -// if (options && options.el) { -// this.el = options.el; -// delete options.el; -// } -// -// this.options = _.assign({ -// mouseMultiplier: 1, -// touchMultiplier: 2, -// firefoxMultiplier: 15, -// keyStep: 120, -// preventTouch: false, -// unpreventTouchClass: 'vs-touchmove-allowed', -// limitInertia: false -// }, options); -// -// if (this.options.limitInertia) this._lethargy = new Lethargy(); -// -// this._emitter = new Emitter(); -// this._event = { -// y: 0, -// x: 0, -// deltaX: 0, -// deltaY: 0 -// }; -// -// this.touchStartX = null; -// this.touchStartY = null; -// this.bodyTouchAction = null; -// } -// -// VirtualScroll.prototype._notify = function(e) { -// var evt = this._event; -// evt.x += evt.deltaX; -// evt.y += evt.deltaY; -// -// this._emitter.emit(EVT_ID, { -// x: evt.x, -// y: evt.y, -// deltaX: evt.deltaX, -// deltaY: evt.deltaY, -// originalEvent: e -// }); -// }; -// -// VirtualScroll.prototype._onWheel = function(e) { -// var options = this.options; -// if (this._lethargy && this._lethargy.check(e) === false) return; -// -// var evt = this._event; -// -// // In Chrome and in Firefox (at least the new one) -// evt.deltaX = e.wheelDeltaX || e.deltaX * -1; -// evt.deltaY = e.wheelDeltaY || e.deltaY * -1; -// -// // for our purpose deltamode = 1 means user is on a wheel mouse, not touch pad -// // real meaning: https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent#Delta_modes -// if(support.isFirefox && e.deltaMode == 1) { -// evt.deltaX *= options.firefoxMultiplier; -// evt.deltaY *= options.firefoxMultiplier; -// } -// -// evt.deltaX *= options.mouseMultiplier; -// evt.deltaY *= options.mouseMultiplier; -// -// this._notify(e); -// }; -// -// VirtualScroll.prototype._onMouseWheel = function(e) { -// if (this.options.limitInertia && this._lethargy.check(e) === false) return; -// -// var evt = this._event; -// -// // In Safari, IE and in Chrome if 'wheel' isn't defined -// evt.deltaX = (e.wheelDeltaX) ? e.wheelDeltaX : 0; -// evt.deltaY = (e.wheelDeltaY) ? e.wheelDeltaY : e.wheelDelta; -// -// this._notify(e); -// }; -// -// VirtualScroll.prototype._onTouchStart = function(e) { -// var t = (e.targetTouches) ? e.targetTouches[0] : e; -// this.touchStartX = t.pageX; -// this.touchStartY = t.pageY; -// }; -// -// VirtualScroll.prototype._onTouchMove = function(e) { -// var options = this.options; -// if(options.preventTouch -// && !e.target.classList.contains(options.unpreventTouchClass)) { -// e.preventDefault(); -// } -// -// var evt = this._event; -// -// var t = (e.targetTouches) ? e.targetTouches[0] : e; -// -// evt.deltaX = (t.pageX - this.touchStartX) * options.touchMultiplier; -// evt.deltaY = (t.pageY - this.touchStartY) * options.touchMultiplier; -// -// this.touchStartX = t.pageX; -// this.touchStartY = t.pageY; -// -// this._notify(e); -// }; -// -// VirtualScroll.prototype._onKeyDown = function(e) { -// var evt = this._event; -// evt.deltaX = evt.deltaY = 0; -// -// switch(e.keyCode) { -// case keyCodes.LEFT: -// case keyCodes.UP: -// evt.deltaY = this.options.keyStep; -// break; -// -// case keyCodes.RIGHT: -// case keyCodes.DOWN: -// evt.deltaY = - this.options.keyStep; -// break; -// -// default: -// return; -// } -// -// this._notify(e); -// }; -// -// VirtualScroll.prototype._bind = function() { -// if(support.hasWheelEvent) this.el.addEventListener('wheel', this._onWheel); -// if(support.hasMouseWheelEvent) this.el.addEventListener('mousewheel', this._onMouseWheel); -// -// if(support.hasTouch) { -// this.el.addEventListener('touchstart', this._onTouchStart); -// this.el.addEventListener('touchmove', this._onTouchMove); -// } -// -// if(support.hasPointer && support.hasTouchWin) { -// this.bodyTouchAction = document.body.style.msTouchAction; -// document.body.style.msTouchAction = 'none'; -// this.el.addEventListener('MSPointerDown', this._onTouchStart, true); -// this.el.addEventListener('MSPointerMove', this._onTouchMove, true); -// } -// -// if(support.hasKeyDown) document.addEventListener('keydown', this._onKeyDown); -// }; -// -// VirtualScroll.prototype._unbind = function() { -// if(support.hasWheelEvent) this.el.removeEventListener('wheel', this._onWheel); -// if(support.hasMouseWheelEvent) this.el.removeEventListener('mousewheel', this._onMouseWheel); -// -// if(support.hasTouch) { -// this.el.removeEventListener('touchstart', this._onTouchStart); -// this.el.removeEventListener('touchmove', this._onTouchMove); -// } -// -// if(support.hasPointer && support.hasTouchWin) { -// document.body.style.msTouchAction = this.bodyTouchAction; -// this.el.removeEventListener('MSPointerDown', this._onTouchStart, true); -// this.el.removeEventListener('MSPointerMove', this._onTouchMove, true); -// } -// -// if(support.hasKeyDown) document.removeEventListener('keydown', this._onKeyDown); -// }; -// -// VirtualScroll.prototype.on = function(cb, ctx) { -// this._emitter.on(EVT_ID, cb, ctx); -// -// var events = this._emitter.e; -// if (events && events[EVT_ID] && events[EVT_ID].length === 1) this._bind(); -// }; -// -// VirtualScroll.prototype.off = function(cb, ctx) { -// this._emitter.off(EVT_ID, cb, ctx); -// -// var events = this._emitter.e; -// if (!events[EVT_ID] || events[EVT_ID].length <= 0) this._unbind(); -// }; -// -// VirtualScroll.prototype.reset = function() { -// var evt = this._event; -// evt.x = 0; -// evt.y = 0; -// }; -// -// VirtualScroll.prototype.destroy = function() { -// this._emitter.off(); -// this._unbind(); -// }; +/// + +import GeminiScrollbar from 'gemini-scrollbar'; +import coreModule from 'app/core/core_module'; +import _ from 'lodash'; + +export function geminiScrollbar() { + return { + restrict: 'A', + link: function(scope, elem, attrs) { + var myScrollbar = new GeminiScrollbar({ + autoshow: false, + element: elem[0] + }).create(); + } + }; +} + +coreModule.directive('geminiScrollbar', geminiScrollbar); diff --git a/public/app/core/core.ts b/public/app/core/core.ts index 92db42be8c4..fed63f37955 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -51,6 +51,7 @@ import {JsonExplorer} from './components/json_explorer/json_explorer'; import {NavModelSrv, NavModel} from './nav_model_srv'; import {userPicker} from './components/user_picker'; import {userGroupPicker} from './components/user_group_picker'; +import {geminiScrollbar} from './components/scroll/scroll'; export { arrayJoin, @@ -81,4 +82,5 @@ export { NavModel, userPicker, userGroupPicker, + geminiScrollbar, }; diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index 9fe6cfb9a1e..e8114e0298f 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -81,3 +81,4 @@
      + diff --git a/public/app/headers/common.d.ts b/public/app/headers/common.d.ts index 9ea5e96654d..ec80c01407d 100644 --- a/public/app/headers/common.d.ts +++ b/public/app/headers/common.d.ts @@ -72,3 +72,8 @@ declare module 'd3' { var d3: any; export default d3; } + +declare module 'gemini-scrollbar' { + var d3: any; + export default d3; +} diff --git a/public/app/system.conf.js b/public/app/system.conf.js index 816cba4fb42..0a89f6f58b9 100644 --- a/public/app/system.conf.js +++ b/public/app/system.conf.js @@ -2,7 +2,7 @@ System.config({ defaultJSExtenions: true, baseURL: 'public', paths: { - 'virtual-scroll': 'vendor/npm/virtual-scroll/src/index.js', + 'gemini-scrollbar': 'vendor/npm/gemini-scrollbar/index.js', 'mousetrap': 'vendor/npm/mousetrap/mousetrap.js', 'remarkable': 'vendor/npm/remarkable/dist/remarkable.js', 'tether': 'vendor/npm/tether/dist/js/tether.js', @@ -56,10 +56,6 @@ System.config({ }, meta: { - 'vendor/npm/virtual-scroll/src/indx.js': { - format: 'cjs', - exports: 'VirtualScroll', - }, 'vendor/angular/angular.js': { format: 'global', deps: ['jquery'], diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index f22036dd266..e965baf9cbe 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -31,6 +31,7 @@ @import "layout/page"; // COMPONENTS +@import "components/scrollbar"; @import "components/cards"; @import "components/buttons"; @import "components/navs"; diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss new file mode 100644 index 00000000000..b16acb75475 --- /dev/null +++ b/public/sass/components/_scrollbar.scss @@ -0,0 +1,148 @@ +/** + * gemini-scrollbar + * @version 1.5.2 + * @link http://noeldelgado.github.io/gemini-scrollbar/ + * @license MIT + */ + +/* disable selection while dragging */ +.gm-scrollbar-disable-selection { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +/* fallback for native floating scrollbars */ +.gm-prevented { + -webkit-overflow-scrolling: touch; +} +.gm-prevented > .gm-scrollbar { + display: none; +} + +/* actual gemini-scrollbar styles */ +.gm-scrollbar-container { + position: relative; + overflow: hidden!important; + width: 100%; + height: 100%; +} + +.gm-scrollbar { + position: absolute; + right: 2px; + bottom: 2px; + z-index: 1; + border-radius: 3px; +} + +.gm-scrollbar.-vertical { + width: 6px; + top: 2px; +} + +.gm-scrollbar.-horizontal { + height: 6px; + left: 2px; +} + +.gm-scrollbar .thumb { + position: relative; + display: block; + width: 0; + height: 0; + cursor: pointer; + border-radius: inherit; + background-color: lighten($body-bg, 10%); + transform: translate3d(0,0,0); +} + +.gm-scrollbar .thumb:hover, +.gm-scrollbar .thumb:active { + background-color: lighten($body-bg, 20%); +} + +.gm-scrollbar.-vertical .thumb { + width: 100%; +} + +.gm-scrollbar.-horizontal .thumb { + height: 100%; +} + +.gm-scrollbar-container .gm-scroll-view { + width: 100%; + height: 100%; + overflow: scroll; + transform: translate3d(0,0,0); + -webkit-overflow-scrolling: touch; +} + +/* @option: autoshow */ +.gm-scrollbar-container.gm-autoshow .gm-scrollbar { + opacity: 0; + transition: opacity 120ms ease-out; +} +.gm-scrollbar-container.gm-autoshow:hover > .gm-scrollbar, +.gm-scrollbar-container.gm-autoshow:active > .gm-scrollbar, +.gm-scrollbar-container.gm-autoshow:focus > .gm-scrollbar { + opacity: 1; + transition: opacity 340ms ease-out; +} + +.gm-resize-trigger { + position: absolute; + display: block; + top: 0; + left: 0; + height: 100%; + width: 100%; + overflow: hidden; + pointer-events: none; + z-index: -1; + opacity: 0; +} + + +// // Srollbars +// // +// +// ::-webkit-scrollbar { +// width: 8px; +// height: 8px; +// } +// +// ::-webkit-scrollbar:hover { +// height: 8px; +// } +// +// ::-webkit-scrollbar-button:start:decrement, +// ::-webkit-scrollbar-button:end:increment { display: none; } +// ::-webkit-scrollbar-button:horizontal:decrement { display: none; } +// ::-webkit-scrollbar-button:horizontal:increment { display: none; } +// ::-webkit-scrollbar-button:vertical:decrement { display: none; } +// ::-webkit-scrollbar-button:vertical:increment { display: none; } +// ::-webkit-scrollbar-button:horizontal:decrement:active { background-image: none; } +// ::-webkit-scrollbar-button:horizontal:increment:active { background-image: none; } +// ::-webkit-scrollbar-button:vertical:decrement:active { background-image: none; } +// ::-webkit-scrollbar-button:vertical:increment:active {background-image: none; } +// ::-webkit-scrollbar-track-piece { background-color: transparent; } +// +// ::-webkit-scrollbar-thumb:vertical { +// height: 50px; +// background: -webkit-gradient(linear, left top, right top, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); +// border: 1px solid $scrollbarBorder; +// border-top: 1px solid $scrollbarBorder; +// border-left: 1px solid $scrollbarBorder; +// } +// +// ::-webkit-scrollbar-thumb:horizontal { +// width: 50px; +// background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); +// border: 1px solid $scrollbarBorder; +// border-top: 1px solid $scrollbarBorder; +// border-left: 1px solid $scrollbarBorder; +// } diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index d823a8e457f..199bf876628 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -26,9 +26,6 @@ overflow: auto; } -.page-header-inner { -} - .page-body { @include media-breakpoint-up(md) { display: flex; diff --git a/tasks/options/copy.js b/tasks/options/copy.js index 59921576da3..ba8b70f8674 100644 --- a/tasks/options/copy.js +++ b/tasks/options/copy.js @@ -32,7 +32,7 @@ module.exports = function(config) { 'tether-drop/**/*', 'remarkable/dist/*', 'remarkable/dist/*', - 'virtual-scroll/**/*', + 'gemini-scrollbar/*.js', 'mousetrap/**/*', ], dest: '<%= srcDir %>/vendor/npm' diff --git a/tasks/options/watch.js b/tasks/options/watch.js index f7bea8af721..c3449524243 100644 --- a/tasks/options/watch.js +++ b/tasks/options/watch.js @@ -24,6 +24,7 @@ module.exports = function(config, grunt) { gaze([ config.srcDir + '/sass/**/*', config.srcDir + '/app/**/*', + config.srcDir + '/vendor/npm/gemini-scrollbar/*.js', ], function(err, watcher) { console.log('Gaze watchers setup'); diff --git a/yarn.lock b/yarn.lock index a9100c88e10..db2f5db1f53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1601,6 +1601,10 @@ gaze@^1.0.0, gaze@^1.1.2: dependencies: globule "^1.0.0" +gemini-scrollbar@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/gemini-scrollbar/-/gemini-scrollbar-1.5.2.tgz#06528e49afe155c45ce9f7c9ee754a9e6f4ed341" + generate-function@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" @@ -1926,12 +1930,12 @@ grunt-sass-lint@^0.2.2: dependencies: sass-lint "^1.10.2" -grunt-sass@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/grunt-sass/-/grunt-sass-1.2.1.tgz#fb87b6caac46fb32d45177fd2e4b6ff7468c1919" +grunt-sass@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/grunt-sass/-/grunt-sass-2.0.0.tgz#9074cf9d7b4592e20f7788caa727b8f9aa06b60a" dependencies: each-async "^1.0.0" - node-sass "^3.7.0" + node-sass "^4.0.0" object-assign "^4.0.1" grunt-string-replace@~1.3.1: @@ -2816,6 +2820,10 @@ lodash.keys@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash.mergewith@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55" + lodash@3.7.x: version "3.7.0" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45" @@ -3151,9 +3159,9 @@ node-pre-gyp@^0.6.29: tar "~2.2.1" tar-pack "~3.3.0" -node-sass@^3.7.0: - version "3.13.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.13.1.tgz#7240fbbff2396304b4223527ed3020589c004fc2" +node-sass@^4.0.0: + version "4.5.3" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -3164,13 +3172,15 @@ node-sass@^3.7.0: in-publish "^2.0.0" lodash.assign "^4.2.0" lodash.clonedeep "^4.3.2" + lodash.mergewith "^4.6.0" meow "^3.7.0" mkdirp "^0.5.1" nan "^2.3.2" node-gyp "^3.3.1" npmlog "^4.0.0" - request "^2.61.0" + request "^2.79.0" sass-graph "^2.1.1" + stdout-stream "^1.4.0" "nomnom@>= 1.5.x": version "1.8.1" @@ -3627,7 +3637,7 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5: +readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5: version "2.2.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" dependencies: @@ -3745,7 +3755,7 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@2, request@^2.61.0, request@^2.79.0, request@~2.79.0: +request@2, request@^2.79.0, request@~2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -4117,6 +4127,12 @@ statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +stdout-stream@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" + dependencies: + readable-stream "^2.0.1" + stream-buffers@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" From 9aa86487360e3e8fca80e5a313a5f52c15dddad2 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 15 Aug 2017 14:43:10 +0200 Subject: [PATCH 26/40] Silly gradient added a placeholder. no more experimentation to be done here until Trent has a pass at it --- public/sass/layout/_page.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 474cdd90174..d221a57c10b 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -11,7 +11,10 @@ .main-view { position: relative; flex-grow: 1; - background: linear-gradient(180deg, #251f1f 0, #17181b); + // background: linear-gradient(180deg, #251f1f 0, #17181b); + + $gradient-opacity: 0.03; + background: linear-gradient(135deg, rgba(26, 42, 108, $gradient-opacity), rgba(178, 31, 31, $gradient-opacity), rgba(253, 187, 45, $gradient-opacity)); //Matt experiement } .page-container { From 63424f9866df40bdd0643ac8be9a9a6366a8afdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 14:49:12 +0200 Subject: [PATCH 27/40] ux: more work on sidemenu --- pkg/api/api.go | 1 + pkg/api/avatar/avatar.go | 2 +- pkg/api/index.go | 71 ++++---- .../core/components/sidemenu/sidemenu.html | 152 +++++++++-------- .../app/core/components/sidemenu/sidemenu.ts | 59 ++++--- public/app/core/routes/routes.ts | 6 + public/app/features/admin/admin.ts | 11 ++ .../admin/partials/configuration_home.html | 48 ++++++ public/sass/_variables.scss | 2 +- public/sass/components/_dropdown.scss | 2 +- public/sass/components/_navbar.scss | 2 +- public/sass/components/_scrollbar.scss | 4 +- public/sass/components/_sidemenu.scss | 156 +++++++----------- public/views/index.html | 2 +- 14 files changed, 280 insertions(+), 238 deletions(-) create mode 100644 public/app/features/admin/partials/configuration_home.html diff --git a/pkg/api/api.go b/pkg/api/api.go index c91779cb193..f16f85e7c8f 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -41,6 +41,7 @@ func (hs *HttpServer) registerRoutes() { r.Get("/org/users/", reqSignedIn, Index) r.Get("/org/apikeys/", reqSignedIn, Index) r.Get("/dashboard/import/", reqSignedIn, Index) + r.Get("/configuration", reqGrafanaAdmin, Index) r.Get("/admin", reqGrafanaAdmin, Index) r.Get("/admin/settings", reqGrafanaAdmin, Index) r.Get("/admin/users", reqGrafanaAdmin, Index) diff --git a/pkg/api/avatar/avatar.go b/pkg/api/avatar/avatar.go index 41ce857db4f..69926bce492 100644 --- a/pkg/api/avatar/avatar.go +++ b/pkg/api/avatar/avatar.go @@ -146,7 +146,7 @@ func CacheServer() http.Handler { } func newNotFound() *Avatar { - avatar := &Avatar{} + avatar := &Avatar{notFound: true} // load transparent png into buffer path := filepath.Join(setting.StaticRootPath, "img", "transparent.png") diff --git a/pkg/api/index.go b/pkg/api/index.go index db8e51db9af..3afff3bb144 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -124,28 +124,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { }) } - if c.OrgRole == m.ROLE_ADMIN { - data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ - Text: "Data Sources", - Icon: "icon-gf icon-gf-datasources", - Url: setting.AppSubUrl + "/datasources", - Children: []*dtos.NavLink{ - {Text: "List", Url: setting.AppSubUrl + "/datasources", Icon: "icon-gf icon-gf-datasources"}, - {Text: "New", Url: setting.AppSubUrl + "/datasources", Icon: "fa fa-fw fa-plus"}, - }, - }) - data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ - Text: "Plugins", - Icon: "icon-gf icon-gf-apps", - Url: setting.AppSubUrl + "/plugins", - Children: []*dtos.NavLink{ - {Text: "Panels", Url: setting.AppSubUrl + "/plugins?type=panel", Icon: "fa fa-fw fa-stop"}, - {Text: "Data sources", Url: setting.AppSubUrl + "/plugins?type=datasource", Icon: "icon-gf icon-gf-datasources"}, - {Text: "Apps", Url: setting.AppSubUrl + "/plugins?type=app", Icon: "icon-gf icon-gf-apps"}, - }, - }) - } - enabledPlugins, err := plugins.GetEnabledPlugins(c.OrgId) if err != nil { return nil, err @@ -192,18 +170,49 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { } } - if c.IsGrafanaAdmin { - data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ - Text: "Admin", + if c.OrgRole == m.ROLE_ADMIN { + cfgNode := &dtos.NavLink{ + Text: "Configuration", Icon: "fa fa-fw fa-cogs", - Url: setting.AppSubUrl + "/admin", + Url: setting.AppSubUrl + "/configuration", Children: []*dtos.NavLink{ - {Text: "Global Users", Url: setting.AppSubUrl + "/admin/users"}, - {Text: "Global Orgs", Url: setting.AppSubUrl + "/admin/orgs"}, - {Text: "Server Settings", Url: setting.AppSubUrl + "/admin/settings"}, - {Text: "Server Stats", Url: setting.AppSubUrl + "/admin/stats"}, + { + Text: "Data Sources", + Icon: "icon-gf icon-gf-datasources", + Url: setting.AppSubUrl + "/datasources", + Children: []*dtos.NavLink{ + {Text: "List", Url: setting.AppSubUrl + "/datasources", Icon: "icon-gf icon-gf-datasources"}, + {Text: "New", Url: setting.AppSubUrl + "/datasources", Icon: "fa fa-fw fa-plus"}, + }, + }, + { + Text: "Plugins", + Icon: "icon-gf icon-gf-apps", + Url: setting.AppSubUrl + "/plugins", + Children: []*dtos.NavLink{ + {Text: "Panels", Url: setting.AppSubUrl + "/plugins?type=panel", Icon: "fa fa-fw fa-stop"}, + {Text: "Data sources", Url: setting.AppSubUrl + "/plugins?type=datasource", Icon: "icon-gf icon-gf-datasources"}, + {Text: "Apps", Url: setting.AppSubUrl + "/plugins?type=app", Icon: "icon-gf icon-gf-apps"}, + }, + }, }, - }) + } + + if c.IsGrafanaAdmin { + cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{ + Text: "Server Admin", + Icon: "fa fa-fw fa-shield", + Url: setting.AppSubUrl + "/admin", + Children: []*dtos.NavLink{ + {Text: "Global Users", Url: setting.AppSubUrl + "/admin/users"}, + {Text: "Global Orgs", Url: setting.AppSubUrl + "/admin/orgs"}, + {Text: "Server Settings", Url: setting.AppSubUrl + "/admin/settings"}, + {Text: "Server Stats", Url: setting.AppSubUrl + "/admin/stats"}, + }, + }) + } + + data.MainNavLinks = append(data.MainNavLinks, cfgNode) } return &data, nil diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index bc22d6cfb4e..55611dab103 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -1,77 +1,89 @@ - - - - - +
      -
      -
    • - - - - - - -
      • - - - +
      +
      + + + Sign in + +
      -
    + +
    + + + + + + + + +
    + +
    + + + + + +
    +
    diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 923b080ed92..e371429dc91 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -10,7 +10,7 @@ export class SideMenuCtrl { showSignout: boolean; user: any; mainLinks: any; - orgMenu: any; + userMenu: any; appSubUrl: string; loginUrl: string; orgFilter: string; @@ -49,40 +49,39 @@ export class SideMenuCtrl { } openUserDropdown() { - this.orgMenu = [ - {section: 'You', cssClass: 'dropdown-menu-title'}, - {text: 'Profile', url: this.getUrl('/profile')}, - ]; + this.userMenu = [ ]; if (this.showSignout) { - this.orgMenu.push({text: "Sign out", url: this.getUrl("/logout"), target: "_self"}); + this.userMenu.push({text: "Sign out", url: this.getUrl("/logout"), target: "_self", icon: 'fa fa-sign-out'}); } - if (this.contextSrv.hasRole('Admin')) { - this.orgMenu.push({section: this.user.orgName, cssClass: 'dropdown-menu-title'}); - this.orgMenu.push({ - text: "Preferences", - url: this.getUrl("/org") - }); - this.orgMenu.push({ - text: "Users", - url: this.getUrl("/org/users") - }); - this.orgMenu.push({ - text: "User Groups", - url: this.getUrl("/org/user-groups") - }); - this.orgMenu.push({ - text: "API Keys", - url: this.getUrl("/org/apikeys") - }); - } + this.userMenu.push({text: 'Profile', url: this.getUrl('/profile'), icon: 'fa fa-user'}); - this.orgMenu.push({cssClass: "divider"}); - this.backendSrv.get('/api/user/orgs').then(orgs => { - this.orgs = orgs; - this.loadOrgsItems(); - }); + // if (this.contextSrv.hasRole('Admin')) { + // this.orgMenu.push({section: this.user.orgName, cssClass: 'dropdown-menu-title'}); + // this.orgMenu.push({ + // text: "Preferences", + // url: this.getUrl("/org") + // }); + // this.orgMenu.push({ + // text: "Users", + // url: this.getUrl("/org/users") + // }); + // this.orgMenu.push({ + // text: "User Groups", + // url: this.getUrl("/org/user-groups") + // }); + // this.orgMenu.push({ + // text: "API Keys", + // url: this.getUrl("/org/apikeys") + // }); + // } + + // this.orgMenu.push({cssClass: "divider"}); + // this.backendSrv.get('/api/user/orgs').then(orgs => { + // this.orgs = orgs; + // this.loadOrgsItems(); + // }); } loadOrgsItems(){ diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts index 0bf0a03bf7a..8999df32d7f 100644 --- a/public/app/core/routes/routes.ts +++ b/public/app/core/routes/routes.ts @@ -44,6 +44,12 @@ function setupAngularRoutes($routeProvider, $locationProvider) { templateUrl: 'public/app/features/dashboard/partials/dash_list.html', controller : 'DashListCtrl', }) + .when('/configuration', { + templateUrl: 'public/app/features/admin/partials/configuration_home.html', + controller : 'ConfigurationHomeCtrl', + controllerAs: 'ctrl', + resolve: loadAdminBundle, + }) .when('/datasources', { templateUrl: 'public/app/features/plugins/partials/ds_list.html', controller : 'DataSourcesCtrl', diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts index 669e4a9c982..75af2f41506 100644 --- a/public/app/features/admin/admin.ts +++ b/public/app/features/admin/admin.ts @@ -2,6 +2,7 @@ import AdminListUsersCtrl from './admin_list_users_ctrl'; import './adminListOrgsCtrl'; import './adminEditOrgCtrl'; import './adminEditUserCtrl'; +import './configuration_home_ctrl'; import coreModule from 'app/core/core_module'; @@ -42,6 +43,16 @@ export class AdminStatsCtrl { } } +export class ConfigurationHomeCtrl { + navModel: any; + + /** @ngInject */ + constructor(private $scope, private backendSrv, private navModelSrv) { + this.navModel = navModelSrv.getAdminNav(); + } +} + +coreModule.controller('ConfigurationHomeCtrl', ConfigurationHomeCtrl); coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl); coreModule.controller('AdminHomeCtrl', AdminHomeCtrl); coreModule.controller('AdminStatsCtrl', AdminStatsCtrl); diff --git a/public/app/features/admin/partials/configuration_home.html b/public/app/features/admin/partials/configuration_home.html new file mode 100644 index 00000000000..6008ca6bda9 --- /dev/null +++ b/public/app/features/admin/partials/configuration_home.html @@ -0,0 +1,48 @@ + + +
    +
    +
    +

    + + Configuration +

    +
    + +
    + + +
      +
    1. + +
      +
      + {{ds.type}} +
      +
      +
      +
      + +
      +
      +
      + {{ds.name}} + + default + +
      +
      + {{ds.url}} +
      +
      +
      +       +
      2. +
    +
    + +
    + No data sources defined +
    +
    +
    diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index c80bbf9148f..204fcc5a8b1 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -219,7 +219,7 @@ $btn-padding-y-lg: .75rem !default; $btn-border-radius: 2px; // sidemenu -$side-menu-width: 68px; +$side-menu-width: 60px; // dashboard $panel-margin: 0.4rem; diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss index 8dee2bcc2b9..3e4ed5cfd09 100644 --- a/public/sass/components/_dropdown.scss +++ b/public/sass/components/_dropdown.scss @@ -217,7 +217,7 @@ // Different positioning for bottom up menu .dropdown-menu { top: auto; - bottom: 100%; + bottom: 0; margin-bottom: 1px; } } diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index 357b2be3ce0..c4cb51cf6a4 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -59,7 +59,7 @@ display: block; margin-bottom: 3rem; background-color: $side-menu-bg; - padding: 0.4rem 1.0rem 0.4rem 1rem; + padding: 0.4rem 1.0rem 0.4rem 0.65rem; min-height: $navbarHeight; .fa-caret-down { diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss index b16acb75475..78cbd6cb18a 100644 --- a/public/sass/components/_scrollbar.scss +++ b/public/sass/components/_scrollbar.scss @@ -107,9 +107,9 @@ } -// // Srollbars -// // +// Srollbars // + // ::-webkit-scrollbar { // width: 8px; // height: 8px; diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index 65e3e8d52da..8fb6845881f 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -12,34 +12,62 @@ } .sidemenu { - list-style: none; - margin: 0; - padding: 0; + display: flex; + flex-flow: column; +} - > li { - position: relative; - @include left-brand-border(); +.sidemenu__top { + flex-grow: 1; +} - &.active, - &:hover { - background-color: $side-menu-item-hover-bg; - @include left-brand-border-gradient(); +.sidemenu__bottom { + padding-bottom: $spacer; +} - .dropdown-menu { - margin: 0; - display: block; - opacity: 0; - top: 0px; - // important to overlap it otherwise it can be hidden - // again by the mouse getting outside the hover space - left: $side-menu-width - 2px; - @include animation('dropdown-anim 0ms ease-in-out 0ms forwards'); - z-index: -9999; - } +.sidemenu-item { + position: relative; + @include left-brand-border(); + + &.active, + &:hover { + background-color: $side-menu-item-hover-bg; + @include left-brand-border-gradient(); + + .dropdown-menu { + margin: 0; + display: block; + opacity: 0; + top: 0px; + // important to overlap it otherwise it can be hidden + // again by the mouse getting outside the hover space + left: $side-menu-width - 2px; + @include animation('dropdown-anim 0ms ease-in-out 0ms forwards'); + z-index: 1; } } } +.dropup.sidemenu-item:hover .dropdown-menu { + top: auto !important; +} + +.sidemenu-link { + color: $link-color; + line-height: 42px; + padding: 0px 10px 0px 10px; + display: block; + position: relative; + font-size: 16px; + border: 1px solid transparent; + + img { + border-radius: 50%; + width: 28px; + height: 28px; + box-shadow: 0 0 14px 2px rgba(255,255,255, 0.05); + } +} + @include keyframes(dropdown-anim) { 0% { opacity: 0; @@ -59,7 +87,7 @@ color: $link-color; opacity: .7; position: relative; - left: 7px; + left: 3px; font-size: 130%; } @@ -72,67 +100,17 @@ } img { - left: 7px; + left: 3px; position: relative; } } -.sidemenu-item { - color: $link-color; - line-height: 42px; - padding: 0px 10px 0px 10px; - display: block; - position: relative; - font-size: 16px; - border: 1px solid transparent; - - img { - border-radius: 50%; - width: 28px; - height: 28px; - box-shadow: 0 0 14px 2px rgba(255,255,255, 0.05); - } -} - .side-menu-header { padding: 10px 10px 10px 20px; white-space: nowrap; background-color: $side-menu-item-hover-bg; - font-size: 18px; -} - -.sidemenu-org-section .dropdown-menu-title { - margin: 0 10px 0 6px; - padding: 7px 0 7px; - overflow: hidden; - color: $dropdownTitle; -} - -.sidemenu-org-section .dropdown-menu-title > span { - display: inline-block; - position: relative; - - &::after { - display: block; - position: absolute; - top: 50%; - right: 0; - left: 100%; - width: 200px; - height: 1px; - margin-left: 5px; - background: $dropdownDivider; - content: ''; - } -} - -.sidemenu-org { - padding: 17px 10px 15px 14px; - box-sizing: border-box; - cursor: pointer; - display: table; - position: relative; - width: 100%; + font-size: 17px; + font-weight: normal; } .sidemenu .fa-caret-right { @@ -143,20 +121,14 @@ color: $text-color-faint; } -.sidemenu-org-avatar, -.sidemenu-org-details { - display: table-cell; - vertical-align: top; -} - .sidemenu-org-avatar { >img { position: absolute; - width: 35px; - height: 35px; + width: 30px; + height: 30px; border-radius: 50%; left: 14px; - top: 12px; + top: 6px; z-index: 10; } } @@ -168,19 +140,3 @@ font-size: $font-size-lg; } -.sidemenu-org-details { - padding-left: 10px; - color: $link-color; - display: none; -} - -.sidemenu-org-name { - display: block; - font-size: 13px; - color: $link-color-disabled; -} - -.sidemenu-org-user { - display: block; -} - diff --git a/public/views/index.html b/public/views/index.html index ad47baa3465..7fa2f0fa1e2 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -25,7 +25,7 @@ - +
    From db54416debbdd2b1ae9fcfa2e8ece55f65c174f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 15:25:18 +0200 Subject: [PATCH 28/40] ux: sidenav fixes and dashboard search changes --- public/app/core/components/search/search.html | 1 + .../core/components/sidemenu/sidemenu.html | 32 ++-- public/app/features/admin/admin.ts | 1 - .../features/dashboard/dashnav/dashnav.html | 155 +++++++++--------- public/sass/components/_dropdown.scss | 4 - public/sass/components/_search.scss | 4 +- public/sass/components/_sidemenu.scss | 10 +- 7 files changed, 97 insertions(+), 110 deletions(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index a1816ede44e..9e24941ba81 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -4,6 +4,7 @@
    +
    -
    - - - -
    -
    @@ -38,8 +32,12 @@
    - Sign in +
    @@ -52,14 +50,14 @@
    diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts index 75af2f41506..9c32a6e0c5c 100644 --- a/public/app/features/admin/admin.ts +++ b/public/app/features/admin/admin.ts @@ -2,7 +2,6 @@ import AdminListUsersCtrl from './admin_list_users_ctrl'; import './adminListOrgsCtrl'; import './adminEditOrgCtrl'; import './adminEditUserCtrl'; -import './configuration_home_ctrl'; import coreModule from 'app/core/core_module'; diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index e8114e0298f..4be86cd74e5 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -1,84 +1,87 @@
    -
    -
    +
    - - - - {{::ctrl.navModel.section.title}} - - +
    + + + {{ctrl.dashboard.title}} + + +
    - -
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    + - - - -
    + +
    diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss index 3e4ed5cfd09..3bb435d7c3c 100644 --- a/public/sass/components/_dropdown.scss +++ b/public/sass/components/_dropdown.scss @@ -120,10 +120,6 @@ } } } - &--navbar { - background: $black; - font-size: $font-size-sm; - } } .dropdown-item-text { diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index 22c837e1a49..6ddd3f336ca 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -1,8 +1,8 @@ .search-backdrop { position: fixed; right: 0; - bottom: 0; left: 0; + bottom: 0; top: $navbarHeight; z-index: $zindex-modal-backdrop; background-color: $black; @@ -10,7 +10,7 @@ } .search-container { - left: 0; + left: $side-menu-width; top: 0; right: 0; bottom: 0; diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index 8fb6845881f..099555465fe 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -1,6 +1,8 @@ -.sidemenu-wrapper { + +.sidemenu { display: flex; + flex-flow: column; flex-direction: column; width: $side-menu-width; background-color: $side-menu-bg; @@ -11,11 +13,6 @@ } } -.sidemenu { - display: flex; - flex-flow: column; -} - .sidemenu__top { flex-grow: 1; } @@ -110,7 +107,6 @@ white-space: nowrap; background-color: $side-menu-item-hover-bg; font-size: 17px; - font-weight: normal; } .sidemenu .fa-caret-right { From 1eab7712315c577ef30c65807f65c1363b451ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 17:52:52 +0200 Subject: [PATCH 29/40] ux: navigation work --- pkg/api/dtos/index.go | 16 +++-- pkg/api/index.go | 47 +++++++++--- public/app/core/components/navbar/navbar.html | 18 ++--- public/app/core/components/navbar/navbar.ts | 1 + .../core/components/sidemenu/sidemenu.html | 1 - .../app/core/components/sidemenu/sidemenu.ts | 2 +- public/app/core/nav_model_srv.ts | 68 ++++++++++-------- public/app/features/admin/admin.ts | 2 +- .../admin/partials/configuration_home.html | 23 ++---- public/app/features/org/org_users_ctrl.ts | 3 +- .../app/features/org/partials/orgDetails.html | 17 ++--- .../app/features/org/partials/orgUsers.html | 18 +++-- public/app/features/plugins/ds_edit_ctrl.ts | 4 +- .../features/plugins/partials/ds_list.html | 3 +- .../app/features/plugins/plugin_edit_ctrl.ts | 1 + public/sass/base/_grafana_icons.scss | 10 ++- public/sass/components/_cards.scss | 5 +- public/sass/components/_gf-form.scss | 2 +- public/sass/components/_scrollbar.scss | 72 +++++++++---------- public/sass/layout/_page.scss | 8 +-- public/views/index.html | 2 +- 21 files changed, 180 insertions(+), 143 deletions(-) diff --git a/pkg/api/dtos/index.go b/pkg/api/dtos/index.go index b813c78f2bb..c3a8bbd6ef4 100644 --- a/pkg/api/dtos/index.go +++ b/pkg/api/dtos/index.go @@ -7,7 +7,7 @@ type IndexViewData struct { AppSubUrl string GoogleAnalyticsId string GoogleTagManagerId string - MainNavLinks []*NavLink + NavTree []*NavLink BuildVersion string BuildCommit string NewGrafanaVersionExists bool @@ -20,10 +20,12 @@ type PluginCss struct { } type NavLink struct { - Text string `json:"text,omitempty"` - Icon string `json:"icon,omitempty"` - Img string `json:"img,omitempty"` - Url string `json:"url,omitempty"` - Divider bool `json:"divider,omitempty"` - Children []*NavLink `json:"children,omitempty"` + Id string `json:"id,omitempty"` + Text string `json:"text,omitempty"` + Description string `json:"description,omitempty"` + Icon string `json:"icon,omitempty"` + Img string `json:"img,omitempty"` + Url string `json:"url,omitempty"` + Divider bool `json:"divider,omitempty"` + Children []*NavLink `json:"children,omitempty"` } diff --git a/pkg/api/index.go b/pkg/api/index.go index 3afff3bb144..c08dafc263d 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -85,7 +85,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { } if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR { - data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ + data.NavTree = append(data.NavTree, &dtos.NavLink{ Text: "New", Icon: "fa fa-fw fa-plus", Url: "", @@ -103,7 +103,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { {Text: "Snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "icon-gf icon-gf-snapshot"}, } - data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ + data.NavTree = append(data.NavTree, &dtos.NavLink{ Text: "Dashboards", Icon: "icon-gf icon-gf-dashboard", Url: setting.AppSubUrl + "/", @@ -116,7 +116,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { {Text: "Notification channels", Url: setting.AppSubUrl + "/alerting/notifications", Icon: "fa fa-fw fa-bell-o"}, } - data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ + data.NavTree = append(data.NavTree, &dtos.NavLink{ Text: "Alerting", Icon: "icon-gf icon-gf-alert", Url: setting.AppSubUrl + "/alerting/list", @@ -165,36 +165,61 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { } if len(appLink.Children) > 0 { - data.MainNavLinks = append(data.MainNavLinks, appLink) + data.NavTree = append(data.NavTree, appLink) } } } if c.OrgRole == m.ROLE_ADMIN { cfgNode := &dtos.NavLink{ + Id: "cfg", Text: "Configuration", Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/configuration", Children: []*dtos.NavLink{ { - Text: "Data Sources", - Icon: "icon-gf icon-gf-datasources", - Url: setting.AppSubUrl + "/datasources", + Text: "Data Sources", + Icon: "icon-gf icon-gf-datasources", + Description: "Add and configure data sources", + Id: "datasources", + Url: setting.AppSubUrl + "/datasources", Children: []*dtos.NavLink{ {Text: "List", Url: setting.AppSubUrl + "/datasources", Icon: "icon-gf icon-gf-datasources"}, {Text: "New", Url: setting.AppSubUrl + "/datasources", Icon: "fa fa-fw fa-plus"}, }, }, { - Text: "Plugins", - Icon: "icon-gf icon-gf-apps", - Url: setting.AppSubUrl + "/plugins", + Text: "Preferences", + Id: "org", + Description: "Organization preferences", + Icon: "fa fa-fw fa-sliders", + Url: setting.AppSubUrl + "/org", + }, + { + Text: "Plugins", + Id: "plugins", + Description: "View and configure plugins", + Icon: "icon-gf icon-gf-apps", + Url: setting.AppSubUrl + "/plugins", Children: []*dtos.NavLink{ {Text: "Panels", Url: setting.AppSubUrl + "/plugins?type=panel", Icon: "fa fa-fw fa-stop"}, {Text: "Data sources", Url: setting.AppSubUrl + "/plugins?type=datasource", Icon: "icon-gf icon-gf-datasources"}, {Text: "Apps", Url: setting.AppSubUrl + "/plugins?type=app", Icon: "icon-gf icon-gf-apps"}, }, }, + { + Text: "User Management", + Id: "users", + Description: "Manage users & user groups", + Icon: "fa fa-fw fa-users", + Url: setting.AppSubUrl + "/org/users", + }, + { + Text: "API Keys", + Description: "Create & manage API keys", + Icon: "fa fa-fw fa-key", + Url: setting.AppSubUrl + "/org/apikeys", + }, }, } @@ -212,7 +237,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { }) } - data.MainNavLinks = append(data.MainNavLinks, cfgNode) + data.NavTree = append(data.NavTree, cfgNode) } return &data, nil diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index 395b188538e..d33378e33fc 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -1,20 +1,20 @@
    -
    - - {{::item.title}} - - +
    + + + + - - {{::item.title}} + + {{::item.text}} diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts index 8938ac4adcc..4b42bdaade0 100644 --- a/public/app/core/components/navbar/navbar.ts +++ b/public/app/core/components/navbar/navbar.ts @@ -11,6 +11,7 @@ export class NavbarCtrl { /** @ngInject */ constructor(private $scope, private $rootScope, private contextSrv) { + console.log(this.model); } showSearch() { diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index ae2cc7b33ab..7d54ad426aa 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -1,4 +1,3 @@ -
    diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index e371429dc91..3b9c5fefc48 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -26,7 +26,7 @@ export class SideMenuCtrl { this.showSignout = this.contextSrv.isSignedIn && !config['disableSignoutMenu']; this.maxShownOrgs = 10; - this.mainLinks = config.bootData.mainNavLinks; + this.mainLinks = config.bootData.navTree; this.openUserDropdown(); this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path()); diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts index e64bb2f74c5..eac3c24ffbb 100644 --- a/public/app/core/nav_model_srv.ts +++ b/public/app/core/nav_model_srv.ts @@ -1,6 +1,8 @@ /// import coreModule from 'app/core/core_module'; +import config from 'app/core/config'; +import _ from 'lodash'; export interface NavModelItem { title: string; @@ -15,10 +17,24 @@ export interface NavModel { } export class NavModelSrv { + navItems: any; /** @ngInject */ constructor(private contextSrv) { + this.navItems = config.bootData.navTree; + } + + getCfgNode() { + return _.find(this.navItems, {id: 'cfg'}); + } + + getConfigurationNav() { + let cfg = this.getCfgNode(); + return { + breadcrumbs: [cfg], + node: cfg, + }; } getAlertingNav(subPage) { @@ -36,21 +52,11 @@ export class NavModelSrv { } getDatasourceNav(subPage) { + let cfg = this.getCfgNode(); + let ds = _.find(cfg.children, {id: 'datasources'}); return { - items: [ - { - title: 'Configuration', - items: [ - {title: 'Data sources', active: subPage === 0, url: 'datasources', icon: 'fa fa-database'}, - {title: 'Users', active: subPage === 0, url: 'users', icon: 'fa fa-fw fa-users'}, - {title: 'Plugins', active: subPage === 0, url: 'plugins', icon: 'icon-gf icon-gf-apps'}, - ] - }, - { - title: 'Data sources', - url: 'datasources', - } - ] + breadcrumbs: [cfg, ds], + node: ds }; } @@ -91,18 +97,11 @@ export class NavModelSrv { } getOrgNav(subPage) { + let cfg = this.getCfgNode(); + let org = _.find(cfg.children, {id: 'org'}); return { - section: { - title: 'Organization', - url: 'org', - icon: 'icon-gf icon-gf-users' - }, - menu: [ - {title: 'Preferences', active: subPage === 0, url: 'org', icon: 'fa fa-fw fa-cog'}, - {title: 'Org Users', active: subPage === 1, url: 'org/users', icon: 'fa fa-fw fa-users'}, - {title: 'API Keys', active: subPage === 2, url: 'org/apikeys', icon: 'fa fa-fw fa-key'}, - {title: 'Org User Groups', active: subPage === 3, url: 'org/user-groups', icon: 'fa fa-fw fa-users'}, - ] + breadcrumbs: [this.getCfgNode(), org], + node: org }; } @@ -124,13 +123,20 @@ export class NavModelSrv { } getPluginsNav() { + let cfg = this.getCfgNode(); + let plugins = _.find(cfg.children, {id: 'plugins'}); return { - section: { - title: 'Plugins', - url: 'plugins', - icon: 'icon-gf icon-gf-apps' - }, - menu: [] + breadcrumbs: [this.getCfgNode(), plugins], + node: plugins + }; + } + + getUserManNav() { + let cfg = this.getCfgNode(); + let users = _.find(cfg.children, {id: 'users'}); + return { + breadcrumbs: [cfg, users], + node: users, }; } diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts index 9c32a6e0c5c..c81854fe9dd 100644 --- a/public/app/features/admin/admin.ts +++ b/public/app/features/admin/admin.ts @@ -47,7 +47,7 @@ export class ConfigurationHomeCtrl { /** @ngInject */ constructor(private $scope, private backendSrv, private navModelSrv) { - this.navModel = navModelSrv.getAdminNav(); + this.navModel = navModelSrv.getConfigurationNav(); } } diff --git a/public/app/features/admin/partials/configuration_home.html b/public/app/features/admin/partials/configuration_home.html index 6008ca6bda9..fa7ed8024b4 100644 --- a/public/app/features/admin/partials/configuration_home.html +++ b/public/app/features/admin/partials/configuration_home.html @@ -4,35 +4,30 @@

    - + Configuration

    -
    - +
      -
    1. - +
    2. +
      - {{ds.type}}
      - +
      - {{ds.name}} - - default - + {{navItem.text}}
      - {{ds.url}} + {{navItem.description}}
      @@ -40,9 +35,5 @@
    - -
    - No data sources defined -
    diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts index 1ecde875a5a..741e3f68a41 100644 --- a/public/app/features/org/org_users_ctrl.ts +++ b/public/app/features/org/org_users_ctrl.ts @@ -23,7 +23,8 @@ export class OrgUsersCtrl { loginOrEmail: '', role: 'Viewer', }; - this.navModel = navModelSrv.getOrgNav(0); + + this.navModel = navModelSrv.getUserManNav(0); this.get(); this.editor = { index: 0 }; diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index d6fb84d1c0d..ca6533a0b02 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -2,14 +2,17 @@
    -

    Org Preferences

    +

    + + {{navModel.node.text}} +

    General

    - Name + Organization name
    @@ -61,16 +64,6 @@
    -

    Admin Pages

    -
    -
    -
    - Users & Roles -
    -
    - API Keys -
    -
    diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index 2b791fbb094..aaed94b018d 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -2,7 +2,10 @@
    -

    Organization users

    +

    + + {{ctrl.navModel.node.text}} +

    @@ -22,8 +25,13 @@ Users ({{ctrl.users.length}}) +
  • + + Groups (0) + +
  • - + Pending Invitations ({{ctrl.pendingInvites.length}})
    • @@ -54,8 +62,10 @@ {{user.email}} {{user.lastSeenAtAge}} - +
    + +
    diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 8d02e7f29b8..032c0f4b296 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -59,7 +59,7 @@ export class DataSourceEditCtrl { initNewDatasourceModel() { this.isNew = true; this.current = angular.copy(defaults); - this.navModel.items.push({title: 'New data source'}); + this.navModel.breadcrumbs.push({text: 'New data source'}); // We are coming from getting started if (this.$location.search().gettingstarted) { @@ -86,7 +86,7 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; - this.navModel.items.push({title: ds.name}); + this.navModel.breadcrumbs.push({text: ds.name}); if (datasourceCreated) { datasourceCreated = false; diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index 781f2403631..bb214a60cc8 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -4,7 +4,7 @@

    - + Data Sources

    @@ -15,7 +15,6 @@
    -
    1. diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index 4910ee95490..3a8b781d0a2 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -42,6 +42,7 @@ export class PluginEditCtrl { return this.backendSrv.get(`/api/plugins/${this.pluginId}/settings`).then(result => { this.model = result; this.pluginIcon = this.getPluginIcon(this.model.type); + this.navModel.breadcrumbs.push({text: this.model.name}); this.model.dependencies.plugins.forEach(plug => { plug.icon = this.getPluginIcon(plug.type); diff --git a/public/sass/base/_grafana_icons.scss b/public/sass/base/_grafana_icons.scss index 42834e704b3..967912eb1ab 100644 --- a/public/sass/base/_grafana_icons.scss +++ b/public/sass/base/_grafana_icons.scss @@ -18,14 +18,20 @@ font-variant: normal; text-transform: none; line-height: 1; + display: inline-block; /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-gf-fw { + width: 1.2857142857em; + text-align: center; +} + .inline-icon-gf { - vertical-align: middle; + vertical-align: middle; } .icon-gf-raintank_wordmark:before { @@ -145,7 +151,7 @@ } .icon-gf-grabber:before { content: "\e90b"; -} +} .icon-gf-users:before { content: "\e622"; } diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss index 3f17d9e94b7..bc6aa06ef6b 100644 --- a/public/sass/components/_cards.scss +++ b/public/sass/components/_cards.scss @@ -97,7 +97,7 @@ color: $text-color-weak; text-transform: uppercase; font-size: $font-size-sm; - font-weight: bold; + font-weight: $font-weight-semi-bold; } .card-item-notice { @@ -158,6 +158,9 @@ img { width: 6rem; } + .fa, .icon-gf { + font-size: 3.5rem; + } } .card-item-name { diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index b2b17899308..9e01bcadda3 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -194,7 +194,7 @@ $gf-form-margin: 0.1rem; select.gf-form-input { text-indent: .01px; text-overflow: ''; - padding-right: $input-padding-x*2; + padding-right: $input-padding-x*4; -webkit-appearance: none; -moz-appearance: menulist-text; // was set to "window" and caused odd display on windos and linux. appearance: none; diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss index 78cbd6cb18a..b0ab94003a8 100644 --- a/public/sass/components/_scrollbar.scss +++ b/public/sass/components/_scrollbar.scss @@ -110,39 +110,39 @@ // Srollbars // -// ::-webkit-scrollbar { -// width: 8px; -// height: 8px; -// } -// -// ::-webkit-scrollbar:hover { -// height: 8px; -// } -// -// ::-webkit-scrollbar-button:start:decrement, -// ::-webkit-scrollbar-button:end:increment { display: none; } -// ::-webkit-scrollbar-button:horizontal:decrement { display: none; } -// ::-webkit-scrollbar-button:horizontal:increment { display: none; } -// ::-webkit-scrollbar-button:vertical:decrement { display: none; } -// ::-webkit-scrollbar-button:vertical:increment { display: none; } -// ::-webkit-scrollbar-button:horizontal:decrement:active { background-image: none; } -// ::-webkit-scrollbar-button:horizontal:increment:active { background-image: none; } -// ::-webkit-scrollbar-button:vertical:decrement:active { background-image: none; } -// ::-webkit-scrollbar-button:vertical:increment:active {background-image: none; } -// ::-webkit-scrollbar-track-piece { background-color: transparent; } -// -// ::-webkit-scrollbar-thumb:vertical { -// height: 50px; -// background: -webkit-gradient(linear, left top, right top, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); -// border: 1px solid $scrollbarBorder; -// border-top: 1px solid $scrollbarBorder; -// border-left: 1px solid $scrollbarBorder; -// } -// -// ::-webkit-scrollbar-thumb:horizontal { -// width: 50px; -// background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); -// border: 1px solid $scrollbarBorder; -// border-top: 1px solid $scrollbarBorder; -// border-left: 1px solid $scrollbarBorder; -// } +::-webkit-scrollbar { + width: 8px; + height: 8px; +} + +::-webkit-scrollbar:hover { + height: 8px; +} + +::-webkit-scrollbar-button:start:decrement, +::-webkit-scrollbar-button:end:increment { display: none; } +::-webkit-scrollbar-button:horizontal:decrement { display: none; } +::-webkit-scrollbar-button:horizontal:increment { display: none; } +::-webkit-scrollbar-button:vertical:decrement { display: none; } +::-webkit-scrollbar-button:vertical:increment { display: none; } +::-webkit-scrollbar-button:horizontal:decrement:active { background-image: none; } +::-webkit-scrollbar-button:horizontal:increment:active { background-image: none; } +::-webkit-scrollbar-button:vertical:decrement:active { background-image: none; } +::-webkit-scrollbar-button:vertical:increment:active {background-image: none; } +::-webkit-scrollbar-track-piece { background-color: transparent; } + +::-webkit-scrollbar-thumb:vertical { + height: 50px; + background: -webkit-gradient(linear, left top, right top, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); + border: 1px solid $scrollbarBorder; + border-top: 1px solid $scrollbarBorder; + border-left: 1px solid $scrollbarBorder; +} + +::-webkit-scrollbar-thumb:horizontal { + width: 50px; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2)); + border: 1px solid $scrollbarBorder; + border-top: 1px solid $scrollbarBorder; + border-left: 1px solid $scrollbarBorder; +} diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index a9ab6927aab..2601b441b0f 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -61,12 +61,12 @@ margin-bottom: $spacer*1.5; } + a, button { + float: right; + margin-left: $spacer; + } } -.page-header__cta { - float: right; - margin-left: $spacer; -} .page-heading { font-size: 1.25rem; diff --git a/public/views/index.html b/public/views/index.html index 7fa2f0fa1e2..aed97c32aaa 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -82,7 +82,7 @@ window.grafanaBootData = { user:[[.User]], settings: [[.Settings]], - mainNavLinks: [[.MainNavLinks]] + navTree: [[.NavTree]] }; From 0bc226d76093f347604d12fced5b8cc7550f5c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 20:24:16 +0200 Subject: [PATCH 30/40] ux: more nav work --- pkg/api/dtos/index.go | 18 +-- pkg/api/index.go | 23 +++- .../core/components/sidemenu/sidemenu.html | 3 +- .../app/core/components/sidemenu/sidemenu.ts | 16 +-- public/app/core/nav_model_srv.ts | 115 +++--------------- public/app/features/admin/admin.ts | 4 +- .../app/features/alerting/alert_list_ctrl.ts | 2 +- .../alerting/notification_edit_ctrl.ts | 4 +- .../alerting/notifications_list_ctrl.ts | 2 +- .../alerting/partials/alert_list.html | 9 +- .../alerting/partials/notifications_list.html | 6 +- .../app/features/org/change_password_ctrl.js | 2 +- public/app/features/org/orgApiKeysCtrl.js | 2 +- public/app/features/org/org_users_ctrl.ts | 2 +- .../org/partials/change_password.html | 5 +- public/app/features/org/partials/profile.html | 5 +- public/app/features/org/profile_ctrl.ts | 2 +- public/app/features/plugins/ds_edit_ctrl.ts | 2 +- public/app/features/plugins/ds_list_ctrl.ts | 2 +- .../app/features/plugins/plugin_edit_ctrl.ts | 2 +- .../app/features/plugins/plugin_list_ctrl.ts | 2 +- .../app/features/plugins/plugin_page_ctrl.ts | 46 +------ public/sass/components/_gf-form.scss | 2 +- public/sass/components/_query_part.scss | 2 +- public/sass/layout/_page.scss | 4 +- 25 files changed, 95 insertions(+), 187 deletions(-) diff --git a/pkg/api/dtos/index.go b/pkg/api/dtos/index.go index c3a8bbd6ef4..ea910901492 100644 --- a/pkg/api/dtos/index.go +++ b/pkg/api/dtos/index.go @@ -20,12 +20,14 @@ type PluginCss struct { } type NavLink struct { - Id string `json:"id,omitempty"` - Text string `json:"text,omitempty"` - Description string `json:"description,omitempty"` - Icon string `json:"icon,omitempty"` - Img string `json:"img,omitempty"` - Url string `json:"url,omitempty"` - Divider bool `json:"divider,omitempty"` - Children []*NavLink `json:"children,omitempty"` + Id string `json:"id,omitempty"` + Text string `json:"text,omitempty"` + Description string `json:"description,omitempty"` + Icon string `json:"icon,omitempty"` + Img string `json:"img,omitempty"` + Url string `json:"url,omitempty"` + Target string `json:"target,omitempty"` + Divider bool `json:"divider,omitempty"` + HideFromMenu bool `json:"hideFromMenu,omitempty"` + Children []*NavLink `json:"children,omitempty"` } diff --git a/pkg/api/index.go b/pkg/api/index.go index c08dafc263d..3e35cbcd01a 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -105,19 +105,35 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { data.NavTree = append(data.NavTree, &dtos.NavLink{ Text: "Dashboards", + Id: "dashboards", Icon: "icon-gf icon-gf-dashboard", Url: setting.AppSubUrl + "/", Children: dashboardChildNavs, }) + if c.IsSignedIn { + data.NavTree = append(data.NavTree, &dtos.NavLink{ + Text: "Your Profile", + Id: "profile", + Icon: "fa fa-fw fa-user", + Url: setting.AppSubUrl + "/profile", + Children: []*dtos.NavLink{ + {Text: "Signout", Url: setting.AppSubUrl + "/logout", Icon: "fa fa-fw fa-sign-out", Target: "_self"}, + {Text: "Your profile", Url: setting.AppSubUrl + "/profile", Icon: "fa fa-fw fa-sliders"}, + {Text: "Change Password", Id: "change-password", Url: setting.AppSubUrl + "/profile/password", Icon: "fa fa-fw fa-lock", HideFromMenu: true}, + }, + }) + } + if setting.AlertingEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) { alertChildNavs := []*dtos.NavLink{ - {Text: "Alert List", Url: setting.AppSubUrl + "/alerting/list", Icon: "fa fa-fw fa-list-ul"}, - {Text: "Notification channels", Url: setting.AppSubUrl + "/alerting/notifications", Icon: "fa fa-fw fa-bell-o"}, + {Text: "Alert List", Id: "alert-list", Url: setting.AppSubUrl + "/alerting/list", Icon: "fa fa-fw fa-list-ul"}, + {Text: "Notification channels", Id: "channels", Url: setting.AppSubUrl + "/alerting/notifications", Icon: "fa fa-fw fa-bell-o"}, } data.NavTree = append(data.NavTree, &dtos.NavLink{ Text: "Alerting", + Id: "alerting", Icon: "icon-gf icon-gf-alert", Url: setting.AppSubUrl + "/alerting/list", Children: alertChildNavs, @@ -133,6 +149,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if plugin.Pinned { appLink := &dtos.NavLink{ Text: plugin.Name, + Id: "plugin-page-" + plugin.Id, Url: plugin.DefaultNavUrl, Img: plugin.Info.Logos.Small, } @@ -216,6 +233,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { }, { Text: "API Keys", + Id: "apikeys", Description: "Create & manage API keys", Icon: "fa fa-fw fa-key", Url: setting.AppSubUrl + "/org/apikeys", @@ -226,6 +244,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if c.IsGrafanaAdmin { cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{ Text: "Server Admin", + Id: "admin", Icon: "fa fa-fw fa-shield", Url: setting.AppSubUrl + "/admin", Children: []*dtos.NavLink{ diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index 7d54ad426aa..44271765f00 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -39,7 +39,6 @@
    -
    @@ -59,7 +58,7 @@ {{::orgitem.text}} -
  • +
  • {{::menuItem.text}} diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 3b9c5fefc48..2e9b2fd14aa 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -7,10 +7,9 @@ import coreModule from '../../core_module'; export class SideMenuCtrl { isSignedIn: boolean; - showSignout: boolean; user: any; mainLinks: any; - userMenu: any; + profileNav: any; appSubUrl: string; loginUrl: string; orgFilter: string; @@ -23,11 +22,9 @@ export class SideMenuCtrl { this.isSignedIn = contextSrv.isSignedIn; this.user = contextSrv.user; this.appSubUrl = config.appSubUrl; - this.showSignout = this.contextSrv.isSignedIn && !config['disableSignoutMenu']; this.maxShownOrgs = 10; - - this.mainLinks = config.bootData.navTree; - this.openUserDropdown(); + this.mainLinks = _.filter(config.bootData.navTree, item => item.id !== 'profile'); + this.profileNav = _.find(config.bootData.navTree, {id: 'profile'}); this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path()); this.$scope.$on('$routeChangeSuccess', () => { @@ -49,13 +46,6 @@ export class SideMenuCtrl { } openUserDropdown() { - this.userMenu = [ ]; - - if (this.showSignout) { - this.userMenu.push({text: "Sign out", url: this.getUrl("/logout"), target: "_self", icon: 'fa fa-sign-out'}); - } - - this.userMenu.push({text: 'Profile', url: this.getUrl('/profile'), icon: 'fa fa-user'}); // if (this.contextSrv.hasRole('Admin')) { // this.orgMenu.push({section: this.user.orgName, cssClass: 'dropdown-menu-title'}); diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts index eac3c24ffbb..7ba3b9d2b9b 100644 --- a/public/app/core/nav_model_srv.ts +++ b/public/app/core/nav_model_srv.ts @@ -29,114 +29,29 @@ export class NavModelSrv { return _.find(this.navItems, {id: 'cfg'}); } - getConfigurationNav() { - let cfg = this.getCfgNode(); - return { - breadcrumbs: [cfg], - node: cfg, - }; - } + getNav(...args) { + var children = this.navItems; + var nav = {breadcrumbs: [], node: null}; - getAlertingNav(subPage) { - return { - section: { - title: 'Alerting', - url: 'plugins', - icon: 'icon-gf icon-gf-alert' - }, - menu: [ - {title: 'Alert List', active: subPage === 0, url: 'alerting/list', icon: 'fa fa-list-ul'}, - {title: 'Notification channels', active: subPage === 1, url: 'alerting/notifications', icon: 'fa fa-bell-o'}, - ] - }; - } + for (let id of args) { + let node = _.find(children, {id: id}); + nav.breadcrumbs.push(node); + nav.node = node; + children = node.children; + } - getDatasourceNav(subPage) { - let cfg = this.getCfgNode(); - let ds = _.find(cfg.children, {id: 'datasources'}); - return { - breadcrumbs: [cfg, ds], - node: ds - }; - } - - getPlaylistsNav(subPage) { - return { - section: { - title: 'Playlists', - url: 'playlists', - icon: 'fa fa-fw fa-film' - }, - menu: [ - {title: 'List view', active: subPage === 0, url: 'playlists', icon: 'fa fa-list-ul'}, - {title: 'Add Playlist', active: subPage === 1, url: 'playlists/create', icon: 'fa fa-plus'}, - ] - }; - } - - getProfileNav() { - return { - section: { - title: 'User Profile', - url: 'profile', - icon: 'fa fa-fw fa-user' - }, - menu: [] - }; + return nav; } getNotFoundNav() { - return { - section: { - title: 'Page', - url: '', - icon: 'fa fa-fw fa-warning' - }, - menu: [] + var node = { + text: "Page not found ", + icon: "fa fa-fw fa-warning", }; - } - getOrgNav(subPage) { - let cfg = this.getCfgNode(); - let org = _.find(cfg.children, {id: 'org'}); return { - breadcrumbs: [this.getCfgNode(), org], - node: org - }; - } - - getAdminNav(subPage) { - return { - section: { - title: 'Admin', - url: 'admin', - icon: 'fa fa-fw fa-cogs' - }, - menu: [ - {title: 'Users', active: subPage === 0, url: 'admin/users', icon: 'fa fa-fw fa-user'}, - {title: 'Orgs', active: subPage === 1, url: 'admin/orgs', icon: 'fa fa-fw fa-users'}, - {title: 'Server Settings', active: subPage === 2, url: 'admin/settings', icon: 'fa fa-fw fa-cogs'}, - {title: 'Server Stats', active: subPage === 2, url: 'admin/stats', icon: 'fa fa-fw fa-line-chart'}, - {title: 'Style Guide', active: subPage === 2, url: 'styleguide', icon: 'fa fa-fw fa-key'}, - ] - }; - } - - getPluginsNav() { - let cfg = this.getCfgNode(); - let plugins = _.find(cfg.children, {id: 'plugins'}); - return { - breadcrumbs: [this.getCfgNode(), plugins], - node: plugins - }; - } - - getUserManNav() { - let cfg = this.getCfgNode(); - let users = _.find(cfg.children, {id: 'users'}); - return { - breadcrumbs: [cfg, users], - node: users, + breadcrumbs: [node], + node: node }; } diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts index c81854fe9dd..00024b6983e 100644 --- a/public/app/features/admin/admin.ts +++ b/public/app/features/admin/admin.ts @@ -24,7 +24,7 @@ class AdminHomeCtrl { /** @ngInject **/ constructor(navModelSrv) { - this.navModel = navModelSrv.getAdminNav(); + this.navModel = navModelSrv.getNav('cfg', 'admin'); } } @@ -47,7 +47,7 @@ export class ConfigurationHomeCtrl { /** @ngInject */ constructor(private $scope, private backendSrv, private navModelSrv) { - this.navModel = navModelSrv.getConfigurationNav(); + this.navModel = navModelSrv.getNav('cfg'); } } diff --git a/public/app/features/alerting/alert_list_ctrl.ts b/public/app/features/alerting/alert_list_ctrl.ts index 169d38612c5..cb7a6d75945 100644 --- a/public/app/features/alerting/alert_list_ctrl.ts +++ b/public/app/features/alerting/alert_list_ctrl.ts @@ -23,7 +23,7 @@ export class AlertListCtrl { /** @ngInject */ constructor(private backendSrv, private $location, private $scope, navModelSrv) { - this.navModel = navModelSrv.getAlertingNav(0); + this.navModel = navModelSrv.getNav('alerting'); var params = $location.search(); this.filters.state = params.state || null; diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index d1b855cbf3a..5f940a4359d 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -25,7 +25,7 @@ export class AlertNotificationEditCtrl { /** @ngInject */ constructor(private $routeParams, private backendSrv, private $location, private $templateCache, navModelSrv) { - this.navModel = navModelSrv.getAlertingNav(); + this.navModel = navModelSrv.getNav('alerting', 'channels'); this.backendSrv.get(`/api/alert-notifiers`).then(notifiers => { this.notifiers = notifiers; @@ -36,10 +36,12 @@ export class AlertNotificationEditCtrl { } if (!this.$routeParams.id) { + this.navModel.breadcrumbs.push({text: 'New'}); return _.defaults(this.model, this.defaults); } return this.backendSrv.get(`/api/alert-notifications/${this.$routeParams.id}`).then(result => { + this.navModel.breadcrumbs.push({text: result.name}); return result; }); }).then(model => { diff --git a/public/app/features/alerting/notifications_list_ctrl.ts b/public/app/features/alerting/notifications_list_ctrl.ts index c55668c1ed2..28f5165841a 100644 --- a/public/app/features/alerting/notifications_list_ctrl.ts +++ b/public/app/features/alerting/notifications_list_ctrl.ts @@ -14,7 +14,7 @@ export class AlertNotificationsListCtrl { /** @ngInject */ constructor(private backendSrv, private $scope, navModelSrv) { this.loadNotifications(); - this.navModel = navModelSrv.getAlertingNav(1); + this.navModel = navModelSrv.getNav('alerting', 'channels'); } loadNotifications() { diff --git a/public/app/features/alerting/partials/alert_list.html b/public/app/features/alerting/partials/alert_list.html index 7a9f868bbc1..c3586b1d9a6 100644 --- a/public/app/features/alerting/partials/alert_list.html +++ b/public/app/features/alerting/partials/alert_list.html @@ -2,11 +2,18 @@
    -

    Alert List

    +

    + + {{ctrl.navModel.node.text}} +

    How to add an alert + + + Notification channels +
    diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html index ca69e651d6a..dd4d3957932 100644 --- a/public/app/features/alerting/partials/notifications_list.html +++ b/public/app/features/alerting/partials/notifications_list.html @@ -2,7 +2,11 @@
    -

    Notification channels

    +

    + + {{ctrl.navModel.node.text}} +

    + New Channel diff --git a/public/app/features/org/change_password_ctrl.js b/public/app/features/org/change_password_ctrl.js index fea22deb4f5..69f15de26cd 100644 --- a/public/app/features/org/change_password_ctrl.js +++ b/public/app/features/org/change_password_ctrl.js @@ -12,7 +12,7 @@ function (angular, config) { $scope.command = {}; $scope.authProxyEnabled = config.authProxyEnabled; $scope.ldapEnabled = config.ldapEnabled; - $scope.navModel = navModelSrv.getProfileNav(); + $scope.navModel = navModelSrv.getNav('profile', 'change-password'); $scope.changePassword = function() { if (!$scope.userForm.$valid) { return; } diff --git a/public/app/features/org/orgApiKeysCtrl.js b/public/app/features/org/orgApiKeysCtrl.js index 345f21cabfd..92ddcddcc06 100644 --- a/public/app/features/org/orgApiKeysCtrl.js +++ b/public/app/features/org/orgApiKeysCtrl.js @@ -8,7 +8,7 @@ function (angular) { module.controller('OrgApiKeysCtrl', function($scope, $http, backendSrv, navModelSrv) { - $scope.navModel = navModelSrv.getOrgNav(0); + $scope.navModel = navModelSrv.getNav('cfg', 'apikeys'); $scope.roleTypes = ['Viewer', 'Editor', 'Admin']; $scope.token = { role: 'Viewer' }; diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts index 741e3f68a41..d65094b5882 100644 --- a/public/app/features/org/org_users_ctrl.ts +++ b/public/app/features/org/org_users_ctrl.ts @@ -24,7 +24,7 @@ export class OrgUsersCtrl { role: 'Viewer', }; - this.navModel = navModelSrv.getUserManNav(0); + this.navModel = navModelSrv.getNav('cfg', 'users'); this.get(); this.editor = { index: 0 }; diff --git a/public/app/features/org/partials/change_password.html b/public/app/features/org/partials/change_password.html index e7ab7c0a128..9ae42356b63 100644 --- a/public/app/features/org/partials/change_password.html +++ b/public/app/features/org/partials/change_password.html @@ -2,7 +2,10 @@
    -

    Change password

    +

    + + {{navModel.node.text}} +

    diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html index d83d8a6b6a5..bf8bb336cf3 100644 --- a/public/app/features/org/partials/profile.html +++ b/public/app/features/org/partials/profile.html @@ -2,7 +2,10 @@
    -

    User Profile

    +

    + + {{ctrl.navModel.node.text}} +

    diff --git a/public/app/features/org/profile_ctrl.ts b/public/app/features/org/profile_ctrl.ts index 02f20553e3f..0751595f068 100644 --- a/public/app/features/org/profile_ctrl.ts +++ b/public/app/features/org/profile_ctrl.ts @@ -17,7 +17,7 @@ export class ProfileCtrl { constructor(private backendSrv, private contextSrv, private $location, navModelSrv) { this.getUser(); this.getUserOrgs(); - this.navModel = navModelSrv.getProfileNav(); + this.navModel = navModelSrv.getNav('profile'); } getUser() { diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 032c0f4b296..68f1c43df3d 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -43,7 +43,7 @@ export class DataSourceEditCtrl { private navModelSrv, ) { - this.navModel = navModelSrv.getDatasourceNav(0); + this.navModel = navModelSrv.getNav('cfg', 'datasources'); this.datasources = []; this.tabIndex = 0; diff --git a/public/app/features/plugins/ds_list_ctrl.ts b/public/app/features/plugins/ds_list_ctrl.ts index b178d47081f..5742f87a3c3 100644 --- a/public/app/features/plugins/ds_list_ctrl.ts +++ b/public/app/features/plugins/ds_list_ctrl.ts @@ -17,7 +17,7 @@ export class DataSourcesCtrl { private datasourceSrv, private navModelSrv) { - this.navModel = this.navModelSrv.getDatasourceNav(0); + this.navModel = this.navModelSrv.getNav('cfg', 'datasources'); backendSrv.get('/api/datasources').then(result => { this.datasources = result; diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index 3a8b781d0a2..1623627d1ba 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -28,7 +28,7 @@ export class PluginEditCtrl { private $http, private navModelSrv, ) { - this.navModel = navModelSrv.getPluginsNav(); + this.navModel = navModelSrv.getNav('cfg', 'plugins'); this.model = {}; this.pluginId = $routeParams.pluginId; this.tabIndex = 0; diff --git a/public/app/features/plugins/plugin_list_ctrl.ts b/public/app/features/plugins/plugin_list_ctrl.ts index 2a1209c14b0..ada1fc6a1ff 100644 --- a/public/app/features/plugins/plugin_list_ctrl.ts +++ b/public/app/features/plugins/plugin_list_ctrl.ts @@ -10,7 +10,7 @@ export class PluginListCtrl { /** @ngInject */ constructor(private backendSrv: any, $location, navModelSrv) { this.tabIndex = 0; - this.navModel = navModelSrv.getPluginsNav(); + this.navModel = navModelSrv.getNav('cfg', 'plugins'); var pluginType = $location.search().type || 'panel'; switch (pluginType) { diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index f3d2e3b5f53..e3c01892a2b 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -2,7 +2,6 @@ import angular from 'angular'; import _ from 'lodash'; -import {NavModel} from 'app/core/core'; var pluginInfoCache = {}; @@ -10,10 +9,10 @@ export class AppPageCtrl { page: any; pluginId: any; appModel: any; - navModel: NavModel; + navModel: any; /** @ngInject */ - constructor(private backendSrv, private $routeParams: any, private $rootScope) { + constructor(private backendSrv, private $routeParams: any, private $rootScope, private navModelSrv) { this.pluginId = $routeParams.pluginId; if (pluginInfoCache[this.pluginId]) { @@ -32,47 +31,12 @@ export class AppPageCtrl { if (!this.page) { this.$rootScope.appEvent('alert-error', ['App Page Not Found', '']); - this.navModel = { - section: { - title: "Page not found", - url: app.defaultNavUrl, - icon: 'icon-gf icon-gf-sadface', - }, - menu: [], - }; - + this.navModel = this.navModelSrv.getNotFoundNav(); return; } - let menu = []; - - for (let item of app.includes) { - if (item.addToNav) { - if (item.type === 'dashboard') { - menu.push({ - title: item.name, - url: 'dashboard/db/' + item.slug, - icon: 'fa fa-fw fa-dot-circle-o', - }); - } - if (item.type === 'page') { - menu.push({ - title: item.name, - url: `plugins/${app.id}/page/${item.slug}`, - icon: 'fa fa-fw fa-dot-circle-o', - }); - } - } - } - - this.navModel = { - section: { - title: app.name, - url: app.defaultNavUrl, - iconUrl: app.info.logos.small, - }, - menu: menu, - }; + this.navModel = this.navModelSrv.getNav('plugin-page-' + app.id); + this.navModel.breadcrumbs.push({text: this.page.name}); } loadPluginInfo() { diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 9e01bcadda3..f81eda65f86 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -54,7 +54,7 @@ $gf-form-margin: 0.1rem; flex-shrink: 0; font-weight: $font-weight-semi-bold; - background-color: #23252d; //$input-label-bg; + background-color: #292a2d; //$input-label-bg; display: block; font-size: $font-size-sm; margin-right: $gf-form-margin; diff --git a/public/sass/components/_query_part.scss b/public/sass/components/_query_part.scss index 1e2fb9622c2..ab68bcf2997 100644 --- a/public/sass/components/_query_part.scss +++ b/public/sass/components/_query_part.scss @@ -1,6 +1,6 @@ .query-part { - background-color: $input-bg !important; + background-color: lighten($input-label-bg, 5%); &.show-function-controls { padding-top: 5px; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 2601b441b0f..1a7dbec51e5 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -49,7 +49,7 @@ } .page-header { - padding: $spacer 0 0 0; + padding: 2rem 0 0 0; margin-bottom: 2rem; @include brand-bottom-border(); @include clearfix(); @@ -58,7 +58,7 @@ font-size: $font-size-h2; flex-grow: 1; display: inline-block; - margin-bottom: $spacer*1.5; + margin-bottom: 2rem; } a, button { From d659a5d79f2603c5e7f82d72de202f4ce1600a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 20:53:31 +0200 Subject: [PATCH 31/40] ux: more nav work --- public/app/core/components/navbar/navbar.ts | 17 +++++++++++++++++ .../features/alerting/notification_edit_ctrl.ts | 4 +++- .../features/alerting/partials/alert_list.html | 6 ++---- .../alerting/partials/notification_edit.html | 3 +-- .../alerting/partials/notifications_list.html | 5 +---- public/app/features/org/orgDetailsCtrl.js | 2 +- .../features/org/partials/change_password.html | 5 +---- .../app/features/org/partials/orgApiKeys.html | 2 +- .../app/features/org/partials/orgDetails.html | 5 +---- public/app/features/org/partials/profile.html | 5 +---- public/app/features/plugins/ds_edit_ctrl.ts | 8 ++++++-- .../app/features/plugins/partials/ds_edit.html | 11 +---------- .../app/features/plugins/partials/ds_list.html | 6 ++---- .../features/plugins/partials/plugin_list.html | 1 + public/sass/layout/_page.scss | 1 - 15 files changed, 39 insertions(+), 42 deletions(-) diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts index 4b42bdaade0..59d3af10cb1 100644 --- a/public/app/core/components/navbar/navbar.ts +++ b/public/app/core/components/navbar/navbar.ts @@ -41,4 +41,21 @@ export function navbarDirective() { }; } +export function pageH1() { + return { + restrict: 'E', + template: ` +

    + + {{model.node.text}} +

    + `, + scope: { + model: "=", + } + }; +} + + +coreModule.directive('pageH1', pageH1); coreModule.directive('navbar', navbarDirective); diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index 5f940a4359d..6e89558a5f1 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -36,12 +36,14 @@ export class AlertNotificationEditCtrl { } if (!this.$routeParams.id) { - this.navModel.breadcrumbs.push({text: 'New'}); + this.navModel.breadcrumbs.push({text: 'New channel'}); + this.navModel.node = {text: 'New channel'}; return _.defaults(this.model, this.defaults); } return this.backendSrv.get(`/api/alert-notifications/${this.$routeParams.id}`).then(result => { this.navModel.breadcrumbs.push({text: result.name}); + this.navModel.node = {text: result.name}; return result; }); }).then(model => { diff --git a/public/app/features/alerting/partials/alert_list.html b/public/app/features/alerting/partials/alert_list.html index c3586b1d9a6..447069bc8ee 100644 --- a/public/app/features/alerting/partials/alert_list.html +++ b/public/app/features/alerting/partials/alert_list.html @@ -2,10 +2,8 @@
    -

    - - {{ctrl.navModel.node.text}} -

    + +     How to add an alert diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html index 9b716e02ce6..ec692586d7f 100644 --- a/public/app/features/alerting/partials/notification_edit.html +++ b/public/app/features/alerting/partials/notification_edit.html @@ -2,8 +2,7 @@
    -

    Edit Channel

    -

    New Channel

    +
    diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html index dd4d3957932..0ac2cfb105f 100644 --- a/public/app/features/alerting/partials/notifications_list.html +++ b/public/app/features/alerting/partials/notifications_list.html @@ -2,10 +2,7 @@
    -

    - - {{ctrl.navModel.node.text}} -

    +     diff --git a/public/app/features/org/orgDetailsCtrl.js b/public/app/features/org/orgDetailsCtrl.js index 08c965fd333..7924d49fda2 100644 --- a/public/app/features/org/orgDetailsCtrl.js +++ b/public/app/features/org/orgDetailsCtrl.js @@ -10,7 +10,7 @@ function (angular) { $scope.init = function() { $scope.getOrgInfo(); - $scope.navModel = navModelSrv.getOrgNav(0); + $scope.navModel = navModelSrv.getNav('cfg', 'org'); }; $scope.getOrgInfo = function() { diff --git a/public/app/features/org/partials/change_password.html b/public/app/features/org/partials/change_password.html index 9ae42356b63..982c2fe16a8 100644 --- a/public/app/features/org/partials/change_password.html +++ b/public/app/features/org/partials/change_password.html @@ -2,10 +2,7 @@
    -

    - - {{navModel.node.text}} -

    +
    diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html index c4ec261cf64..d1c55f48f59 100644 --- a/public/app/features/org/partials/orgApiKeys.html +++ b/public/app/features/org/partials/orgApiKeys.html @@ -2,7 +2,7 @@
    -

    API Keys

    +

    Add new

    diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index ca6533a0b02..39f74cfb294 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -2,10 +2,7 @@
    -

    - - {{navModel.node.text}} -

    +

    General

    diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html index bf8bb336cf3..810e457c0fb 100644 --- a/public/app/features/org/partials/profile.html +++ b/public/app/features/org/partials/profile.html @@ -2,10 +2,7 @@
    -

    - - {{ctrl.navModel.node.text}} -

    +
    diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 68f1c43df3d..7537631fbc0 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -59,7 +59,10 @@ export class DataSourceEditCtrl { initNewDatasourceModel() { this.isNew = true; this.current = angular.copy(defaults); - this.navModel.breadcrumbs.push({text: 'New data source'}); + + // add to nav & breadcrumbs + this.navModel.node = {text: 'New data source', icon: 'icon-gf icon-gf-fw icon-gf-datasources'}; + this.navModel.breadcrumbs.push(this.navModel.node); // We are coming from getting started if (this.$location.search().gettingstarted) { @@ -86,7 +89,8 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; - this.navModel.breadcrumbs.push({text: ds.name}); + this.navModel.node = {text: ds.name, icon: 'icon-gf icon-gf-fw icon-gf-datasources'}; + this.navModel.breadcrumbs.push(this.navModel.node); if (datasourceCreated) { datasourceCreated = false; diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 1646dc49a78..27015987616 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -3,16 +3,7 @@
    -

    - - New data source - {{ctrl.current.name}} -

    - - - - Add data source - +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 2172723763a..0c4bb881279 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -9,18 +9,13 @@ export class SideMenuCtrl { user: any; mainLinks: any; bottomNav: any; - appSubUrl: string; loginUrl: string; - orgFilter: string; - orgItems: any; - orgs: any; - maxShownOrgs: number; + isSignedIn: boolean; /** @ngInject */ constructor(private $scope, private $rootScope, private $location, private contextSrv, private backendSrv, private $element) { + this.isSignedIn = contextSrv.isSignedIn; this.user = contextSrv.user; - this.appSubUrl = config.appSubUrl; - this.maxShownOrgs = 10; this.mainLinks = _.filter(config.bootData.navTree, item => !item.hideFromMenu); this.bottomNav = _.filter(config.bootData.navTree, item => item.hideFromMenu); this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path()); @@ -38,17 +33,13 @@ export class SideMenuCtrl { } this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path()); }); - - this.orgFilter = ''; } - getUrl(url) { - return config.appSubUrl + url; - } - - search() { - this.$rootScope.appEvent('show-dash-search'); - } + switchOrg() { + this.$rootScope.appEvent('show-modal', { + templateHtml: '', + }); + } } export function sideMenuDirective() { diff --git a/public/app/core/core.ts b/public/app/core/core.ts index 65b8fbbc4ec..996a15bebef 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -53,6 +53,7 @@ import {userPicker} from './components/user_picker'; import {userGroupPicker} from './components/user_group_picker'; import {geminiScrollbar} from './components/scroll/scroll'; import {gfPageDirective} from './components/gf_page'; +import {orgSwitcher} from './components/org_switcher'; export { arrayJoin, @@ -84,5 +85,6 @@ export { userPicker, userGroupPicker, geminiScrollbar, - gfPageDirective + gfPageDirective, + orgSwitcher, }; diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts index 2ff65fd6d0f..6e69391f757 100644 --- a/public/app/core/services/context_srv.ts +++ b/public/app/core/services/context_srv.ts @@ -9,6 +9,7 @@ export class User { isGrafanaAdmin: any; isSignedIn: any; orgRole: any; + orgId: number; timezone: string; helpFlags1: number; lightTheme: boolean; From 6609dbff90f838a781837875dbc7682387ce27bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 17 Aug 2017 12:06:51 +0200 Subject: [PATCH 36/40] ux: sidenav fixes and dashboard search changes --- ' | 134 ----------------- package.json | 2 +- public/app/core/components/scroll/scroll.ts | 4 + public/app/core/components/search/search.html | 57 ++++---- .../features/dashboard/partials/settings.html | 27 ---- public/app/features/org/org_users_ctrl.ts | 2 +- .../app/features/org/partials/orgUsers.html | 8 +- public/app/features/panel/panel_header.ts | 1 - .../features/plugins/partials/ds_edit.html | 136 +++++++++--------- .../features/plugins/partials/ds_list.html | 88 ++++++------ public/app/partials/dashboard.html | 34 +++-- public/app/partials/signup_invited.html | 2 +- public/sass/base/_type.scss | 4 + public/sass/components/_scrollbar.scss | 19 ++- public/sass/components/_search.scss | 3 +- public/sass/layout/_page.scss | 3 +- yarn.lock | 5 +- 17 files changed, 200 insertions(+), 329 deletions(-) delete mode 100644 ' diff --git a/' b/' deleted file mode 100644 index 61ae44e0aba..00000000000 --- a/' +++ /dev/null @@ -1,134 +0,0 @@ - - -.sidemenu { - display: flex; - flex-flow: column; - flex-direction: column; - width: $side-menu-width; - background-color: $side-menu-bg; - z-index: 1; - - a:focus { - text-decoration: none; - } -} - -.sidemenu__top { - flex-grow: 1; -} - -.sidemenu__bottom { - padding-bottom: $spacer; -} - -.sidemenu-item { - position: relative; - @include left-brand-border(); - - &.active, - &:hover { - background-color: $side-menu-item-hover-bg; - @include left-brand-border-gradient(); - - .dropdown-menu { - margin: 0; - display: block; - opacity: 0; - top: 0px; - // important to overlap it otherwise it can be hidden - // again by the mouse getting outside the hover space - left: $side-menu-width - 2px; - @include animation('dropdown-anim 100ms ease-in-out 100ms forwards'); - z-index: 1; - } - } -} - -.dropup.sidemenu-item:hover .dropdown-menu { - top: auto !important; -} - -.sidemenu-link { - color: $link-color; - line-height: 42px; - padding: 0px 10px 0px 10px; - display: block; - position: relative; - font-size: 16px; - border: 1px solid transparent; - - img { - border-radius: 50%; - width: 28px; - height: 28px; - box-shadow: 0 0 14px 2px rgba(255,255,255, 0.05); - } -} - -@include keyframes(dropdown-anim) { - 0% { - opacity: 0; - //transform: translate3d(-5%,0,0); - } - 100% { - opacity: 1; - //transform: translate3d(0,0,0); - } -} - -.icon-circle { - width: 35px; - height: 35px; - display: inline-block; - i { - color: $link-color; - opacity: .7; - position: relative; - left: 3px; - font-size: 130%; - } - - .fa { - top: 2px; - } - - .icon-gf { - top: 5px; - } - - img { - left: 3px; - position: relative; - } -} - -.side-menu-header { - padding: 10px 10px 10px 20px; - white-space: nowrap; - background-color: $side-menu-item-hover-bg; - font-size: 17px; -} - -li.sidemenu-org-switcher { - border-bottom: 1px solid $dropdownDividerBottom; -} - -.sidemenu-org-switcher__org-name { - font-size: $font-size-base; -} - -.sidemenu-org-switcher__org-current { - font-size: $font-size-xs; - color: $text-color-weak; -} - -.sidemenu-org-switcher__switch { - font-size: $font-size-sm; - padding-left: 1.5rem; - display: flex; - align-items: center; - i.fa > { - margin-right: 5px; - top: 0; - } -} diff --git a/package.json b/package.json index 4b29ebdccfb..2c03020a86f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "dependencies": { "eventemitter3": "^2.0.2", "gaze": "^1.1.2", - "gemini-scrollbar": "^1.5.2", + "gemini-scrollbar": "https://github.com/grafana/gemini-scrollbar#grafana", "grunt-jscs": "3.0.1", "grunt-sass-lint": "^0.2.2", "grunt-sync": "^0.6.2", diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts index 06bdcb8c864..c2e75df84c0 100644 --- a/public/app/core/components/scroll/scroll.ts +++ b/public/app/core/components/scroll/scroll.ts @@ -12,6 +12,10 @@ export function geminiScrollbar() { autoshow: false, element: elem[0] }).create(); + + scope.$on('$destroy', () => { + myScrollbar.destroy(); + }); } }; } diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index 9e24941ba81..57fa3bb894a 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -40,35 +40,38 @@
    -
    -
    - - - {{tag.term}}  ({{tag.count}}) - +
    +
    +
    + + + {{tag.term}}  ({{tag.count}}) + +
    +
    + +
    +
    No dashboards matching your query were found.
    + +
    - -
    -
    No dashboards matching your query were found.
    - -
    diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html index f0655c4d1b7..ddd21eae463 100644 --- a/public/app/features/dashboard/partials/settings.html +++ b/public/app/features/dashboard/partials/settings.html @@ -83,33 +83,6 @@
    - -
    - -
    -
    Rows settings
    - -
    -
    -
    - Title - -
    - - -
    - - - -
    -
    -
    diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts index d65094b5882..3948748e3f4 100644 --- a/public/app/features/org/org_users_ctrl.ts +++ b/public/app/features/org/org_users_ctrl.ts @@ -47,7 +47,7 @@ export class OrgUsersCtrl { } else if (config.disableLoginForm) { return "Add Users"; } else { - return "Add or Invite"; + return "Add"; } } diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index aaed94b018d..22afa60acf4 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -26,12 +26,12 @@
  • - + Groups (0)
    • -
  • - +
  • + Pending Invitations ({{ctrl.pendingInvites.length}})
    • @@ -76,7 +76,7 @@
    -
    +
    diff --git a/public/app/features/panel/panel_header.ts b/public/app/features/panel/panel_header.ts index 2bca009604e..749aa0e4b26 100644 --- a/public/app/features/panel/panel_header.ts +++ b/public/app/features/panel/panel_header.ts @@ -99,7 +99,6 @@ function panelHeader($compile) { menuScope = scope.$new(); let menuHtml = createMenuTemplate(scope.ctrl); - console.log(menuHtml); menuElem.html(menuHtml); $compile(menuElem)(menuScope); diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 2526c59e29a..ba74f1c0512 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,85 +1,87 @@
    - -
    -
    - +
    + +
    +
    + -
    - +
    + +
    -
    -
    +
    - -
    -
    -
    - Name - - - The name is used when you select the data source in panels. - The Default data source is preselected in new - panels. - + +
    +
    +
    + Name + + + The name is used when you select the data source in panels. + The Default data source is preselected in new + panels. + +
    +
    - -
    -
    - Type -
    - +
    + Type +
    + +
    -
    -
    - This plugin is marked as being in alpha state, which means it is in early development phase and - updates will include breaking changes. -
    - - - - - - -
    -
    Testing....
    -
    -
    {{ctrl.testing.title}}
    -
    +
    + This plugin is marked as being in alpha state, which means it is in early development phase and + updates will include breaking changes.
    -
    -
    - - - - Cancel -
    + + + + + +
    +
    Testing....
    +
    +
    {{ctrl.testing.title}}
    +
    +
    +
    + +
    + + + + Cancel +
    + + +
    + +
    + +
    -
    - -
    - -
    -
    diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index b4a6604eaa5..b8e9969d3e3 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,50 +1,52 @@
    - -
    -
    - + +
    + No data sources defined +
    +
    +
    diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index cecbc7aa28a..86f3c275b76 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -1,23 +1,27 @@
    -
    -
    -
    +
    +
    +
    +
    +
    - + -
    +
    - - + + -
    -
    - - ADD ROW - -
    -
    -
    +
    +
    + + ADD ROW + +
    +
    +
    +
    +
    diff --git a/public/app/partials/signup_invited.html b/public/app/partials/signup_invited.html index 7a8dd459ff6..1a9b195c764 100644 --- a/public/app/partials/signup_invited.html +++ b/public/app/partials/signup_invited.html @@ -1,4 +1,4 @@ -
    +