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

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

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-12-14 18:33:58 +01:00
parent 79d56f779d 280f9befae
commit 4cc06ad779
10 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/controllers/sidemenu_ctrl.js
View File

@@ -120,6 +120,7 @@ function (angular, _, $, coreModule, config) {
};
$scope.init = function() {
$scope.showSignout = contextSrv.isSignedIn && !config['authProxyEnabled'];
$scope.updateMenu();
$scope.$on('$routeChangeSuccess', $scope.updateMenu);
};

7
public/app/features/dashboard/partials/shareModal.html
View File

@@ -107,7 +107,7 @@
</script>
<script type="text/ng-template" id="shareSnapshot.html">
<div class="ng-cloak" ng-cloak ng-controller="ShareSnapshotCtrl">
<div class="ng-cloak" ng-cloak ng-controller="ShareSnapshotCtrl" ng-init="init()">
<div class="share-modal-big-icon">
<i ng-if="loading" class="fa fa-spinner fa-spin"></i>
<i ng-if="!loading" class="gf-icon gf-icon-snap-multi"></i>
@@ -175,10 +175,9 @@
<i class="fa fa-save"></i>
Local Snapshot
</button>
<button class="btn btn-primary btn-large" ng-click="createSnapshot(true)" ng-disabled="loading">
<button class="btn btn-primary btn-large" ng-if="externalEnabled" ng-click="createSnapshot(true)" ng-disabled="loading">
<i class="fa fa-cloud-upload"></i>
Publish to snapshot.raintank.io
{{sharingButtonText}}
</button>
</div>

9
public/app/features/dashboard/shareSnapshotCtrl.js
View File

@@ -29,7 +29,14 @@ function (angular, _) {
{text: 'Public on the web', value: 3},
];
$scope.externalUrl = '//snapshots-origin.raintank.io';
$scope.init = function() {
backendSrv.get('/api/snapshot/shared-options').then(function(options) {
$scope.externalUrl = options['externalSnapshotURL'];
$scope.sharingButtonText = options['externalSnapshotName'];
$scope.externalEnabled = options['externalEnabled'];
});
};
$scope.apiUrl = '/api/snapshots';
$scope.createSnapshot = function(external) {

5
public/app/partials/sidemenu.html
View File

@@ -60,8 +60,7 @@
<span class="sidemenu-item-text">Grafana admin</span>
</a>
</li>
<li ng-if="contextSrv.isSignedIn">
<li ng-if="showSignout">
<a href="logout" class="sidemenu-item" target="_self">
<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-out"></i></span>
<span class="sidemenu-item-text">Sign out</span>
@@ -83,7 +82,7 @@
<span class="sidemenu-item-text">Exit admin</span>
</a>
</li>
<li>
<li ng-if="showSignout">
<a href="logout" class="sidemenu-item" target="_self">
<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-out"></i></span>
<span class="sidemenu-item-text">Sign out</span>