root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 25 Packages Projects Releases Wiki Activity

fix(timepicker): fixed for viewing auto refresh submenu when timpicker selection is set to Today, fixes #2552

This commit is contained in:
Torkel Ödegaard 2015-08-19 13:25:20 +02:00
parent 5768762591
commit aa21bfd8a8
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/panels/timepicker/module.html
View File

@ -27,15 +27,16 @@
<i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu">
<!-- lacy load this -->
<ul class="dropdown-menu" ng-if="time_options" >
<li bindonce ng-repeat='option in time_options'>
<a ng-click="setRelativeFilter(option)" bo-text="option.text"></a>
</li>
<!-- Auto refresh submenu -->
<li class="dropdown-submenu">
<li class="dropdown-submenu">
<a href="#">Auto-Refresh</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu" ng-class="{'dropdown-submenu-left': refreshMenuLeftSide}">
<li>
<a ng-click="timeSrv.set_interval(false)">Off</a>
</li>

2
public/app/panels/timepicker/module.js
View File

@ -86,6 +86,8 @@ function (angular, app, _, moment, kbn) {
}
return option;
});
$scope.refreshMenuLeftSide = $scope.time.rangeString.length < 10;
};
$scope.customTime = function() {

10
public/css/less/overrides.less
View File

@ -583,11 +583,19 @@ code, pre {
}
.dropdown-menu {
min-width: 140px;
> li > a {
padding: 3px 10px;
padding: 3px 20px 3px 15px;
i {
padding-right: 5px;
color: @linkColorDisabled;
}
}
}
.dropdown-submenu>.dropdown-menu.dropdown-submenu-left {
left: auto;
right: 100%;
margin-left: 0;
margin-right: -1px;
}