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 remote-tracking branch 'origin/develop-icons' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-14 19:56:19 +01:00
parent 62e6fed5ce 764992df2a
commit 581257416e
60 changed files with 1357 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,10 @@ export class SettingsCtrl {
buildSectionList() {
this.sections = [];
if (this.dashboard.meta.canEdit) {
this.sections.push({ title: 'General', id: 'settings', icon: 'fa fa-fw fa-sliders' });
this.sections.push({ title: 'Annotations', id: 'annotations', icon: 'fa fa-fw fa-comment-o' });
this.sections.push({ title: 'Variables', id: 'templating', icon: 'fa fa-fw fa-dollar' });
this.sections.push({ title: 'Links', id: 'links', icon: 'fa fa-fw fa-external-link' });
this.sections.push({ title: 'General', id: 'settings', icon: 'gicon gicon-preferences' });
this.sections.push({ title: 'Annotations', id: 'annotations', icon: 'gicon gicon-annotation' });
this.sections.push({ title: 'Variables', id: 'templating', icon: 'gicon gicon-variable' });
this.sections.push({ title: 'Links', id: 'links', icon: 'gicon gicon-link' });
if (this.dashboard.id) {
this.sections.push({ title: 'Versions', id: 'versions', icon: 'fa fa-fw fa-history' });
@@ -51,7 +51,7 @@ export class SettingsCtrl {
this.viewId = 'make_editable';
}
this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'fa fa-fw fa-code' });
this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'gicon gicon-json' });
const params = this.$location.search();
const url = this.$location.path();