Commit 81b1939f by Torkel Ödegaard

Graph: small fix to legend table mode

parent 834daeec
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
**OpenTSDB** **OpenTSDB**
- [Issue #930](https://github.com/grafana/grafana/issues/930). OpenTSDB: Adding counter max and counter reset value to open tsdb query editor, thx @rsimiciuc - [Issue #930](https://github.com/grafana/grafana/issues/930). OpenTSDB: Adding counter max and counter reset value to open tsdb query editor, thx @rsimiciuc
- [Issue #917](https://github.com/grafana/grafana/issues/917). OpenTSDB: Templating support for OpenTSDB series name and tags - [Issue #917](https://github.com/grafana/grafana/issues/917). OpenTSDB: Templating support for OpenTSDB series name and tags, thx @mchataigner
**Fixes** **Fixes**
- [Issue #925](https://github.com/grafana/grafana/issues/925). Graph: bar width calculation fix for some edge cases (bars would render on top of each other) - [Issue #925](https://github.com/grafana/grafana/issues/925). Graph: bar width calculation fix for some edge cases (bars would render on top of each other)
......
...@@ -22,6 +22,7 @@ function (angular, $, _) { ...@@ -22,6 +22,7 @@ function (angular, $, _) {
template += '</div>'; template += '</div>';
template += '<div class="panel-menu-row">'; template += '<div class="panel-menu-row">';
template += '<a class="panel-menu-link" bs-dropdown="[{text: \'hej\'}]"><i class="icon-th-list"></i></a>';
_.each($scope.panelMeta.menu, function(item) { _.each($scope.panelMeta.menu, function(item) {
template += '<a class="panel-menu-link" '; template += '<a class="panel-menu-link" ';
......
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
<div class="editor-row"> <div class="editor-row">
<div class="section"> <div class="section">
<h5>Legend styles</h5> <h5>Legend styles</h5>
<editor-opt-bool text="Show legend" model="panel.legend.show" change="get_data();"></editor-opt-bool> <editor-opt-bool text="Show" model="panel.legend.show" change="get_data();"></editor-opt-bool>
<editor-opt-bool text="Include values" model="panel.legend.values" change="render()"></editor-opt-bool> <editor-opt-bool text="Values" model="panel.legend.values" change="render()"></editor-opt-bool>
<editor-opt-bool text="Align as table" model="panel.legend.alignAsTable" change="render()"></editor-opt-bool> <editor-opt-bool text="Table" model="panel.legend.alignAsTable" change="render()"></editor-opt-bool>
<editor-opt-bool text="Right side" model="panel.legend.rightSide" change="render()"></editor-opt-bool> <editor-opt-bool text="Right side" model="panel.legend.rightSide" change="render()"></editor-opt-bool>
</div> </div>
<div class="section" ng-if="panel.legend.values"> <div class="section" ng-if="panel.legend.values">
<h5>Legend values</h5> <h5>Legend values</h5>
......
...@@ -63,7 +63,7 @@ function (angular, app, _, kbn, $) { ...@@ -63,7 +63,7 @@ function (angular, app, _, kbn, $) {
$container.empty(); $container.empty();
$container.toggleClass('graph-legend-table', panel.legend.alignAsTable); $container.toggleClass('graph-legend-table', panel.legend.alignAsTable === true);
if (panel.legend.alignAsTable) { if (panel.legend.alignAsTable) {
var header = '<tr>'; var header = '<tr>';
......
...@@ -50,6 +50,11 @@ function(angular, $) { ...@@ -50,6 +50,11 @@ function(angular, $) {
scope.dashboard.emit_refresh('refresh'); scope.dashboard.emit_refresh('refresh');
}, { inputDisabled: true }); }, { inputDisabled: true });
keyboardManager.bind('ctrl+l', function() {
scope.dashboard.hideAllLegends = !scope.dashboard.hideAllLegends;
scope.dashboard.emit_refresh('refresh');
}, { inputDisabled: true });
keyboardManager.bind('ctrl+h', function() { keyboardManager.bind('ctrl+h', function() {
var current = scope.dashboard.hideControls; var current = scope.dashboard.hideControls;
scope.dashboard.hideControls = !current; scope.dashboard.hideControls = !current;
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@dropdownBackground: @heroUnitBackground; @dropdownBackground: @grafanaTargetFuncBackground;
@dropdownBorder: rgba(0,0,0,.2); @dropdownBorder: rgba(0,0,0,.2);
@dropdownDividerTop: transparent; @dropdownDividerTop: transparent;
@dropdownDividerBottom: #222; @dropdownDividerBottom: #222;
......
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