From 33229a31ee03d1a3f711df49ca16313d9d5ea853 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 18 Apr 2016 05:46:58 +0000
Subject: [PATCH] Use tables for /logs

---
 .../src/net/i2p/router/web/LogsHelper.java    |  6 +-
 apps/routerconsole/jsp/logs.jsp               | 74 ++++++++++++-------
 2 files changed, 52 insertions(+), 28 deletions(-)
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 106c66673..98cd1b71d 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 "<p>" + _t("File not found") + ": <b><code>" + f.getAbsolutePath() + "</code></b></p>";
         } else {
             str = str.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
-            return "<p>" + _t("File location") + ": <b><code>" + f.getAbsolutePath() + "</code></b></p><pre>" + str + "</pre>";
+            return "<p>" + _t("File location") + ": <b><code>" + f.getAbsolutePath() + "</code></b></p></td></tr>\n<tr><td><pre>" + str + "</pre>";
         }
     }
     
@@ -144,10 +144,10 @@ public class LogsHelper extends HelperBase {
     /** formats in reverse order */
     private String formatMessages(List<String> msgs) {
         if (msgs.isEmpty())
-            return "<p><i>" + _t("No log messages") + "</i></p>";
+            return "</td></tr><tr><td><p><i>" + _t("No log messages") + "</i></p>";
         boolean colorize = _context.getBooleanPropertyDefaultTrue("routerconsole.logs.color");
         StringBuilder buf = new StringBuilder(16*1024); 
-        buf.append("<ul>");
+        buf.append("</td></tr><tr><td><ul>");
         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 483642c60..3827cc550 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -10,9 +10,12 @@
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <h1><%=intl._t("I2P Router Logs")%></h1>
-<div class="main" id="main">
-<div class="joblog"><h3><%=intl._t("I2P Version and Running Environment")%></h3><a name="version"> </a>
-<p>
+<div class="main" id="logs">
+
+<table id="bugreports"><tbody>
+  <tr><td class="infohelp">
+<%=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}.",
           "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
@@ -20,32 +23,53 @@
 <!--
 <%=intl._t("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
 -->
-<p><i><%=intl._t("Please include this information in bug reports")%>:</i>
- <p>
-<b>I2P version:</b> <%=net.i2p.router.RouterVersion.FULL_VERSION%><br>
-<b>Java version:</b> <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)<br>
+  </td></tr>
+</tbody></table>
+
+<h3 class="tabletitle"><%=intl._t("I2P Version and Running Environment")%></h3><a name="version"> </a>
+<table id="enviro"><tbody>
+<tr><td><b>I2P version:</b></td><td><%=net.i2p.router.RouterVersion.FULL_VERSION%></td></tr>
+<tr><td><b>Java version:</b></td><td><%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)</td></tr>
  <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" />
  <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
 <jsp:getProperty name="logsHelper" property="unavailableCrypto" />
-<b>Wrapper version:</b> <%=System.getProperty("wrapper.version", "none")%><br>
-<b>Server version:</b> <jsp:getProperty name="logsHelper" property="jettyVersion" /><br>
-<b>Servlet version:</b> <%=getServletInfo()%><br>
-<b>JSTL version:</b> <jsp:getProperty name="logsHelper" property="jstlVersion" /><br>
-<b>Platform:</b> <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br>
-<b>Processor:</b> <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br>
-<b>Jbigi:</b> <%=net.i2p.util.NativeBigInteger.loadStatus()%><br>
-<b>Jbigi version:</b> <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%><br>
-<b>GMP version:</b> <%=net.i2p.util.NativeBigInteger.getLibGMPVersion()%><br>
-<b>Encoding:</b> <%=System.getProperty("file.encoding")%><br>
-<b>Charset:</b> <%=java.nio.charset.Charset.defaultCharset().name()%><br>
-</p>
-<p><%=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.")%></p>
-<h3><%=intl._t("Critical Logs")%></h3><a name="criticallogs"> </a>
+<tr><td><b>Wrapper version:</b></td><td><%=System.getProperty("wrapper.version", "none")%></td></tr>
+<tr><td><b>Server version:</b></td><td><jsp:getProperty name="logsHelper" property="jettyVersion" /></td></tr>
+<tr><td><b>Servlet version:</b></td><td><%=getServletInfo()%></td></tr>
+<tr><td><b>JSTL version:</b></td><td><jsp:getProperty name="logsHelper" property="jstlVersion" /></td></tr>
+<tr><td><b>Platform:</b></td><td><%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%></td></tr>
+<tr><td><b>Processor:</b></td><td><%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)</td></tr>
+<tr><td><b>Jbigi:</b></td><td><%=net.i2p.util.NativeBigInteger.loadStatus()%></td></tr>
+<tr><td><b>Jbigi version:</b></td><td><%=net.i2p.util.NativeBigInteger.getJbigiVersion()%></td></tr>
+<tr><td><b>GMP version:</b></td><td><%=net.i2p.util.NativeBigInteger.getLibGMPVersion()%></td></tr>
+<tr><td><b>Encoding:</b></td><td><%=System.getProperty("file.encoding")%></td></tr>
+<tr><td><b>Charset:</b></td><td><%=java.nio.charset.Charset.defaultCharset().name()%></td></tr></tbody></table>
+
+<h3 class="tabletitle"><%=intl._t("Critical Logs")%></h3><a name="criticallogs"> </a>
+<table id="criticallogs" class="logtable"><tbody>
+<tr><td>
  <jsp:getProperty name="logsHelper" property="criticalLogs" />
-<h3><%=intl._t("Router Logs")%> (<a href="configlogging"><%=intl._t("configure")%></a>)</h3>
+</td></tr>
+</tbody></table>
+
+<h3 class="tabletitle"><%=intl._t("Router Logs")%> (<a href="configlogging"><%=intl._t("configure")%></a>)</h3>
+<table id="routerlogs" class="logtable"><tbody>
+<tr><td>
  <jsp:getProperty name="logsHelper" property="logs" />
-<h3><%=intl._t("Event Logs")%></h3>
+</td></tr>
+</tbody></table>
+
+<h3 class="tabletitle"><%=intl._t("Event Logs")%></h3>
+<table id="eventlogs" class="logtable"><tbody>
+<tr><td>
  <a href="events"><%=intl._t("View event logs")%></a>
-<h3><%=intl._t("Service (Wrapper) Logs")%></h3><a name="servicelogs"> </a>
+</td></tr>
+</tbody></table>
+
+<h3 class="tabletitle"><%=intl._t("Service (Wrapper) Logs")%></h3><a name="servicelogs"> </a>
+<table id="wrapperlogs" class="logtable"><tbody>
+<tr><td>
  <jsp:getProperty name="logsHelper" property="serviceLogs" />
-</div></div></body></html>
+</td></tr>
+</tbody></table>
+</div></body></html>

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()%>