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

option to hide Time picker, fixes #2013

Browse Source
This commit is contained in:
Patrick O'Carroll 2017-11-01 12:26:45 +01:00
parent 894951c7d4
commit 63c79f066a
2 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,9 @@
</div> </div>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label width-10">Now delay now-</span> <span class="gf-form-label width-10">Now delay now-</span>
<input type="text" class="gf-form-input max-width-25" <input type="text" class="gf-form-input max-width-25" ng-model="ctrl.panel.nowDelay" placeholder="0m" valid-time-span bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'"
ng-model="ctrl.panel.nowDelay" placeholder="0m"
valid-time-span
bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'"
data-placement="right"> data-placement="right">
</div> </div>
<gf-form-switch class="gf-form" label="Disable Time picker" checked="ctrl.panel.disableTimePicker" label-class="width-10"></gf-form-switch>
</div>
</div> </div>

16
public/app/features/dashboard/timepicker/timepicker.html
View File

@ -1,13 +1,18 @@
<ul class="nav gf-timepicker-nav"> <ul class="nav gf-timepicker-nav" ng-show="!ctrl.panel.disableTimePicker">
<li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time backward <br> (left arrow key)'" data-placement="bottom"> <li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time backward <br> (left arrow key)'" data-placement="bottom">
<a ng-click='ctrl.move(-1)'><i class="fa fa-chevron-left"></i></a> <a ng-click='ctrl.move(-1)'>
<i class="fa fa-chevron-left"></i>
</a>
</li> </li>
<li class="dashnav-zoom-out gf-timepicker-time-control" bs-tooltip="'Time range zoom out <br> CTRL+Z'" data-placement="bottom"> <li class="dashnav-zoom-out gf-timepicker-time-control" bs-tooltip="'Time range zoom out <br> CTRL+Z'" data-placement="bottom">
<a ng-click='ctrl.zoom(2)'>Zoom Out</a></li> <a ng-click='ctrl.zoom(2)'>Zoom Out</a>
</li>
</li> </li>
<li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time forward <br> (right arrow key)'" data-placement="bottom"> <li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time forward <br> (right arrow key)'" data-placement="bottom">
<a ng-click='ctrl.move(1)'><i class="fa fa-chevron-right"></i></a> <a ng-click='ctrl.move(1)'>
<i class="fa fa-chevron-right"></i>
</a>
</li> </li>
<li> <li>
@ -19,8 +24,7 @@
</span> </span>
<span ng-show="ctrl.dashboard.refresh" class="text-warning"> <span ng-show="ctrl.dashboard.refresh" class="text-warning">
&nbsp; &nbsp; Refresh every {{ctrl.dashboard.refresh}}
Refresh every {{ctrl.dashboard.refresh}}
</span> </span>
</a> </a>
</li> </li>