From b1465b7dff46c073fb0ec52882fb305d84caffa1 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 20 May 2009 22:50:14 +0000
Subject: [PATCH] * Console: - Add a little color to confignav
- Remove 'no skew' indication
---
apps/routerconsole/java/build.xml | 2 +-
.../src/net/i2p/router/web/SummaryHelper.java | 22 ++++---------------
apps/routerconsole/jsp/config.jsp | 3 +++
apps/routerconsole/jsp/confignav.jsp | 6 +++--
apps/routerconsole/jsp/default.css | 8 +++++++
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index c0a132a41d..da04fc9bab 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 f85d8dc938..0810dd9506 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 10417dba0d..16593f5d0b 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 ec1e7f5c1f..d3cc361977 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 d5d2fd48bb..a996b59627 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;
+}
--
GitLab