diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 4fe774d0afbdc3f6d3ae5a7f12fc7b16f4862c42..fb4ad5a641c40f035f6cabc211df9c055f51c4d5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -328,8 +328,15 @@ public class SummaryBarRenderer { public String renderUpdateStatusHTML() { if (_helper == null) return ""; + String updateStatus = _helper.getUpdateStatus(); + if ("".equals(updateStatus)) return ""; StringBuilder buf = new StringBuilder(512); - buf.append(_helper.getUpdateStatus()); + buf.append("<h3><a href=\"/configupdate\" target=\"_top\" title=\"") + .append(_("Configure I2P Updates")) + .append("\">") + .append(_("I2P Update")) + .append("</a></h3><hr class=\"b\">\n"); + buf.append(updateStatus); return buf.toString(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java index c7a1f695f65eab4273c86286f2422f45cc744ca2..bc2cb2c1611206c4084c0a3d402f6de54b8fb3d8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java @@ -237,14 +237,17 @@ public class UpdateHandler { if (_isPartial) return; StringBuilder buf = new StringBuilder(64); - buf.append("<b>").append(_("Updating")).append("</b> "); + buf.append("<b>").append(_("Updating")).append(":</b><br>\n"); double pct = ((double)alreadyTransferred + (double)currentWrite) / ((double)alreadyTransferred + (double)currentWrite + bytesRemaining); synchronized (_pct) { - buf.append(_pct.format(pct)); + buf.append(_("{0} downloaded", _pct.format(pct))); } - buf.append(":<br>\n"); - buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred))); + buf.append("<br>\n"); + buf.append(DataHelper.formatSize2(currentWrite + alreadyTransferred)) + .append("B / ") + .append(DataHelper.formatSize2(currentWrite + alreadyTransferred + bytesRemaining)) + .append("B"); updateStatus(buf.toString()); } public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {