From 0f91899aa9709f5afe5fc9da9997158a5fc23762 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 12 Mar 2011 16:11:10 +0000 Subject: [PATCH] * Console: Fix HTML errors in form message box, logs.jsp, netdb.jsp, profiles.jsp, stats.jsp --- .../java/src/net/i2p/router/web/FormHandler.java | 12 ++++++------ .../java/src/net/i2p/router/web/LogsHelper.java | 3 +-- .../java/src/net/i2p/router/web/NetDbRenderer.java | 9 ++++----- .../net/i2p/router/web/ProfileOrganizerRenderer.java | 3 +-- .../java/src/net/i2p/router/web/StatsGenerator.java | 3 ++- .../resources/themes/console/classic/console.css | 4 ++-- installer/resources/themes/console/dark/console.css | 4 ++-- installer/resources/themes/console/light/console.css | 4 ++-- .../resources/themes/console/midnight/console.css | 4 ++-- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index 9fa61080d9..2f16cd359b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -95,18 +95,18 @@ public class FormHandler { if (_errors.isEmpty() && _notices.isEmpty()) return ""; StringBuilder buf = new StringBuilder(512); - buf.append("

"); + buf.append("

"); if (!_errors.isEmpty()) { - buf.append(""); + buf.append("
"); buf.append(render(_errors)); - buf.append(""); + buf.append("
"); } if (!_notices.isEmpty()) { - buf.append(""); + buf.append("
"); buf.append(render(_notices)); - buf.append(""); + buf.append("
"); } - buf.append("

"); + buf.append("
"); return buf.toString(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java index 3ccd355c2d..f4c42a23bf 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -53,7 +53,6 @@ public class LogsHelper extends HelperBase { boolean colorize = Boolean.valueOf(_context.getProperty("routerconsole.logs.color")).booleanValue(); StringBuilder buf = new StringBuilder(16*1024); buf.append("\n"); + buf.append("\n"); return buf.toString(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 048e917874..0fda16b634 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -264,7 +264,7 @@ public class NetDbRenderer { buf.append("\n"); - } else { } - buf.append("\n"); + buf.append("
") .append(_("Network Database Router Statistics")) - .append("
"); + .append("
"); // versions table List versionList = new ArrayList(versions.objects()); if (!versionList.isEmpty()) { @@ -345,9 +345,9 @@ public class NetDbRenderer { } else { buf.append("" + _("Peer info for") + ": ").append(hash).append("\n"); if (full) { - buf.append("[Back]
\n"); + buf.append("[Back]
\n"); } else { - buf.append("[").append(_("Full entry")).append("]
\n"); + buf.append("[").append(_("Full entry")).append("]
\n"); } } @@ -393,9 +393,8 @@ public class NetDbRenderer { buf.append(DataHelper.stripHTML(key)).append(" = ").append(DataHelper.stripHTML(val)).append("
\n"); } buf.append("
\n"); } private static final int SSU = 1; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index f452df2ba8..3f4d28b8a0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -213,7 +213,6 @@ class ProfileOrganizerRenderer { buf.append("").append(DataHelper.stripHTML(info.getCapabilities())).append(""); else buf.append(" "); - buf.append(""); buf.append("").append(num(prof.getIntegrationValue())).append(""); long time; time = now - prof.getLastHeardAbout(); @@ -261,7 +260,7 @@ class ProfileOrganizerRenderer { buf.append("
  • ").append(_("capacity")).append(": ").append(_("how many tunnels can we ask them to join in an hour?")).append("
    • "); buf.append("
  • ").append(_("integration")).append(": ").append(_("how many new peers have they told us about lately?")).append("
    • "); buf.append("
  • ").append(_("status")).append(": ").append(_("is the peer banned, or unreachable, or failing tunnel tests?")).append("
    • "); - buf.append(""); + buf.append(""); out.write(buf.toString()); out.flush(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java index 20d7da9bf8..b5569962cf 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -93,6 +93,7 @@ public class StatsGenerator { } out.write("
    \n"); } + out.write(""); out.flush(); } @@ -167,7 +168,7 @@ public class StatsGenerator { buf.append("
  • "); renderPeriod(buf, periods[i], _("rate")); if (curRate.getLastEventCount() > 0) { - buf.append(_("Average")).append(": "); + buf.append(_("Average")).append(": "); buf.append(num(curRate.getAverageValue())); buf.append("; "); buf.append(_("Highest average")); diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 00a23c5f08..d7484ad14c 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -516,11 +516,11 @@ div.messages li, div.messages ul { margin: -10px 0 0 0; } -div.messages span.error { +div.error { color: #d00000; } -div.messages span.notice { +div.notice { font-style: italic; } diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index ecfc828ecc..b1af23e74b 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -421,11 +421,11 @@ div.messages { color: #4f4; } -div.messages span.error { +div.error { color: #d90; } -div.messages span.notice { +div.notice { font-style: italic; } diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 41990b4b2b..426086518d 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -508,11 +508,11 @@ div.messages { box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4); } -div.messages span.error { +div.error { color: #d00000; } -div.messages span.notice { +div.notice { font-style: italic; } diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index 2bb77952e4..def9fad6df 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -533,11 +533,11 @@ div.main li b{ font-size: 9.5pt; } -div.messages span.error { +div.error { color: #d00000; } -div.messages span.notice { +div.notice { font-style: italic; }