From 895490df3d6337df083bc8f74c286dac3dffe97d Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 17 Jul 2009 20:57:18 +0000 Subject: [PATCH] Insert some

's into various config pages and minor meddling with the css. --- apps/routerconsole/jsp/configadvanced.jsp | 87 +++---- apps/routerconsole/jsp/configlogging.jsp | 135 +++++------ apps/routerconsole/jsp/configstats.jsp | 221 +++++++++--------- .../resources/themes/console/dark/console.css | 2 +- .../themes/console/light/console.css | 2 +- 5 files changed, 225 insertions(+), 222 deletions(-) diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index feb0ada3b..c65d09d34 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -1,43 +1,44 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - - - -I2P Router Console - config advanced -<%@include file="css.jsp" %> - - -<%@include file="summary.jsp" %> - - -" /> - -

I2P Advanced Configuration

-
- - <%@include file="confignav.jsp" %> - - - - " /> - -
-
- <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - -
-

- - -

-

- NOTE: Some changes may require a restart to take effect. -

-
-
-
- - +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +I2P Router Console - config advanced +<%@include file="css.jsp" %> + + +<%@include file="summary.jsp" %> + + +" /> + +

I2P Advanced Configuration

+
+ + <%@include file="confignav.jsp" %> + + + + " /> + +
+
+ <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce"); + if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %> + " /> + +

Advanced I2P Configuration

+
+

+ + +

+

+ NOTE: Some changes may require a restart to take effect. +

+
+
+
+ + diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index af72193f2..8d655b8e9 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -1,67 +1,68 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - - - -I2P Router Console - config logging -<%@include file="css.jsp" %> - - -" /> - -<%@include file="summary.jsp" %> -

I2P Logging Configuration

-
- <%@include file="confignav.jsp" %> - - - - " /> - -
-
- <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.ConfigLoggingHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - - - - - - - - - - -
Logging filename: - " /> -
(the symbol '@' will be replaced during log rotation) -
Log record format: - " /> -
(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, - 'm' = message) -
Log date format: - " /> -
('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' - = second, 'SSS' = millisecond) -
Max log file size: - " /> -
-
Default log level: -
(DEBUG and INFO are not recommended defaults, - as they will drastically slow down your router) -
Log level overrides: - -
-
-
- - -
-
-
-
-
- - +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +I2P Router Console - config logging +<%@include file="css.jsp" %> + + +" /> + +<%@include file="summary.jsp" %> +

I2P Logging Configuration

+
+ <%@include file="confignav.jsp" %> + + + + " /> + +
+
+ <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce"); + if (prev != null) System.setProperty("net.i2p.router.web.ConfigLoggingHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %> + " /> + +

Configure I2P Logging Options

+ + + + + + + + + +
Logging filename: + " /> +
(the symbol '@' will be replaced during log rotation) +
Log record format: + " /> +
(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, + 'm' = message) +
Log date format: + " /> +
('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' + = second, 'SSS' = millisecond) +
Max log file size: + " /> +
+
Default log level: +
(DEBUG and INFO are not recommended defaults, + as they will drastically slow down your router) +
Log level overrides: + +
+
+
+ + +
+
+
+
+
+ + diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index b56447ef2..9e59efe60 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -1,110 +1,111 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - - - -I2P Router Console - config stats -<%@include file="css.jsp" %> - - -<%@include file="summary.jsp" %> -

I2P Stats Configuration

-
- <%@include file="confignav.jsp" %> - - - " /> - - - - - " /> -
-
- <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %> - - " /> - Enable full stats? - checked="true" <% } %>/> - (change requires restart to take effect)
- Stat file:
- Filter: (toggle all)
- - <% while (statshelper.hasMoreStats()) { - while (statshelper.groupRequired()) { %> - <% - } // end iterating over required groups for the current stat %> - - - <% - } // end iterating over all stats %> - - - - - - -
- <%=statshelper.getCurrentGroupName()%> - (toggle all) -
LogGraph
- - checked="true" <% } %>/> - <% if (statshelper.getCurrentCanBeGraphed()) { %> - checked="true" <% } %>/><% } %><%=statshelper.getCurrentStatName()%>:
- <%=statshelper.getCurrentStatDescription()%>
Advanced filter: -
-
-
- - +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +I2P Router Console - config stats +<%@include file="css.jsp" %> + + +<%@include file="summary.jsp" %> +

I2P Stats Configuration

+
+ <%@include file="confignav.jsp" %> + + + " /> + + + + + " /> +
+
+ <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce"); + if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %> + + " /> +

Configure I2P Stat Collection

+ Enable full stats? + checked="true" <% } %>/> + (change requires restart to take effect)
+ Stat file:
+ Filter: (toggle all)
+ + <% while (statshelper.hasMoreStats()) { + while (statshelper.groupRequired()) { %> + <% + } // end iterating over required groups for the current stat %> + + + <% + } // end iterating over all stats %> + + + + + + +
+ <%=statshelper.getCurrentGroupName()%> + (toggle all) +
LogGraph
+ + checked="true" <% } %>/> + <% if (statshelper.getCurrentCanBeGraphed()) { %> + checked="true" <% } %>/><% } %><%=statshelper.getCurrentStatName()%>:
+ <%=statshelper.getCurrentStatDescription()%>
Advanced filter: +
+
+
+ + diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index e8e58668d..c2d6c24bf 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -170,7 +170,7 @@ div.configure { } div.messages { - padding: 0 10px; + padding: 10px; margin: 10px 0 20px 0; -moz-border-radius: 4px; -khtml-border-radius: 4px; diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 13b77ae26..ad985fd1c 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -328,7 +328,7 @@ h2 { font-size: 12pt; color: #001; letter-spacing: 0.05em; - background: #ddf url('images/tabletile.png'); + background: #ddf url('images/lightbluetile.png'); text-shadow: 0px 0px 1px rgba(0, 0, 64, 0.5); padding: 7px 10px; wordwrap: none;