diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css index 1686f5223..50a41c7af 100644 --- a/deluge/ui/web/css/deluge.css +++ b/deluge/ui/web/css/deluge.css @@ -33,7 +33,8 @@ html, body { /* Torrent Details */ .deluge-status-progressbar { - margin: 5px; + /*margin: 5px;*/ + text-align: center; } .deluge-status { diff --git a/deluge/ui/web/js/deluge-torrents.js b/deluge/ui/web/js/deluge-torrents.js index 2ae864b5a..28cfc10d6 100644 --- a/deluge/ui/web/js/deluge-torrents.js +++ b/deluge/ui/web/js/deluge-torrents.js @@ -29,8 +29,23 @@ function name(value, p, r) { return String.format('
{1}
', r.data['state'].toLowerCase(), value); } +var tpl = '
' + + '
' + + '
' + + '
' + + '
 
' + + '
' + + '
' + + '
' + + '
{1} {0}%
' + + '
' + + '
' + + '
'; + function progress(value, p, r) { - return String.format('
{1} {0}%
', value.toFixed(2), r.data['state']); + var width = p['style'].match(/width:\s*(\d+)px/)[1].toInt() + var progress = value.toInt(); + return String.format(tpl, value.toFixed(2), r.data['state'], progress); } function seeds(value, p, r) { @@ -88,7 +103,7 @@ Deluge.Torrents.Grid = new Ext.grid.GridPanel({ {id:'queue',header: "#", width: 30, sortable: true, renderer: queue, dataIndex: 'queue'}, {id:'name', header: "Name", width: 150, sortable: true, renderer: name, dataIndex: 'name'}, {header: "Size", width: 75, sortable: true, renderer: Deluge.Formatters.size, dataIndex: 'size'}, - {header: "Progress", width: 125, sortable: true, renderer: progress, dataIndex: 'progress'}, + {header: "Progress", width: 150, sortable: true, renderer: progress, dataIndex: 'progress'}, {header: "Seeds", width: 60, sortable: true, renderer: seeds, dataIndex: 'seeds'}, {header: "Peers", width: 60, sortable: true, renderer: peers, dataIndex: 'peers'}, {header: "Down Speed", width: 80, sortable: true, renderer: Deluge.Formatters.speed, dataIndex: 'downspeed'},