Fixed png rendering

pull/1442/head
Torkel Ödegaard 10 years ago
parent 16acdfc7c3
commit a127f2d572
  1. 1
      src/app/controllers/loginCtrl.js
  2. 1
      src/app/features/dashboard/all.js
  3. 1
      src/app/features/panel/all.js
  4. 0
      src/app/features/panel/partials/panelTime.html
  5. 2
      src/app/features/panel/partials/soloPanel.html
  6. 8
      src/app/features/panel/soloPanelCtrl.js
  7. 2
      src/app/panels/graph/module.js
  8. 2
      src/app/routes/backend/all.js

@ -89,7 +89,6 @@ function (angular, config) {
backendSrv.post('/login', $scope.formModel).then(function(result) {
if (result.redirectUrl) {
console.log(result);
window.location.href = result.redirectUrl;
} else {
window.location.href = config.appSubUrl + '/';

@ -9,7 +9,6 @@ define([
'./keybindings',
'./viewStateSrv',
'./playlistSrv',
'./soloPanelCtrl',
'./timeSrv',
'./unsavedChangesSrv',
], function () {});

@ -2,4 +2,5 @@ define([
'./panelMenu',
'./panelDirective',
'./panelSrv',
'./soloPanelCtrl',
], function () {});

@ -2,7 +2,7 @@
<div class="row-fluid">
<div class="span12">
<div class="panel nospace" ng-if="panel" style="width: 100%">
<grafana-panel type="panel.type" ng-cloak></kibana-panel>
<panel-loader type="panel.type" ng-cloak></panel-loader>
</div>
</div>
</div>

@ -16,15 +16,15 @@ function (angular, $) {
panelId = parseInt(params.panelId);
db.getDashboard($routeParams.id, false)
.then(function(dashboardData) {
$scope.initPanelScope(dashboardData);
.then(function(dashboard) {
$scope.initPanelScope(dashboard);
}).then(null, function(error) {
$scope.appEvent('alert-error', ['Load panel error', error]);
});
};
$scope.initPanelScope = function(dashboardData) {
$scope.dashboard = dashboardSrv.create(dashboardData);
$scope.initPanelScope = function(dashboard) {
$scope.dashboard = dashboardSrv.create(dashboard.model);
$scope.grafana.style = $scope.dashboard.style;
$scope.row = {
height: $(window).height() + 'px',

@ -34,7 +34,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
$scope.panelMeta.addEditorTab('Axes & Grid', 'app/panels/graph/axisEditor.html');
$scope.panelMeta.addEditorTab('Display Styles', 'app/panels/graph/styleEditor.html');
$scope.panelMeta.addEditorTab('Time range', 'app/features/dashboard/partials/panelTime.html');
$scope.panelMeta.addEditorTab('Time range', 'app/features/panel/partials/panelTime.html');
$scope.panelMeta.addExtendedMenuItem('Export CSV', '', 'exportCsv()');
$scope.panelMeta.addExtendedMenuItem('Toggle legend', '', 'toggleLegend()');

@ -67,7 +67,7 @@ define([
controller : 'LoginCtrl',
})
.when('/dashboard/solo/:id/', {
templateUrl: 'app/partials/solo-panel.html',
templateUrl: 'app/features/panel/partials/soloPanel.html',
controller : 'SoloPanelCtrl',
})
.otherwise({

Loading…
Cancel
Save