opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 04:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: refactoring hide time picker PR #9756

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-11-03 09:13:40 +01:00
parent 63c79f066a
commit bf82d166bc
4 changed files with 4 additions and 4 deletions
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>

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

@ -9,6 +9,6 @@
<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)'" <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)'"
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> <gf-form-switch class="gf-form" label="Hide time picker" checked="ctrl.panel.hidden" label-class="width-10"></gf-form-switch>
</div> </div>
</div> </div>

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

@ -1,4 +1,4 @@
<ul class="nav gf-timepicker-nav" ng-show="!ctrl.panel.disableTimePicker"> <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)'> <a ng-click='ctrl.move(-1)'>

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