IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small updates to share dashboard snapshot feature

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-24 15:45:31 +01:00
parent d758729633
commit c27db7a347
5 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dashboard_snapshot.go
View File

@ -9,7 +9,7 @@ import (
) )
func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) { func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
cmd.Key = util.GetRandomString(20) cmd.Key = util.GetRandomString(32)
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {
c.JsonApiErr(500, "Failed to create snaphost", err) c.JsonApiErr(500, "Failed to create snaphost", err)

47
src/app/features/dashboard/partials/shareDashboard.html
View File

@ -50,36 +50,33 @@
<h4 class="share-snapshot-header"> <h4 class="share-snapshot-header">
<i ng-if="!loading" class="fa fa-camera"></i> <i ng-if="!loading" class="fa fa-camera"></i>
<i ng-if="loading" class="fa fa-spinner fa-spin"></i> <i ng-if="loading" class="fa fa-spinner fa-spin"></i>
Create dashboard with embedded data and share with anyone Snapshot dashboard & visible data and share with anyone
</h4> </h4>
<div class="editor-row" style="margin: 11px 20px 33px 20px"> <div class="editor-row" style="margin: 11px 20px 33px 20px">
<div class="section"> <div class="section"ng-if="!snapshotUrl">
<div class="tight-form last">
<div ng-if="!snapshotUrl"> <ul class="tight-form-list">
<div class="tight-form last"> <li class="tight-form-item">
<ul class="tight-form-list"> <strong>Snapshot name</strong>
<li class="tight-form-item"> </li>
<strong>Snapshot name</strong> <li>
</li> <input type="text" ng-model="snapshot.name" class="input-large tight-form-input last" >
<li> </li>
<input type="text" ng-model="snapshot.name" class="input-large tight-form-input last" > </ul>
</li> <div class="clearfix"></div>
</ul>
<div class="clearfix"></div>
</div>
</div> </div>
</div>
<div class="gf-form" ng-if="snapshotUrl"> <div class="gf-form" ng-if="snapshotUrl">
<div class="gf-form-row"> <div class="gf-form-row">
<a href="{{snapshotUrl}}" class="large" target="_blank"> <a href="{{snapshotUrl}}" class="large share-snapshot-link" target="_blank">
<i class="fa fa-external-link-square"></i> <i class="fa fa-external-link-square"></i>
{{snapshotUrl}} {{snapshotUrl}}
</a> </a>
<br> <br>
<br> <br>
<button class="btn btn-inverse btn-large" data-clipboard-text="{{snapshotUrl}}" clipboard-button><i class="fa fa-clipboard"></i> Copy</button> <button class="btn btn-inverse btn-large" data-clipboard-text="{{snapshotUrl}}" clipboard-button><i class="fa fa-clipboard"></i> Copy Link</button>
</div>
</div> </div>
</div> </div>
</div> </div>

7
src/app/features/dashboard/shareSnapshotCtrl.js
View File

@ -6,7 +6,7 @@ function (angular) {
var module = angular.module('grafana.controllers'); var module = angular.module('grafana.controllers');
module.controller('ShareSnapshotCtrl', function($scope, $rootScope, $location, backendSrv, $timeout) { module.controller('ShareSnapshotCtrl', function($scope, $rootScope, $location, backendSrv, $timeout, timeSrv) {
$scope.snapshot = { $scope.snapshot = {
name: $scope.dashboard.title name: $scope.dashboard.title
@ -24,8 +24,11 @@ function (angular) {
$scope.saveSnapshot = function(makePublic) { $scope.saveSnapshot = function(makePublic) {
var dash = angular.copy($scope.dashboard); var dash = angular.copy($scope.dashboard);
// change title
dash.title = $scope.snapshot.name; dash.title = $scope.snapshot.name;
// make relative times absolute
dash.time = timeSrv.timeRange();
// remove panel queries & links
dash.forEachPanel(function(panel) { dash.forEachPanel(function(panel) {
panel.targets = []; panel.targets = [];
panel.links = []; panel.links = [];

16
src/css/less/gfbox.less
View File

@ -97,20 +97,4 @@
} }
} }
.share-snapshot {
text-align: center;
.share-snapshot-header {
.fa {
position: absolute;
font-size: 600%;
left: 41%;
color: @grafanaTargetFuncBackground;
z-index: -1;
}
position: relative;
z-index: 1000;
line-height: 106px;
}
}

27
src/css/less/grafana.less
View File

@ -294,3 +294,30 @@
} }
} }
} }
.share-snapshot {
text-align: center;
.share-snapshot-header {
.fa {
position: absolute;
font-size: 600%;
left: 42%;
color: @grafanaTargetFuncBackground;
z-index: -1;
}
position: relative;
z-index: 1000;
line-height: 106px;
margin: 45px 0 22px 0;
}
.share-snapshot-link {
max-width: 716px;
white-space: nowrap;
overflow: hidden;
display: block;
text-overflow: ellipsis;
}
}