Commit 96ad3a04 by Torkel Ödegaard

Removed 'Back to dashboard' top nav button, now have close button on the edit box below panel

parent 43ba5842
...@@ -53,6 +53,7 @@ function (angular, _, moment) { ...@@ -53,6 +53,7 @@ function (angular, _, moment) {
$scope.dashboardTitleAction = function() { $scope.dashboardTitleAction = function() {
$scope.appEvent('hide-dash-editor'); $scope.appEvent('hide-dash-editor');
$scope.exitFullscreen();
}; };
$scope.saveDashboard = function(options) { $scope.saveDashboard = function(options) {
......
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
<div ng-repeat="tab in panelMeta.editorTabs" data-title="{{tab.title}}"> <div ng-repeat="tab in panelMeta.editorTabs" data-title="{{tab.title}}">
</div> </div>
</div> </div>
<button class="gf-box-header-close-btn" ng-click="exitFullscreen();">
<i class="fa fa-remove"></i>
</button>
</div> </div>
<div class="gf-box-body"> <div class="gf-box-body">
......
...@@ -62,17 +62,10 @@ ...@@ -62,17 +62,10 @@
</ul> </ul>
<ul class="nav pull-right"> <ul class="nav pull-right">
<li ng-show="dashboardViewState.fullscreen">
<a ng-click="exitFullscreen()">
Back to dashboard
</a>
</li>
<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"> <li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable">
<grafana-simple-panel type="pulldown.type" ng-cloak> <grafana-simple-panel type="pulldown.type" ng-cloak>
</grafana-simple-panel> </grafana-simple-panel>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
......
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