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 106c666733..98cd1b71da 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
@@ -129,7 +129,7 @@ public class LogsHelper extends HelperBase {
return "" + _t("File not found") + ": " + f.getAbsolutePath() + "
";
} else {
str = str.replace("&", "&").replace("<", "<").replace(">", ">");
- return "" + _t("File location") + ": " + f.getAbsolutePath() + "
" + str + "
";
+ return "" + _t("File location") + ": " + f.getAbsolutePath() + "
\n" + str + " ";
}
}
@@ -144,10 +144,10 @@ public class LogsHelper extends HelperBase {
/** formats in reverse order */
private String formatMessages(List msgs) {
if (msgs.isEmpty())
- return "" + _t("No log messages") + " ";
+ return " |
" + _t("No log messages") + " ";
boolean colorize = _context.getBooleanPropertyDefaultTrue("routerconsole.logs.color");
StringBuilder buf = new StringBuilder(16*1024);
- buf.append(" |
");
for (int i = msgs.size() - 1; i >= 0; i--) {
String msg = msgs.get(i);
// don't display the dup message if it is last
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 483642c60b..3827cc5501 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -10,9 +10,12 @@
<%@include file="summary.jsi" %>
<%=intl._t("I2P Router Logs")%>
-
- <%=intl._t("I2P Version and Running Environment")%>
-
+
+
+
+ |
+<%=intl._t("Please include this information in bug reports")%>.
+<%=intl._t("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>
<% /* note to translators - both parameters are URLs */
%><%=intl._t("Please report bugs on {0} or {1}.",
"trac.i2p2.i2p",
@@ -20,32 +23,53 @@
- <%=intl._t("Please include this information in bug reports")%>:
-
-I2P version: <%=net.i2p.router.RouterVersion.FULL_VERSION%>
-Java version: <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)
+ |
+
+
+ <%=intl._t("I2P Version and Running Environment")%>
+
+| I2P version: | <%=net.i2p.router.RouterVersion.FULL_VERSION%> |
+| Java version: | <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>) |
" />
-Wrapper version: <%=System.getProperty("wrapper.version", "none")%>
-Server version:
-Servlet version: <%=getServletInfo()%>
-JSTL version:
-Platform: <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%>
-Processor: <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)
-Jbigi: <%=net.i2p.util.NativeBigInteger.loadStatus()%>
-Jbigi version: <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%>
-GMP version: <%=net.i2p.util.NativeBigInteger.getLibGMPVersion()%>
-Encoding: <%=System.getProperty("file.encoding")%>
-Charset: <%=java.nio.charset.Charset.defaultCharset().name()%>
-
-<%=intl._t("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>
-<%=intl._t("Critical Logs")%>
+| Wrapper version: | <%=System.getProperty("wrapper.version", "none")%> |
+| Server version: | |
+| Servlet version: | <%=getServletInfo()%> |
+| JSTL version: | |
+| Platform: | <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%> |
+| Processor: | <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>) |
+| Jbigi: | <%=net.i2p.util.NativeBigInteger.loadStatus()%> |
+| Jbigi version: | <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%> |
+| GMP version: | <%=net.i2p.util.NativeBigInteger.getLibGMPVersion()%> |
+| Encoding: | <%=System.getProperty("file.encoding")%> |
+| Charset: | <%=java.nio.charset.Charset.defaultCharset().name()%> |
+
+ <%=intl._t("Critical Logs")%>
+
+
+
+
+
-<%=intl._t("Event Logs")%>
+ |
+
+
+ <%=intl._t("Event Logs")%>
+
+
+ <%=intl._t("Service (Wrapper) Logs")%>
+ |