Put the small speed graph on top of the nav bar.

This commit is contained in:
Florent Viard 2014-06-09 04:35:04 +02:00
parent 238caa94be
commit 1b5f6af2c4
2 changed files with 21 additions and 19 deletions

View File

@ -230,6 +230,26 @@
<!-- {{{ nav side bar --> <!-- {{{ nav side bar -->
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<!-- {{{ global statistics -->
<ul class="nav nav-list" ng-if="enable.sidebar.stats">
<li class="nav-header" ng-show="totalAria2Downloads()">Global Statistics</li>
<li>
<div
yticks="3"
xticks="3"
dspeed="gstats.downloadSpeed"
uspeed="gstats.uploadSpeed"
dgraph ng-show="totalAria2Downloads()"
nolabel="true"
draw="true">
</div>
</li>
</ul>
<!-- }}} -->
<br>
<!-- {{{ download filters --> <!-- {{{ download filters -->
<ul id="filters" class="clearfix nav nav-list" ng-show="enable.sidebar.filters"> <ul id="filters" class="clearfix nav nav-list" ng-show="enable.sidebar.filters">
<li class="nav-header">Download Filters</li> <li class="nav-header">Download Filters</li>
@ -290,24 +310,6 @@
<br> <br>
<!-- {{{ global statistics -->
<ul class="nav nav-list" ng-if="enable.sidebar.stats">
<li class="nav-header" ng-show="totalAria2Downloads()">Global Statistics</li>
<li>
<div
yticks="3"
xticks="3"
dspeed="gstats.downloadSpeed"
uspeed="gstats.uploadSpeed"
dgraph ng-show="totalAria2Downloads()"
nolabel="true"
draw="true">
</div>
</li>
</ul>
<!-- }}} -->
<br>
<!-- {{{ starred properties --> <!-- {{{ starred properties -->
<ul class="clearfix nav nav-list" ng-controller="StarredPropsCtrl" ng-show="properties.length && enable.sidebar.starredProps"> <ul class="clearfix nav nav-list" ng-controller="StarredPropsCtrl" ng-show="properties.length && enable.sidebar.starredProps">

View File

@ -4,7 +4,7 @@
angular angular
.module('webui.directives.dgraph', ['webui.filters.bytes', 'webui.services.deps']) .module('webui.directives.dgraph', ['webui.filters.bytes', 'webui.services.deps'])
.directive('dgraph', ['$', '$filter', '$parse', function($, filter, parse) { .directive('dgraph', ['$', '$filter', '$parse', function($, filter, parse) {
var ratio = 0.4; var ratio = 0.6;
var xfmt = "%H:%M:%S"; var xfmt = "%H:%M:%S";
var yTicks = 7; // Number of y-axis ticks (sans 0) var yTicks = 7; // Number of y-axis ticks (sans 0)
var xticks = 10; // Number of x-axis ticks (sans 0) var xticks = 10; // Number of x-axis ticks (sans 0)