Ensure that both timed and event based graphs are suitably div'd up.

This commit is contained in:
z3d
2009-07-25 23:46:42 +00:00
parent c5555350ae
commit 3c76fda8d9
3 changed files with 6 additions and 5 deletions

View File

@ -57,12 +57,12 @@ public class GraphHelper extends HelperBase {
} }
if (hasTx && hasRx && !_showEvents) { 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"
+ "&amp;periodCount=" + (3 * _periodCount ) + "&amp;periodCount=" + (3 * _periodCount )
+ "&amp;width=" + (3 * _width) + "&amp;width=" + (3 * _width)
+ "&amp;height=" + (3 * _height) + "&amp;height=" + (3 * _height)
+ "\" />"); + "\" / target=\"_blank\">");
_out.write("<img width=\"" _out.write("<img class=\"statimage\" width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92) + (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat=bw.combined" + "\" src=\"viewstat.jsp?stat=bw.combined"
+ "&amp;periodCount=" + _periodCount + "&amp;periodCount=" + _periodCount
@ -82,7 +82,7 @@ public class GraphHelper extends HelperBase {
+ "&amp;periodCount=" + (3 * _periodCount) + "&amp;periodCount=" + (3 * _periodCount)
+ "&amp;width=" + (3 * _width) + "&amp;width=" + (3 * _width)
+ "&amp;height=" + (3 * _height) + "&amp;height=" + (3 * _height)
+ "\" />"); + "\" target=\"_blank\" />");
_out.write("<img class=\"statimage\" border=\"0\" width=\"" _out.write("<img class=\"statimage\" border=\"0\" width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92) + (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat=" + "\" src=\"viewstat.jsp?stat="

View File

@ -10,6 +10,7 @@
<%@include file="summary.jsp" %> <%@include file="summary.jsp" %>
<h1>I2P Performance Graphs</h1> <h1>I2P Performance Graphs</h1>
<div class="main" id="main"> <div class="main" id="main">
<div class="graphspanel">
<jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
<jsp:setProperty name="graphHelper" property="*" /> <jsp:setProperty name="graphHelper" property="*" />
<jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 25; public final static long BUILD = 26;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;