From 6470f2d9838d40d87661673a89183346e985cfe3 Mon Sep 17 00:00:00 2001 From: str4d <str4d@mail.i2p> Date: Sun, 1 May 2016 01:10:04 +0000 Subject: [PATCH] Wrap /profiles and /viewprofile info in tables for theming --- .../net/i2p/router/web/ProfileOrganizerRenderer.java | 11 +++++++---- apps/routerconsole/jsp/viewprofile.jsp | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) 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 c81c64a285..5414ea7a8b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -259,21 +259,24 @@ class ProfileOrganizerRenderer { } if (mode < 2) { - buf.append("<h3>").append(_t("Thresholds")).append("</h3>"); + buf.append("<h3 class=\"tabletitle\">").append(_t("Thresholds")).append("</h3>\n") + .append("<table id=\"thresholds\"><tbody><tr><td>"); buf.append("<p><b>").append(_t("Speed")).append(":</b> ").append(num(_organizer.getSpeedThreshold())) .append(" (").append(fast).append(' ').append(_t("fast peers")).append(")<br>"); buf.append("<b>").append(_t("Capacity")).append(":</b> ").append(num(_organizer.getCapacityThreshold())) .append(" (").append(reliable).append(' ').append(_t("high capacity peers")).append(")<br>"); buf.append("<b>").append(_t("Integration")).append(":</b> ").append(num(_organizer.getIntegrationThreshold())) - .append(" (").append(integrated).append(' ').append(_t(" well integrated peers")).append(")</p>"); - buf.append("<h3>").append(_t("Definitions")).append("</h3><ul>"); + .append(" (").append(integrated).append(' ').append(_t(" well integrated peers")).append(")") + .append("</td></tr></tbody></table>\n"); + buf.append("<h3 class=\"tabletitle\">").append(_t("Definitions")).append("</h3>\n") + .append("<table id=\"profile_defs\"><tbody><tr><td><ul>"); buf.append("<li><b>").append(_t("groups")).append("</b>: ").append(_t("as determined by the profile organizer")).append("</li>"); buf.append("<li><b>").append(_t("caps")).append("</b>: ").append(_t("capabilities in the netDb, not used to determine profiles")).append("</li>"); buf.append("<li><b>").append(_t("speed")).append("</b>: ").append(_t("peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel")).append("</li>"); buf.append("<li><b>").append(_t("capacity")).append("</b>: ").append(_t("how many tunnels can we ask them to join in an hour?")).append("</li>"); buf.append("<li><b>").append(_t("integration")).append("</b>: ").append(_t("how many new peers have they told us about lately?")).append("</li>"); buf.append("<li><b>").append(_t("status")).append("</b>: ").append(_t("is the peer banned, or unreachable, or failing tunnel tests?")).append("</li>"); - buf.append("</ul>"); + buf.append("</ul></td></tr></tbody></table>\n"); //// //// don't bother reindenting diff --git a/apps/routerconsole/jsp/viewprofile.jsp b/apps/routerconsole/jsp/viewprofile.jsp index 693d003501..c879474e7d 100644 --- a/apps/routerconsole/jsp/viewprofile.jsp +++ b/apps/routerconsole/jsp/viewprofile.jsp @@ -25,9 +25,9 @@ <jsp:setProperty name="stathelper" property="peer" value="<%=peerB64%>" /> <% stathelper.storeWriter(out); %> <h2><%=intl._t("Profile for peer {0}", peerB64)%></h2> -<pre> +<table id="viewprofile"><tbody><tr><td><pre> <jsp:getProperty name="stathelper" property="profile" /> -</pre> +</pre></td></tr></tbody></table> <% } %> -- GitLab