* Console:

- Add a little color to confignav
      - Remove 'no skew' indication
This commit is contained in:
zzz
2009-05-20 22:50:14 +00:00
parent 438ea1b269
commit b1465b7dff
5 changed files with 20 additions and 21 deletions

View File

@ -143,7 +143,7 @@
</target> </target>
<uptodate property="precompilejsp.uptodate" targetfile="../jsp/web-out.xml"> <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> </uptodate>
<target name="javadoc"> <target name="javadoc">

View File

@ -78,24 +78,10 @@ public class SummaryHelper extends HelperBase {
long ms = _context.clock().getOffset(); long ms = _context.clock().getOffset();
long diff = ms; long diff = Math.abs(ms);
if (diff < 0) if (diff < 100)
diff = 0 - diff; return now;
if (diff == 0) { return now + " (" + DataHelper.formatDuration(diff) + " skew)";
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>";
}
} }
public boolean allowReseed() { public boolean allowReseed() {

View File

@ -28,6 +28,7 @@
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" /> <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" />
<input type="hidden" name="action" value="blah" /> <input type="hidden" name="action" value="blah" />
<div class="configure" id="configure">
<h3>Bandwidth limiter</h3> <h3>Bandwidth limiter</h3>
<p> <p>
<b>I2P will work best if you configure your rates to match the speed of your internet connection.</b> <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> </p><p>
<input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br /> <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br />
</p>
</div>
<hr /> <hr />
<!-- <!--
<b>Enable load testing: </b> <b>Enable load testing: </b>

View File

@ -1,5 +1,6 @@
<div class="confignav" id="confignav">
<center> <center>
<h4> <b>
<% if (request.getRequestURI().indexOf("config.jsp") != -1) { <% if (request.getRequestURI().indexOf("config.jsp") != -1) {
%>Network<% } %>Network<% }
else if (request.getRequestURI().indexOf("configservice.jsp") != -1) { else if (request.getRequestURI().indexOf("configservice.jsp") != -1) {
@ -20,7 +21,7 @@
%>Stats<% } %>Stats<% }
else if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) { else if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
%>Advanced<% }%> %>Advanced<% }%>
Configuration</h4> Configuration</b>
<h4><% if (request.getRequestURI().indexOf("config.jsp") != -1) { <h4><% if (request.getRequestURI().indexOf("config.jsp") != -1) {
%>Network | <% } else { %><a href="config.jsp">Network</a> | <% } %>Network | <% } else { %><a href="config.jsp">Network</a> | <% }
if (request.getRequestURI().indexOf("configservice.jsp") != -1) { if (request.getRequestURI().indexOf("configservice.jsp") != -1) {
@ -43,3 +44,4 @@ Configuration</h4>
%>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %></h4> %>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %></h4>
</center> </center>
<hr /> <hr />
</div>

View File

@ -87,3 +87,11 @@ div.news {
text-align: left; text-align: left;
color: inherit; color: inherit;
} }
div.confignav {
background-color: #efefff;
}
div.configure {
background-color: #ffffc0;
}