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

ux: dashboard nav and settings tweaks

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-01-16 14:41:08 +01:00
parent 11ba8070b8
commit 307b419f7c
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/dashboard/dashnav/dashnav.ts
View File

@ -35,8 +35,7 @@ export class DashNavCtrl {
let search = this.$location.search(); let search = this.$location.search();
if (search.editview) { if (search.editview) {
delete search.editview; delete search.editview;
} } else if (search.fullscreen) {
if (search.fullscreen) {
delete search.fullscreen; delete search.fullscreen;
delete search.edit; delete search.edit;
} }

4
public/app/features/dashboard/settings/settings.html
View File

@ -10,11 +10,13 @@
</a> </a>
<div class="dashboard-settings__aside-actions"> <div class="dashboard-settings__aside-actions">
<button class="btn btn-success" ng-click="ctrl.saveDashboard()" ng-show="ctrl.canSave">
<i class="fa fa-save"></i> Save
</button>
<button class="btn btn-inverse" ng-click="ctrl.openSaveAsModal()" ng-show="ctrl.canSaveAs"> <button class="btn btn-inverse" ng-click="ctrl.openSaveAsModal()" ng-show="ctrl.canSaveAs">
<i class="fa fa-copy"></i> <i class="fa fa-copy"></i>
Save As... Save As...
</button> </button>
<button class="btn btn-danger" ng-click="ctrl.deleteDashboard()" ng-show="ctrl.canDelete"> <button class="btn btn-danger" ng-click="ctrl.deleteDashboard()" ng-show="ctrl.canDelete">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>
Delete Delete

6
public/app/features/dashboard/settings/settings.ts
View File

@ -11,6 +11,7 @@ export class SettingsCtrl {
json: string; json: string;
alertCount: number; alertCount: number;
canSaveAs: boolean; canSaveAs: boolean;
canSave: boolean;
canDelete: boolean; canDelete: boolean;
sections: any[]; sections: any[];
@ -26,6 +27,7 @@ export class SettingsCtrl {
}); });
this.canSaveAs = contextSrv.isEditor; this.canSaveAs = contextSrv.isEditor;
this.canSave = this.dashboard.meta.canSave;
this.canDelete = this.dashboard.meta.canSave; this.canDelete = this.dashboard.meta.canSave;
this.buildSectionList(); this.buildSectionList();
@ -117,6 +119,10 @@ export class SettingsCtrl {
this.dashboardSrv.showSaveAsModal(); this.dashboardSrv.showSaveAsModal();
} }
saveDashboard() {
this.dashboardSrv.saveDashboard();
}
hideSettings() { hideSettings() {
var urlParams = this.$location.search(); var urlParams = this.$location.search();
delete urlParams.editview; delete urlParams.editview;

3
public/sass/components/_navbar.scss
View File

@ -25,6 +25,7 @@
.navbar-button--add-panel, .navbar-button--add-panel,
.navbar-button--star, .navbar-button--star,
.navbar-button--save,
.navbar-button--share, .navbar-button--share,
.navbar-button--settings, .navbar-button--settings,
.navbar-page-btn .fa-caret-down, .navbar-page-btn .fa-caret-down,
@ -44,8 +45,6 @@
.navbar-button--add-panel, .navbar-button--add-panel,
.navbar-button--star, .navbar-button--star,
.navbar-button--save,
.navbar-button--settings,
.navbar-page-btn .fa-caret-down { .navbar-page-btn .fa-caret-down {
display: none; display: none;
} }

7
public/sass/pages/_dashboard.scss
View File

@ -2,7 +2,6 @@
padding: $dashboard-padding; padding: $dashboard-padding;
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
// background: $dashboard-gradient;
} }
.template-variable { .template-variable {
@ -159,7 +158,7 @@ div.flot-text {
display: block; display: block;
@include panel-corner-color(lighten($panel-bg, 4%)); @include panel-corner-color(lighten($panel-bg, 4%));
.fa:before { .fa:before {
content: "\f129"; content: '\f129';
} }
} }
@ -170,7 +169,7 @@ div.flot-text {
left: -5px; left: -5px;
} }
.fa:before { .fa:before {
content: "\f08e"; content: '\f08e';
} }
} }
@ -179,7 +178,7 @@ div.flot-text {
color: $text-color; color: $text-color;
@include panel-corner-color($popover-error-bg); @include panel-corner-color($popover-error-bg);
.fa:before { .fa:before {
content: "\f12a"; content: '\f12a';
} }
} }
} }