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 'develop' into develop-settings

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-08 14:32:15 +01:00
parent d7337432ac 63b717f607
commit 9369a87e93
152 changed files with 5429 additions and 1808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<div class="edit-tab-with-sidemenu">
<div class="edit-tab-with-sidemenu" ng-if="ctrl.viewId !== 'timepicker'">
<aside class="edit-sidemenu-aside">
<h2>
<i class="fa fa-cog"></i>
@@ -26,6 +26,9 @@
<div class="edit-tab-content" ng-if="ctrl.viewId === 'templating'">
annotations
</div>
</div>
<div ng-if="ctrl.viewId === 'timepicker'">
<gf-time-picker-dropdown dashboard="ctrl.dashboard"></gf-time-picker-dropdown>
</div>