From a975dc442702baf7d91c83d2eff9827e3003eb4a Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Mon, 23 Mar 2015 15:47:33 +0000 Subject: [PATCH] Summary bar: linkify news headings, remove 'show news' link --- .../src/net/i2p/router/web/SummaryBarRenderer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 4c14ec66d7..f3edb40729 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -607,6 +607,7 @@ public class SummaryBarRenderer { if (newsContent != "") { buf.append("<ul>\n"); // Parse news content for headings. + boolean foundEntry = false; int start = newsContent.indexOf("<h3>"); while (start >= 0) { // Add offset to start: @@ -622,16 +623,19 @@ public class SummaryBarRenderer { int end = newsContent.indexOf("</h3>"); if (end >= 0) { String heading = newsContent.substring(0, end); - buf.append("<li>") + buf.append("<li><a href=\"/?news=1&consoleNonce=") + .append(consoleNonce) + .append("\">") .append(heading) - .append("</li>\n"); + .append("</a></li>\n"); + foundEntry = true; } start = newsContent.indexOf("<h3>"); } buf.append("</ul>\n"); // Set up string containing <a> to show news. String requestURI = _helper.getRequestURI(); - if (requestURI.contains("/home")) { + if (requestURI.contains("/home") && !foundEntry) { buf.append("<a href=\"/?news=1&consoleNonce=") .append(consoleNonce) .append("\">") -- GitLab