diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index c0a132a41d6e1c591377aeb407131adffb9021e2..da04fc9bab0bbc2742202c6cef8b301f4241b2a8 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -143,7 +143,7 @@ </target> <uptodate property="precompilejsp.uptodate" targetfile="../jsp/web-out.xml"> - <srcfiles dir= "../jsp" includes="**/*.jsp, **/*.html, susimail/susimail, web.xml"/> + <srcfiles dir= "../jsp" includes="**/*.jsp, **/*.html, *.css, susimail/susimail, web.xml"/> </uptodate> <target name="javadoc"> diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index f85d8dc93865a8b2e901ce25b7e1c9c30976ffd6..0810dd950689643854d07f6dd4b70034e1ab9030 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -78,24 +78,10 @@ public class SummaryHelper extends HelperBase { long ms = _context.clock().getOffset(); - long diff = ms; - if (diff < 0) - diff = 0 - diff; - if (diff == 0) { - return now + " (no skew)"; - } else if (diff < 1000) { - return now + " (" + ms + "ms skew)"; - } else if (diff < 5 * 1000) { - return now + " (" + (ms / 1000) + "s skew)"; - } else if (diff < 60 * 1000) { - return now + " <b>(" + (ms / 1000) + "s skew)</b>"; - } else if (diff < 60 * 60 * 1000) { - return now + " <b>(" + (ms / (60 * 1000)) + "m skew)</b>"; - } else if (diff < 24 * 60 * 60 * 1000) { - return now + " <b>(" + (ms / (60 * 60 * 1000)) + "h skew)</b>"; - } else { - return now + " <b>(" + (ms / (24 * 60 * 60 * 1000)) + "d skew)</b>"; - } + long diff = Math.abs(ms); + if (diff < 100) + return now; + return now + " (" + DataHelper.formatDuration(diff) + " skew)"; } public boolean allowReseed() { diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 10417dba0defd74a4cbc243b95e05364472fd49f..16593f5d0b7303a6e05b12debee12671a5297fb4 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -28,6 +28,7 @@ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" /> <input type="hidden" name="action" value="blah" /> +<div class="configure" id="configure"> <h3>Bandwidth limiter</h3> <p> <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b> @@ -66,6 +67,8 @@ %> </p><p> <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br /> + </p> +</div> <hr /> <!-- <b>Enable load testing: </b> diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsp index ec1e7f5c1f13f49ad5be17fa443024c9ab6de1ec..d3cc361977233011641bfc48c7c30f39ea905ba4 100644 --- a/apps/routerconsole/jsp/confignav.jsp +++ b/apps/routerconsole/jsp/confignav.jsp @@ -1,5 +1,6 @@ +<div class="confignav" id="confignav"> <center> -<h4> +<b> <% if (request.getRequestURI().indexOf("config.jsp") != -1) { %>Network<% } else if (request.getRequestURI().indexOf("configservice.jsp") != -1) { @@ -20,7 +21,7 @@ %>Stats<% } else if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) { %>Advanced<% }%> -Configuration</h4> +Configuration</b> <h4><% if (request.getRequestURI().indexOf("config.jsp") != -1) { %>Network | <% } else { %><a href="config.jsp">Network</a> | <% } if (request.getRequestURI().indexOf("configservice.jsp") != -1) { @@ -43,3 +44,4 @@ Configuration</h4> %>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %></h4> </center> <hr /> +</div> diff --git a/apps/routerconsole/jsp/default.css b/apps/routerconsole/jsp/default.css index d5d2fd48bb90d7e6d4dd18755a0fdf13857dbb4d..a996b5962719a7a8bf99fea024da5a556e0c349a 100644 --- a/apps/routerconsole/jsp/default.css +++ b/apps/routerconsole/jsp/default.css @@ -87,3 +87,11 @@ div.news { text-align: left; color: inherit; } + +div.confignav { + background-color: #efefff; +} + +div.configure { + background-color: #ffffc0; +}