(this.modalOpen = true));
+ $rootScope.onAppEvent('timepickerOpen', () => (this.timepickerOpen = true));
+ $rootScope.onAppEvent('timepickerClosed', () => (this.timepickerOpen = false));
}
setupGlobal() {
@@ -73,7 +76,12 @@ export class KeybindingSrv {
appEvents.emit('hide-modal');
if (!this.modalOpen) {
- this.$rootScope.appEvent('panel-change-view', { fullscreen: false, edit: false });
+ if (this.timepickerOpen) {
+ this.$rootScope.appEvent('closeTimepicker');
+ this.timepickerOpen = false;
+ } else {
+ this.$rootScope.appEvent('panel-change-view', { fullscreen: false, edit: false });
+ }
} else {
this.modalOpen = false;
}
diff --git a/public/app/core/services/segment_srv.js b/public/app/core/services/segment_srv.js
deleted file mode 100644
index 71d0cbfe7a9..00000000000
--- a/public/app/core/services/segment_srv.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define([
- 'angular',
- 'lodash',
- '../core_module',
-],
-function (angular, _, coreModule) {
- 'use strict';
-
- coreModule.default.service('uiSegmentSrv', function($sce, templateSrv) {
- var self = this;
-
- function MetricSegment(options) {
- if (options === '*' || options.value === '*') {
- this.value = '*';
- this.html = $sce.trustAsHtml('');
- this.type = options.type;
- this.expandable = true;
- return;
- }
-
- if (_.isString(options)) {
- this.value = options;
- this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
- return;
- }
-
- // temp hack to work around legacy inconsistency in segment model
- this.text = options.value;
-
- this.cssClass = options.cssClass;
- this.custom = options.custom;
- this.type = options.type;
- this.fake = options.fake;
- this.value = options.value;
- this.selectMode = options.selectMode;
- this.type = options.type;
- this.expandable = options.expandable;
- this.html = options.html || $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
- }
-
- this.getSegmentForValue = function(value, fallbackText) {
- if (value) {
- return this.newSegment(value);
- } else {
- return this.newSegment({value: fallbackText, fake: true});
- }
- };
-
- this.newSelectMeasurement = function() {
- return new MetricSegment({value: 'select measurement', fake: true});
- };
-
- this.newFake = function(text, type, cssClass) {
- return new MetricSegment({value: text, fake: true, type: type, cssClass: cssClass});
- };
-
- this.newSegment = function(options) {
- return new MetricSegment(options);
- };
-
- this.newKey = function(key) {
- return new MetricSegment({value: key, type: 'key', cssClass: 'query-segment-key' });
- };
-
- this.newKeyValue = function(value) {
- return new MetricSegment({value: value, type: 'value', cssClass: 'query-segment-value' });
- };
-
- this.newCondition = function(condition) {
- return new MetricSegment({value: condition, type: 'condition', cssClass: 'query-keyword' });
- };
-
- this.newOperator = function(op) {
- return new MetricSegment({value: op, type: 'operator', cssClass: 'query-segment-operator' });
- };
-
- this.newOperators = function(ops) {
- return _.map(ops, function(op) {
- return new MetricSegment({value: op, type: 'operator', cssClass: 'query-segment-operator' });
- });
- };
-
- this.transformToSegments = function(addTemplateVars, variableTypeFilter) {
- return function(results) {
- var segments = _.map(results, function(segment) {
- return self.newSegment({value: segment.text, expandable: segment.expandable});
- });
-
- if (addTemplateVars) {
- _.each(templateSrv.variables, function(variable) {
- if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) {
- segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true }));
- }
- });
- }
-
- return segments;
- };
- };
-
- this.newSelectMetric = function() {
- return new MetricSegment({value: 'select metric', fake: true});
- };
-
- this.newPlusButton = function() {
- return new MetricSegment({fake: true, html: '', type: 'plus-button', cssClass: 'query-part' });
- };
-
- });
-
-});
diff --git a/public/app/core/services/segment_srv.ts b/public/app/core/services/segment_srv.ts
new file mode 100644
index 00000000000..042340e6102
--- /dev/null
+++ b/public/app/core/services/segment_srv.ts
@@ -0,0 +1,111 @@
+import _ from 'lodash';
+import coreModule from '../core_module';
+
+/** @ngInject */
+export function uiSegmentSrv($sce, templateSrv) {
+ let self = this;
+
+ function MetricSegment(options) {
+ if (options === '*' || options.value === '*') {
+ this.value = '*';
+ this.html = $sce.trustAsHtml('');
+ this.type = options.type;
+ this.expandable = true;
+ return;
+ }
+
+ if (_.isString(options)) {
+ this.value = options;
+ this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
+ return;
+ }
+
+ // temp hack to work around legacy inconsistency in segment model
+ this.text = options.value;
+
+ this.cssClass = options.cssClass;
+ this.custom = options.custom;
+ this.type = options.type;
+ this.fake = options.fake;
+ this.value = options.value;
+ this.selectMode = options.selectMode;
+ this.type = options.type;
+ this.expandable = options.expandable;
+ this.html = options.html || $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
+ }
+
+ this.getSegmentForValue = function(value, fallbackText) {
+ if (value) {
+ return this.newSegment(value);
+ } else {
+ return this.newSegment({ value: fallbackText, fake: true });
+ }
+ };
+
+ this.newSelectMeasurement = function() {
+ return new MetricSegment({ value: 'select measurement', fake: true });
+ };
+
+ this.newFake = function(text, type, cssClass) {
+ return new MetricSegment({ value: text, fake: true, type: type, cssClass: cssClass });
+ };
+
+ this.newSegment = function(options) {
+ return new MetricSegment(options);
+ };
+
+ this.newKey = function(key) {
+ return new MetricSegment({ value: key, type: 'key', cssClass: 'query-segment-key' });
+ };
+
+ this.newKeyValue = function(value) {
+ return new MetricSegment({ value: value, type: 'value', cssClass: 'query-segment-value' });
+ };
+
+ this.newCondition = function(condition) {
+ return new MetricSegment({ value: condition, type: 'condition', cssClass: 'query-keyword' });
+ };
+
+ this.newOperator = function(op) {
+ return new MetricSegment({ value: op, type: 'operator', cssClass: 'query-segment-operator' });
+ };
+
+ this.newOperators = function(ops) {
+ return _.map(ops, function(op) {
+ return new MetricSegment({ value: op, type: 'operator', cssClass: 'query-segment-operator' });
+ });
+ };
+
+ this.transformToSegments = function(addTemplateVars, variableTypeFilter) {
+ return function(results) {
+ let segments = _.map(results, function(segment) {
+ return self.newSegment({ value: segment.text, expandable: segment.expandable });
+ });
+
+ if (addTemplateVars) {
+ _.each(templateSrv.variables, function(variable) {
+ if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) {
+ segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true }));
+ }
+ });
+ }
+
+ return segments;
+ };
+ };
+
+ this.newSelectMetric = function() {
+ return new MetricSegment({ value: 'select metric', fake: true });
+ };
+
+ this.newPlusButton = function() {
+ return new MetricSegment({
+ fake: true,
+ html: '',
+ type: 'plus-button',
+ cssClass: 'query-part',
+ });
+ };
+}
+
+coreModule.service('uiSegmentSrv', uiSegmentSrv);
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts
index 2434e691515..33cfff92e7f 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/timepicker/timepicker.ts
@@ -22,7 +22,6 @@ export class TimePickerCtrl {
refresh: any;
isUtc: boolean;
firstDayOfWeek: number;
- closeDropdown: any;
isOpen: boolean;
/** @ngInject */
@@ -32,6 +31,7 @@ export class TimePickerCtrl {
$rootScope.onAppEvent('shift-time-forward', () => this.move(1), $scope);
$rootScope.onAppEvent('shift-time-backward', () => this.move(-1), $scope);
$rootScope.onAppEvent('refresh', this.onRefresh.bind(this), $scope);
+ $rootScope.onAppEvent('closeTimepicker', this.openDropdown.bind(this), $scope);
// init options
this.panel = this.dashboard.timepicker;
@@ -96,7 +96,7 @@ export class TimePickerCtrl {
openDropdown() {
if (this.isOpen) {
- this.isOpen = false;
+ this.closeDropdown();
return;
}
@@ -112,6 +112,12 @@ export class TimePickerCtrl {
this.refresh.options.unshift({ text: 'off' });
this.isOpen = true;
+ this.$rootScope.appEvent('timepickerOpen');
+ }
+
+ closeDropdown() {
+ this.isOpen = false;
+ this.$rootScope.appEvent('timepickerClosed');
}
applyCustom() {
@@ -120,7 +126,7 @@ export class TimePickerCtrl {
}
this.timeSrv.setTime(this.editTimeRaw);
- this.isOpen = false;
+ this.closeDropdown();
}
absoluteFromChanged() {
@@ -143,7 +149,7 @@ export class TimePickerCtrl {
}
this.timeSrv.setTime(range);
- this.isOpen = false;
+ this.closeDropdown();
}
}
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
index 31e5ee62d6f..c701cc1249e 100644
--- a/public/sass/base/_icons.scss
+++ b/public/sass/base/_icons.scss
@@ -1,10 +1,8 @@
.gicon {
line-height: 1;
display: inline-block;
- //width: 1.1057142857em;
- //height: 1.1057142857em;
- height: 22px;
- width: 22px;
+ width: 1.1057142857em;
+ height: 1.1057142857em;
text-align: center;
background-repeat: no-repeat;
background-position: center;
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index e69068b730a..99033b90ff1 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -60,6 +60,10 @@
display: flex;
flex-direction: column;
flex-grow: 1;
+
+ .search-item--indent {
+ margin-left: 14px;
+ }
}
.search-dropdown__col_2 {
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index e48ab0597a2..d1372484074 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -123,6 +123,8 @@
position: relative;
opacity: 0.7;
font-size: 130%;
+ height: 22px;
+ width: 22px;
}
.fa {
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index c957b6af790..871db4dfc2d 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -33,7 +33,7 @@ div.flot-text {
border: $panel-border;
position: relative;
border-radius: 3px;
- //height: 100%;
+ height: 100%;
&.panel-transparent {
background-color: transparent;