From 3c76fda8d998d58c9627923e1b1d2651a61deaa5 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Sat, 25 Jul 2009 23:46:42 +0000
Subject: [PATCH] Ensure that both timed and event based graphs are suitably
div'd up.
---
.../java/src/net/i2p/router/web/GraphHelper.java | 8 ++++----
apps/routerconsole/jsp/graphs.jsp | 1 +
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index bf32732d7f..2ab03ed581 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -57,12 +57,12 @@ public class GraphHelper extends HelperBase {
}
if (hasTx && hasRx && !_showEvents) {
- _out.write("<div class=\"graphspanel\"><a href=\"viewstat.jsp?stat=bw.combined"
+ _out.write("<a href=\"viewstat.jsp?stat=bw.combined"
+ "&periodCount=" + (3 * _periodCount )
+ "&width=" + (3 * _width)
+ "&height=" + (3 * _height)
- + "\" />");
- _out.write("<img width=\""
+ + "\" / target=\"_blank\">");
+ _out.write("<img class=\"statimage\" width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat=bw.combined"
+ "&periodCount=" + _periodCount
@@ -82,7 +82,7 @@ public class GraphHelper extends HelperBase {
+ "&periodCount=" + (3 * _periodCount)
+ "&width=" + (3 * _width)
+ "&height=" + (3 * _height)
- + "\" />");
+ + "\" target=\"_blank\" />");
_out.write("<img class=\"statimage\" border=\"0\" width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat="
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index cccba56763..64277f0d00 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -10,6 +10,7 @@
<%@include file="summary.jsp" %>
<h1>I2P Performance Graphs</h1>
<div class="main" id="main">
+ <div class="graphspanel">
<jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
<jsp:setProperty name="graphHelper" property="*" />
<jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f74ab11db2..9a7f805ca0 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 = 25;
+ public final static long BUILD = 26;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
--
GitLab