From 8ffdae41827a3643bc71764f77f5b45e94bcec52 Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 17 Jul 2009 17:30:11 +0000 Subject: [PATCH] More work on the config pages. --- apps/routerconsole/jsp/config.jsp | 5 +- apps/routerconsole/jsp/configpeer.jsp | 19 ++--- apps/routerconsole/jsp/configservice.jsp | 10 +-- apps/routerconsole/jsp/configstats.jsp | 2 +- apps/routerconsole/jsp/configui.jsp | 81 +++++++++---------- apps/routerconsole/jsp/configupdate.jsp | 1 + .../themes/console/light/console.css | 2 +- 7 files changed, 57 insertions(+), 63 deletions(-) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 4152e434a..079799d1a 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -30,7 +30,6 @@

I2P will work best if you configure your rates to match the speed of your internet connection.

-

" /> KBps @@ -67,7 +66,6 @@


- diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 2fc0de9ec..8109d123d 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -33,8 +33,7 @@ if (prev != null) System.setProperty("net.i2p.router.web.ConfigPeerHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigPeerHandler.nonce", new java.util.Random().nextLong()+""); %> " /> -
-

+

@@ -43,21 +42,19 @@

Manually Shitlist / Unshitlist a Router

Shitlisting will prevent the participation of this peer in tunnels you create. +

+ + + <% if (! "".equals(peer)) { %> + <---- click to verify action + <% } %> +

-

- - - <% if (! "".equals(peer)) { %> - <---- click to verify action - <% } %> -

-

Adjust Profile Bonuses

Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the profiles page. -

<% long speed = 0; long capacity = 0; if (! "".equals(peer)) { diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index d2ed15b22..a5233693a 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -23,7 +23,7 @@ if (prev != null) System.setProperty("net.i2p.router.web.ConfigServiceHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigServiceHandler.nonce", new java.util.Random().nextLong()+""); %> " /> -

Shutdown the router

+

Shutdown the router

Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes. If you need to kill the router immediately, that option is available as well.

@@ -45,7 +45,7 @@ <% } %>
<% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %> -

Systray integration

+

Systray integration

On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status (later on, I2P client applications will be able to integrate their own functionality into the system tray as well). @@ -53,7 +53,7 @@

-

Run on startup

+

Run on startup

You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly. You can also run the install_i2p_service_winnt.bat (or @@ -66,14 +66,14 @@ <% } %> <% if (System.getProperty("wrapper.version") != null) { %> -

Debugging

+

Debugging

At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.

<% } %>
-

Launch browser on router startup?

+

Launch browser on router startup?

I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser pointing at http://127.0.0.1:7657/index.jsp whenever diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 039f9b55f..20be36927 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -77,7 +77,7 @@ function toggleAll(category) if (statshelper.getIsFull()) { %>checked="true" <% } %>/> (change requires restart to take effect)
Stat file:
- Filter: (toggle all)
+ Filter: (toggle all)

<% while (statshelper.hasMoreStats()) { while (statshelper.groupRequired()) { %> diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 8b2cfbc4b..135866277 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -1,41 +1,40 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - - - -I2P Router Console - config UI -<%@include file="css.jsp" %> - - -<%@include file="nav.jsp" %> -<%@include file="summary.jsp" %> - - -" /> - -

I2P UI Configuration

-
- - <%@include file="confignav.jsp" %> - - - - " /> - - -

Router Console Theme

-
-
- <% String prev = System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.ConfigUIHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.ConfigUIHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - - -
- - -
-
- - +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +I2P Router Console - config UI +<%@include file="css.jsp" %> + + +<%@include file="nav.jsp" %> +<%@include file="summary.jsp" %> + + +" /> + +

I2P UI Configuration

+
+ + <%@include file="confignav.jsp" %> + + + + " /> + +
+

Router Console Theme

+
+ <% String prev = System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce"); + if (prev != null) System.setProperty("net.i2p.router.web.ConfigUIHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.ConfigUIHandler.nonce", new java.util.Random().nextLong()+""); %> + " /> + + +
+ + +
+
+ + diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index 72aac377b..bac04e87b 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -28,6 +28,7 @@ if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %> " /> +

Check for I2P and news updates

diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index f80066d99..ee2efeb86 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -166,7 +166,7 @@ div.confignav { div.configure { padding: 15px 10px !important; margin: 10px 0px 25px 0; - background: #ddf; + background: #ddf url('images/lightbluetile.png'); -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px;