diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-21 22:26:01 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-21 22:26:01 +0100 |
| commit | ae3b6db296f8715c3faa5e5a6def747c85867164 (patch) | |
| tree | e738c047301f556de5571eea85f56b929994e204 /module | |
| parent | subline for global progress (diff) | |
| download | pyload-ae3b6db296f8715c3faa5e5a6def747c85867164.tar.xz | |
different server attributes in header
Diffstat (limited to 'module')
| -rw-r--r-- | module/web/static/js/views/headerView.js | 3 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/module/web/static/js/views/headerView.js b/module/web/static/js/views/headerView.js index 7705b7076..9e18734d4 100644 --- a/module/web/static/js/views/headerView.js +++ b/module/web/static/js/views/headerView.js @@ -76,7 +76,7 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ServerStatus', 'colle shadowSize: 0, color: "#fee247" }, - xaxis: { ticks: [], mode: "time" }, + xaxis: { ticks: [] }, yaxis: { ticks: [], min: 1, autoscaleMargin: 0.1, tickFormatter: function(data) { return formatSize(data * 1024); }, position: "right" }, @@ -98,6 +98,7 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ServerStatus', 'colle // queue/processing size? var status = this.status.toJSON(); + status.maxspeed = _.max(this.speeds, function(speed) {return speed[1];})[1] * 1024; this.$('.status-block').html( this.templateStatus(status) ); diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 386cb4aa2..3d929fdc1 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -68,9 +68,9 @@ </div>
</script>
<script type="text/template" id="template-header-status">
- <span class="pull-right"><% linksqueue %></span><br>
- <span class="pull-right remeaning"><% formatSize sizequeue %></span><br>
- <span class="pull-right eta"><% formatTime eta %></span>
+ <span class="pull-right maxspeed"><% formatSize maxspeed %>/s</span><br>
+ <span class="pull-right running"><% paused %></span><br>
+ <span class="pull-right reconnect"><% reconnect %></span>
</script>
<script type="text/template" id="template-header-progress">
@@ -134,9 +134,9 @@ <div class="header_block right-border status-block">
</div>
<div class="header_block left-border">
- <i class="icon-download-alt icon-white"></i> Downloads:<br>
- <i class=" icon-hdd icon-white"></i> Remaining:<br>
- <i class="icon-time icon-white"></i> approx. ETA :<br>
+ <i class="icon-download-alt icon-white"></i> Max. Speed:<br>
+ <i class=" icon-off icon-white"></i> Running:<br>
+ <i class="icon-refresh icon-white"></i> Reconnect:<br>
</div>
<div id="progress-area">
|