From fb1a6534dcbf127a9dd53ba12cfa897d3db209a0 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Tue, 28 Jul 2009 22:53:33 +0000
Subject: [PATCH] Give the stats page some consideration.
---
.../java/src/net/i2p/router/web/OldConsoleHelper.java | 4 ++--
apps/routerconsole/jsp/oldstats.jsp | 2 +-
installer/resources/themes/console/light/console.css | 2 +-
router/java/src/net/i2p/router/JobQueue.java | 3 +--
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
router/java/src/net/i2p/router/admin/StatsGenerator.java | 6 +++---
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java
index 6237183abf..5216c3d583 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java
@@ -22,7 +22,7 @@ public class OldConsoleHelper extends HelperBase {
return baos.toString();
}
} catch (IOException ioe) {
- return "<b>Error rending the console</b>";
+ return "<b>Error displaying the console.</b>";
}
}
@@ -38,7 +38,7 @@ public class OldConsoleHelper extends HelperBase {
return baos.toString();
}
} catch (IOException ioe) {
- return "<b>Error rending the console</b>";
+ return "<b>Error displaying the console.</b>";
}
}
}
diff --git a/apps/routerconsole/jsp/oldstats.jsp b/apps/routerconsole/jsp/oldstats.jsp
index 1ea280f4e5..e17fa0ba8b 100644
--- a/apps/routerconsole/jsp/oldstats.jsp
+++ b/apps/routerconsole/jsp/oldstats.jsp
@@ -16,6 +16,6 @@
<div class="main" id="main">
<jsp:getProperty name="oldhelper" property="stats" />
</div>
-
+</div>
</body>
</html>
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 6834d10ff3..f7d457c2a2 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -621,7 +621,7 @@ form {}
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
text-align: justify;
- -moz-box-shadow: inset 0px 0px 0px 1px #9f9;
+ -moz-box-shadow: inset 0px 0px 1px 0px #002;
overflow-x: scroll;
}
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 43659a4d2f..557a47b918 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -607,8 +607,7 @@ public class JobQueue {
out.flush();
StringBuilder buf = new StringBuilder(32*1024);
- buf.append("<h2>JobQueue</h2>");
- buf.append("<b><div class=\"joblog\"># runners: ").append(numRunners).append(" [states=");
+ buf.append("<b><div class=\"joblog\"><h3>I2P JobQueue</h3># runners: ").append(numRunners).append(" [states=");
if (states != null)
for (int i = 0; i < states.length; i++)
buf.append(states[i]).append(" ");
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e2e14f7e95..a8f5f8e9f4 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 30;
+ public final static long BUILD = 31;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java
index 8da59a255e..ce7c316133 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java
@@ -29,7 +29,7 @@ public class StatsGenerator {
public void generateStatsPage(Writer out) throws IOException {
StringBuilder buf = new StringBuilder(16*1024);
- buf.append("<form action=\"/oldstats.jsp\">");
+ buf.append("<div class=\"joblog\"><form action=\"/oldstats.jsp\">");
buf.append("<select name=\"go\" onChange='location.href=this.value'>");
out.write(buf.toString());
buf.setLength(0);
@@ -66,11 +66,11 @@ public class StatsGenerator {
for (Iterator iter = groups.keySet().iterator(); iter.hasNext(); ) {
String group = (String)iter.next();
Set stats = (Set)groups.get(group);
- buf.append("<h2><a name=\"");
+ buf.append("<h3><a name=\"");
buf.append(group);
buf.append("\">");
buf.append(group);
- buf.append("</a></h2>");
+ buf.append("</a></h3>");
buf.append("<ul>");
out.write(buf.toString());
buf.setLength(0);
--
GitLab