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 'disable-timepicker'

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-11-03 09:14:00 +01:00
commit 72783785a8
4 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/dashnav/dashnav.html
View File

@ -85,7 +85,7 @@
Back to dashboard Back to dashboard
</a> </a>
</li> </li>
<li> <li ng-if="!ctrl.dashboard.timepicker.hidden">
<gf-time-picker dashboard="ctrl.dashboard"></gf-time-picker> <gf-time-picker dashboard="ctrl.dashboard"></gf-time-picker>
</li> </li>
</ul> </ul>

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

@ -1,15 +1,14 @@
<div class="editor-row"> <div class="editor-row">
<div class="gf-form-group"> <div class="gf-form-group">
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label width-10">Auto-refresh</span> <span class="gf-form-label width-10">Auto-refresh</span>
<input type="text" class="gf-form-input max-width-25" ng-model="ctrl.panel.refresh_intervals" array-join> <input type="text" class="gf-form-input max-width-25" ng-model="ctrl.panel.refresh_intervals" array-join>
</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="Hide time picker" checked="ctrl.panel.hidden" label-class="width-10"></gf-form-switch>
</div>
</div> </div>

14
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">
<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>

2
public/dashboards/home.json
View File

@ -68,7 +68,7 @@
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {
"enable": false, "hidden": true,
"refresh_intervals": [ "refresh_intervals": [
"5s", "5s",
"10s", "10s",