diff options
-rw-r--r-- | web/index.html | 11 | ||||
-rwxr-xr-x | web/netdata.js | 7 | ||||
-rw-r--r-- | web/theme.css | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/web/index.html b/web/index.html index 3b990184f9..1d596e3d30 100644 --- a/web/index.html +++ b/web/index.html @@ -85,11 +85,15 @@ <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="do not group points, show the raw data"> <input type="radio" name="group" id="group1" onChange="setMainChartGroup(1);">1 </label> - <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group in half, show 1 every 2 points of data"> <input type="radio" name="group" id="group2" onChange="setMainChartGroup(2);">2 </label> - + <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 3 points of data"> + <input type="radio" name="group" id="group3" onChange="setMainChartGroup(3);">3 + </label> + <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 4 points of data"> + <input type="radio" name="group" id="group4" onChange="setMainChartGroup(4);">4 + </label> <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 5 points of data"> <input type="radio" name="group" id="group5" onChange="setMainChartGroup(5);">5 </label> @@ -111,6 +115,9 @@ <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 60 points of data"> <input type="radio" name="group" id="group60" onChange="setMainChartGroup(60);">60 </label> + <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 90 points of data"> + <input type="radio" name="group" id="group90" onChange="setMainChartGroup(90);">90 + </label> </div> <div class="btn-group btn-group" data-toggle="tooltip" data-placement="top" title="maximized ( <span class='glyphicon glyphicon-fullscreen'></span> ) or normal ( <span class='glyphicon glyphicon-resize-small'></span> ) view of the graph" > <button type="button" class="btn btn-primary mainchart_max_button" data-maximized-text="<span class='glyphicon glyphicon-resize-small'></span>" data-normal-text="<span class='glyphicon glyphicon-fullscreen'></span>" onClick="setMainChartMax('toggle');"> diff --git a/web/netdata.js b/web/netdata.js index ec26ee953f..31124280d6 100755 --- a/web/netdata.js +++ b/web/netdata.js @@ -156,13 +156,16 @@ function calculateChartPointsToShow(c, divisor, maxtime, group, enable_curve) { else { c.group = Math.round(data_points / screen_points); - if(c.group > 45) c.group = 60; + if(c.group > 60) c.group = 90; + else if(c.group > 45) c.group = 60; else if(c.group > 30) c.group = 45; else if(c.group > 20) c.group = 30; else if(c.group > 15) c.group = 20; else if(c.group > 10) c.group = 15; else if(c.group > 5) c.group = 10; - else if(c.group > 2) c.group = 5; + else if(c.group > 4) c.group = 5; + else if(c.group > 3) c.group = 4; + else if(c.group > 2) c.group = 3; else if(c.group > 1) c.group = 2; else c.group = 1; diff --git a/web/theme.css b/web/theme.css index 64632b6df2..02525336b8 100644 --- a/web/theme.css +++ b/web/theme.css @@ -67,11 +67,11 @@ body { -moz-box-shadow: 0px 2px 2px 0px rgba(204, 204, 204, 0.6); -webkit-box-shadow: 0px 2px 2px 0px rgba(204, 204, 204, 0.6); position: absolute; - z-index: 1000; line-height: 90% !important; margin: 0 0 0 0 !important; padding: 0.5em 0.1em 0.5em 0.1em !important; width: 180px !important; + z-index: 1000 !important; } .google-visualization-tooltip-item-list { list-style-type: none; |