From d6572fd0273c146febe9f304bb28243954dabc89 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 10 Jul 2012 21:07:36 +0000
Subject: [PATCH] Give update status section a heading to draw attention to it,
display total size
---
.../src/net/i2p/router/web/SummaryBarRenderer.java | 9 ++++++++-
.../java/src/net/i2p/router/web/UpdateHandler.java | 11 +++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
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 4fe774d0af..fb4ad5a641 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 c7a1f695f6..bc2cb2c161 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) {
--
GitLab