Skip to content

N
nexpie-grafana-theme
Commit b3f3b70b by Torkel Ödegaard
Options

Merge branch 'master' of github.com:grafana/grafana

parents 924800b7 d27da57b
Showing with 51 additions and 47 deletions
CHANGELOG.md
# 3.0.0-beta5 (unreleased)
### Bug fixes
* **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702)
* **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706)
# 3.0.0-beta4 (2016-04-13)
### Bug fixes
......
public/app/features/panel/metrics_panel_ctrl.ts
......@@ -65,7 +65,7 @@ class MetricsPanelCtrl extends PanelCtrl {
var data = this.panel.snapshotData;
// backward compatability
if (!_.isArray(data)) {
data = data;
data = data.data;
}
this.events.emit('data-snapshot-load', data);
......
public/app/plugins/panel/graph/module.ts
......@@ -161,7 +161,7 @@ class GraphCtrl extends MetricsPanelCtrl {
onDataSnapshotLoad(snapshotData) {
this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard);
this.onDataReceived(snapshotData.data);
this.onDataReceived(snapshotData);
}
onDataError(err) {
......
public/app/plugins/panel/pluginlist/module.html
<div class="pluginlist">
<div class="pluginlist-section" ng-repeat="category in ctrl.viewModel">
<h6 class="pluginlist-section-header">
{{category.header}}
</h6>
<div class="pluginlist-item" ng-repeat="plugin in category.list">
<div class="pluginlist-link pluginlist-link-{{plugin.state}} pointer" ng-click="ctrl.gotoPlugin(plugin)">
<a href="plugins/{{plugin.id}}/edit">
<img ng-src="{{plugin.info.logos.small}}" class="pluginlist-image">
<span class="pluginlist-title">{{plugin.name}}</span>
<span class="pluginlist-version">v{{plugin.info.version}}</span>
</a>
<a class="pluginlist-message pluginlist-message--update" ng-show="plugin.hasUpdate" ng-click="ctrl.updateAvailable(plugin, $event)" bs-tooltip="'New version: ' + plugin.latestVersion">
Update available!
</a>
<span class="pluginlist-message pluginlist-message--enable" ng-show="!plugin.enabled && !plugin.hasUpdate">
Enable now
</span>
<span class="pluginlist-message pluginlist-message--no-update" ng-show="plugin.enabled && !plugin.hasUpdate">
Up to date
</span>
</div>
</div>
<div class="pluginlist-item" ng-show="category.list.length === 0">
<a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="http://grafana.net/plugins/">
<span class="pluginlist-none-installed">No additional panels installed. <span class="pluginlist-emphasis">Browse Grafana.net</span></span>
</a>
</div>
</div>
<div class="pluginlist-section" ng-repeat="category in ctrl.viewModel">
<h6 class="pluginlist-section-header">
{{category.header}}
</h6>
<div class="pluginlist-item" ng-repeat="plugin in category.list">
<a class="pluginlist-link pluginlist-link-{{plugin.state}} pointer" href="plugins/{{plugin.id}}/edit">
<span>
<img ng-src="{{plugin.info.logos.small}}" class="pluginlist-image">
<span class="pluginlist-title">{{plugin.name}}</span>
<span class="pluginlist-version">v{{plugin.info.version}}</span>
</span>
<span class="pluginlist-message pluginlist-message--update" ng-show="plugin.hasUpdate" ng-click="ctrl.updateAvailable(plugin, $event)" bs-tooltip="'New version: ' + plugin.latestVersion">
Update available!
</span>
<span class="pluginlist-message pluginlist-message--enable" ng-show="!plugin.enabled && !plugin.hasUpdate">
Enable now
</span>
<span class="pluginlist-message pluginlist-message--no-update" ng-show="plugin.enabled && !plugin.hasUpdate">
Up to date
</span>
</a>
</div>
<div class="pluginlist-item" ng-show="category.list.length === 0">
<a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="http://grafana.net/plugins/">
<span class="pluginlist-none-installed">No additional panels installed. <span class="pluginlist-emphasis">Browse Grafana.net</span></span>
</a>
</div>
</div>
</div>
public/app/plugins/panel/pluginlist/module.ts
......@@ -35,12 +35,14 @@ class PluginListCtrl extends PanelCtrl {
this.addEditorTab('Options', 'public/app/plugins/panel/pluginlist/editor.html');
}
gotoPlugin(plugin) {
this.$location.path(`plugins/${plugin.id}/edit`);
gotoPlugin(plugin, evt) {
if (evt) { evt.stopPropagation(); }
this.$location.url(`plugins/${plugin.id}/edit`);
}
updateAvailable(plugin, $event) {
$event.stopPropagation();
$event.preventDefault();
var modalScope = this.$scope.$new(true);
modalScope.plugin = plugin;
......
public/app/plugins/panel/singlestat/module.ts
......@@ -56,7 +56,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
this.events.on('data-received', this.onDataReceived.bind(this));
this.events.on('data-error', this.onDataError.bind(this));
this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
this.events.on('data-snapshot-load', this.onDataReceived.bind(this));
this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
}
......@@ -71,10 +71,6 @@ class SingleStatCtrl extends MetricsPanelCtrl {
this.render();
}
onDataSnapshotLoad(snapshotData) {
this.onDataReceived(snapshotData.data);
}
onDataError(err) {
this.onDataReceived({data: []});
}
......
public/app/plugins/panel/table/module.ts
......@@ -60,7 +60,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
this.events.on('data-received', this.onDataReceived.bind(this));
this.events.on('data-error', this.onDataError.bind(this));
this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
this.events.on('data-snapshot-load', this.onDataReceived.bind(this));
this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
this.events.on('init-panel-actions', this.onInitPanelActions.bind(this));
}
......@@ -86,10 +86,6 @@ class TablePanelCtrl extends MetricsPanelCtrl {
return super.issueQueries(datasource);
}
onDataSnapshotLoad(data) {
this.onDataReceived(data.data);
}
onDataError(err) {
this.dataRaw = [];
this.render();
......
public/sass/_variables.dark.scss
......@@ -102,7 +102,9 @@ $tight-form-func-bg: #333;
$tight-form-func-highlight-bg: #444;
$modal-background: $black;
$code-tag-bg: #444;
$code-tag-bg: $dark-5;
$code-tag-border: lighten($code-tag-bg, 2%);
// Lists
$grafanaListBackground: $dark-3;
......
public/sass/_variables.light.scss
......@@ -109,7 +109,8 @@ $tight-form-func-bg: $gray-5;
$tight-form-func-highlight-bg: $gray-6;
$modal-background: $body-bg;
$code-tag-bg: $dark-5;
$code-tag-bg: $gray-6;
$code-tag-border: darken($code-tag-bg, 3%);
// Lists
$grafanaListBackground: $gray-6;
......@@ -281,7 +282,7 @@ $tooltipColor: $popover-help-color;
$tooltipBackground: $popover-help-bg;
$tooltipArrowWidth: 5px;
$tooltipArrowColor: $tooltipBackground;
$tooltipLinkColor: $link-color;
$tooltipLinkColor: lighten($popover-help-color, 5%);
$graph-tooltip-bg: $gray-5;
// images
......
public/sass/base/_code.scss
......@@ -10,7 +10,7 @@ pre {
font-size: $font-size-base - 2;
background-color: $code-tag-bg;
color: $text-color;
border: 1px solid darken($code-tag-bg, 15%);
border: 1px solid $code-tag-border;
padding: 10px;
border-radius: 4px;
}
......
public/sass/components/_panel_graph.scss
......@@ -236,6 +236,7 @@
white-space: nowrap;
font-size: $font-size-sm;
background-color: $graph-tooltip-bg;
color: $text-color;
.graph-tooltip-time {
text-align: center;
......@@ -248,7 +249,7 @@
display: table-row;
&--highlight {
color: $link-color;
color: $text-color-emphasis;
font-weight: bold;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment