From 9c2c90c0b1fcfb200cee45bce10def273e5d3242 Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 16 Oct 2009 20:01:18 +0000 Subject: [PATCH] Whitespace removals. --- .../src/net/i2p/router/web/SummaryHelper.java | 2 +- apps/routerconsole/jsp/configkeyring.jsp | 4 +- apps/routerconsole/jsp/configpeer.jsp | 8 +-- apps/routerconsole/jsp/configstats.jsp | 4 +- apps/routerconsole/jsp/configui.jsp | 2 +- apps/routerconsole/jsp/help.jsp | 11 ++-- .../themes/console/classic/console.css | 66 ++++++++++++++++--- .../resources/themes/console/dark/console.css | 14 +++- .../themes/console/light/console.css | 19 +++++- readme.html | 4 +- readme_de.html | 2 +- readme_fr.html | 2 +- readme_nl.html | 2 +- readme_sv.html | 2 +- readme_zh.html | 2 +- .../router/transport/ntcp/NTCPTransport.java | 6 +- .../router/transport/udp/UDPTransport.java | 10 +-- 17 files changed, 111 insertions(+), 49 deletions(-) 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 369d24770..5c7779cf5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -356,7 +356,7 @@ public class SummaryHelper extends HelperBase { Collections.sort(clients, new AlphaComparator()); StringBuilder buf = new StringBuilder(512); - buf.append("

Local destinations

"); + buf.append("

Local destinations

"); for (Iterator iter = clients.iterator(); iter.hasNext(); ) { Destination client = (Destination)iter.next(); diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 0c054a7d2..02e3845de 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -17,15 +17,13 @@ " /> -

Keyring

+

Keyring

The router keyring is used to decrypt encrypted leaseSets. The keyring may contain keys for local or remote encrypted destinations.

-
-
<% String prev = System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigKeyringHandler.noncePrev", prev); diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 007452229..9c010b67a 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -31,7 +31,6 @@ 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()+""); %> " /> -

@@ -40,7 +39,6 @@

Manually Ban / Unban a Peer

Banning will prevent the participation of this peer in tunnels you create. -
@@ -53,26 +51,22 @@ 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. -

+ displayed on the profiles page.
<% long speed = 0; long capacity = 0; if (! "".equals(peer)) { // get existing bonus values? } %> -

Speed: Capacity:
-

" /> -
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 122d035c3..53dc83eda 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -71,12 +71,12 @@ function toggleAll(category) " />

Configure I2P Stat Collection

- Enable full stats? +

Enable full stats? checked="true" <% } %>/> (change requires restart to take effect)
Stat file:
- Filter: (toggle all)
+Filter: (toggle all)

<% while (statshelper.hasMoreStats()) { diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 89f7d7c2b..a3a2cb47d 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -20,7 +20,7 @@ " /> -

Router Console Theme

+

Router Console Theme

<% // userAgent defined in confignav if (userAgent == null || !userAgent.contains("MSIE")) { diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index 0ae11a95a..acdb918f8 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -18,11 +18,11 @@ help with other aspects of the project, please see the documentation for You may also try the I2P forum or IRC.
-

Summary Bar Information

+

Summary Bar Information

Many of the stats on the summary bar may be configured to be graphed for further analysis. -

General

    +

    General

    • Ident: The first four characters (24 bits) of your 44-character (256-bit) Base64 router hash. The full hash is shown on your router info page. @@ -129,9 +129,8 @@ or reject all requests for a number of reasons, to control the bandwidth and CPU demands and maintain capacity for local clients.
    -

    Legal stuff

    -The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with -a few notable exceptions:

      +

      Legal stuff

      The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with +a few notable exceptions:

      • ElGamal and DSA code, under the BSD license, written by TheCrypto
      • SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle
      • AES code, under the Cryptix (MIT) license, written by the Cryptix team
        • @@ -166,7 +165,7 @@ details on other applications available, as well as their licenses, please see t client applications can be found on our download page. .

        -

        Release history

        +

        Release history


        <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %> diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 325227598..f25f4d0dd 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -209,6 +209,15 @@ div.routersummary tr { border: 0 !important; } +.tunnels { + margin-top: 3px; +} + +.tunnels tr { + padding: 4px 0 !important; + margin-left: -7px !important; +} + div.routersummary form { margin-top: 8px; } @@ -260,7 +269,7 @@ div.main { } div.main ul { - margin: 0; + margin: 5px 0 -10px -10px; } div.main li { @@ -274,11 +283,28 @@ div.main li:first-child { padding-top: 15px; } +div.main hr:last-child { + margin: 15px 0 10px 0; +} + div.main textarea { width: 98% !important; margin: 2px 0 2px 5px; } +div.main h2 { + margin-top: 20px; +} + +div.welcome { + margin-top: 5px; +} + +div.main h2:first-child, div.main h3:first-child { + margin-top: 0px; + margin-bottom: 10px; +} + div.news { margin: -5px 0px 0 195px; padding: -10px 0px 8px 0px; @@ -299,11 +325,11 @@ div.news { div.news li { text-align: justify; list-style: none; - margin: -15px 15px -30px -20px; + margin: -15px 15px -25px -20px; padding: 0px 0 15px 0; border-bottom: 2px dotted #cc7; border-top: 0px solid #cc7; - padding: 3px 5px 5px 5px; + padding: 3px 5px 5px 0; font-size: 10pt; color: #540; } @@ -326,9 +352,9 @@ div.news a:visited { div.news hr { color: #cc7; background: #cc7; - height: 2px; + height: 1px; border: 0px solid #cccc77; - margin: 5px 0; + margin: 2px 0 0 0; } div.confignav { @@ -362,6 +388,22 @@ div.configure tr { -moz-box-shadow: inset 0px 0px 1px 0px #bbf; } +div.configure li:first-child, div.main li:first-child { + margin-top: -10px; +} + +div.configure li:last-child { + margin-bottom: -5px; +} + +div.configure h2:first-child { + margin-top: 15px; +} + +.topshimten { + margin-top: 15px; +} + div.messages { padding: 0px 10px; background: #fff; @@ -417,6 +459,7 @@ h3 { border-bottom: 3px solid #aaf; border-top: 0px solid #aaf; letter-spacing: 0.04em; + margin-bottom: 10px; } .proxyfooter{ @@ -513,6 +556,7 @@ div.joblog:ul { div.joblog li:first-child { margin-top: -10px; } + div.joblog li:last-child { margin-bottom: -10px; } @@ -530,7 +574,11 @@ div.joblog p { } div.joblog h3 { - margin: 5px 0 5px 0; + margin: 10px 0 10px 0; +} + +div.joblog h3:first-child { + margin: 5px 0 15px 0; } div.joblog hr { @@ -571,10 +619,10 @@ p { } .langbox { - margin: 20px -15px 0px 5px; + margin: 10px -20px 0px 5px; color: #001; font-size: 7pt; - width: 180px; + width: 220px; text-align: center; float: right; valign: middle; @@ -641,7 +689,7 @@ tt { } div.graphspanel { - padding: 20px 10px; + padding: 15px 5px 20px 5px; margin: -20px; background: #ddf url('images/lightbluetile.png'); -moz-border-radius: 4px; diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index ddcb3f143..921b321f5 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -154,7 +154,7 @@ div.routersummary h4 { div.routersummary table { border: 0; text-align: center !important; - margin: -1px -4px -4px -4px; + margin: -4px -4px -4px -4px; width: 185px !important; overflow: hidden; font-size: 8pt; @@ -169,6 +169,15 @@ div.routersummary tr { border: 0 !important; } +.tunnels { + margin-top: 0 !important; +} + +.tunnels tr { + padding: 4px 0 !important; + margin-left: -6px !important; +} + div.routersummary form { margin-top: 8px; } @@ -292,6 +301,7 @@ div.news li { padding: 5px 5px 5px 0; vertical-align: middle; word-wrap: break-word; + color: #99f; } div.news h4 { @@ -532,7 +542,7 @@ a:link, h2 a:link{ } a:visited{ - color: #7bb; + color: #77f; text-decoration: none; font-weight: bold; word-wrap: break-word; diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 0c194ba0e..6ec4d363f 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -161,6 +161,15 @@ div.routersummary tr { border: 0 !important; } +.tunnels { + margin-top: 0 !important; + margin-left: -7px !important; +} + +.tunnels tr { + padding: 4px 0 !important; +} + div.routersummary form { margin-top: 8px; } @@ -261,6 +270,10 @@ div.main hr, hr { margin: 10px 0; } +hr:last-child { + margin-top: 20px !important; +} + div.main textarea { background: #eef; color: #001; @@ -531,14 +544,14 @@ code { } a:link{ - color: #007; + color: #008; text-decoration: none; font-weight: bold; word-wrap: break-word; } a:visited{ - color: #606; + color: #004; text-decoration: none; font-weight: bold; } @@ -863,7 +876,7 @@ div.joblog li:first-child { margin-top: 10px; } div.joblog li:last-child { - margin-bottom: -10px; + margin-bottom: -15px; } div.joblog form:first-child { diff --git a/readme.html b/readme.html index 78da364ac..fdb3682a9 100644 --- a/readme.html +++ b/readme.html @@ -6,7 +6,7 @@ Nederlands Svenska
-

Welcome to I2P!

+

Welcome to I2P!

If you've just started I2P, the Active: numbers on the left should start to grow over the next few minutes and you'll see a "shared clients" local destination listed on the left (if not, see below). Once those show @@ -37,7 +37,7 @@ up, you can:


There are many more eepsites - just follow the links from the ones you see, bookmark your favorites, and visit them often! -
+
  • browse the web - there is currently an HTTP "outproxy" in I2P hooked up to your own HTTP proxy on port 4444 - simply diff --git a/readme_de.html b/readme_de.html index 8a7080ad8..63f1d88e4 100644 --- a/readme_de.html +++ b/readme_de.html @@ -1,7 +1,7 @@
    English Chinese Deutsch Français Nederlands Svenska
    -

    Willkommen zu I2P!

    +

    Willkommen zu I2P!

    Wenn Du gerade I2P gestartet hast, sollten die "Active:" Zahlen links in den nächsten paar Minuten anwachsen und Du siehst dann dort ein "shared clients" lokales Ziel gelistet (falls nicht, siehe Unten). Sobald das erscheint, kannst Du:

    • "Eepsites" besuchen - In I2P sind anonym gehostete Websites - diff --git a/readme_fr.html b/readme_fr.html index a37411fc2..268b72877 100644 --- a/readme_fr.html +++ b/readme_fr.html @@ -1,7 +1,7 @@
      English Chinese Deutsch Français Nederlands Svenska
      -

      Bienvenu a I2P!

      +

      Bienvenu a I2P!

      Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listés sur la gauche (si non, voir plus bas). Une fois qu'ils apparaissent, vous pouvez:

      • parcourir les "eepsites" - sur I2P il y a des sites web anonymes hébergés - dites à votre navigateur d'utiliser le HTTP proxy a l'adresse 127.0.0.1 port 4444, ensuite vous pouvez naviguer sur les eepsites:
        diff --git a/readme_nl.html b/readme_nl.html index a4067d353..78f26ecba 100644 --- a/readme_nl.html +++ b/readme_nl.html @@ -1,7 +1,7 @@
        English Chinese Deutsch Français Nederlands Svenska
        -

        Welkom bij I2P!

        +

        Welkom bij I2P!

        Als je net I2P opgestart hebt, zullen de 'Active:' (Actieve) getallen aan de linkerkant in de komende minuten stijgen, en je zal een "Shared clients" (Gedeelde clients) lokale bestemming zien staan aan de linkerkant (indien niet, zie hieronder). Eenmaal je deze bestemming ziet, kan je:

        • surfen naar "eepsites" - op I2P zijn er anonieme websites - stel je browser in om de HTTP proxy op 127.0.0.1, poort 4444 te gebruiken, en surf vervolgens naar een eepsite:

          diff --git a/readme_sv.html b/readme_sv.html index eb85ff9d1..4c02cfcdf 100644 --- a/readme_sv.html +++ b/readme_sv.html @@ -1,7 +1,7 @@
          English Chinese Deutsch Français Nederlands Svenska
          -

          Welcome to I2P!

          +

          Welcome to I2P!

          Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom några få minuter och du kommer se en destination kallad "delade klienter" på den vänstra listan (om inte se diff --git a/readme_zh.html b/readme_zh.html index 9bc1ed6bf..81ba4fd4d 100644 --- a/readme_zh.html +++ b/readme_zh.html @@ -6,7 +6,7 @@ Nederlands Svenska -

          欢迎使用 I2P!

          +

          欢迎使用 I2P!

          如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将会增加，并会出现名为共享客户端("shared clients") 的本地目标。(如果没有,请见 疑难解答)。待出现以上消息后，您可以:

          • 浏览 I2P 站点 "eepsites" - I2P 网络内匿名运行的小站 - 您要首先设置浏览器的 HTTP 代理 为 127.0.0.1:4444 然后才能浏览 I2P 站点 -
              diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 29aac8f7b..2614af25d 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -642,10 +642,10 @@ public class NTCPTransport extends TransportImpl { long totalRecv = 0; StringBuilder buf = new StringBuilder(512); - buf.append("

              NTCP connections: ").append(peers.size()); + buf.append("

              NTCP connections: ").append(peers.size()); buf.append(". Limit: ").append(getMaxConnections()); buf.append(". Timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout())); - buf.append(".

              \n" + + buf.append(".

              \n" + "
\n" + "" + "" + @@ -730,7 +730,7 @@ public class NTCPTransport extends TransportImpl { "\n"); } - buf.append("
PeerDir

\n"); + buf.append("\n"); out.write(buf.toString()); buf.setLength(0); } diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 06b429889..1d5781485 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -2002,7 +2002,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append(sendTotal).append(" ").append(recvTotal).append("\n"); buf.append(" ").append(resentTotal); buf.append(" ").append(dupRecvTotal).append("\n"); - buf.append("

\n"); + buf.append(" \n"); long bytesTransmitted = _context.bandwidthLimiter().getTotalAllocatedOutboundBytes(); // NPE here early double averagePacketSize = _context.statManager().getRate("udp.sendPacketSize").getLifetimeAverageValue(); @@ -2011,7 +2011,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority double nondupSent = ((double)bytesTransmitted - ((double)resentTotal)*averagePacketSize); double bwResent = (nondupSent <= 0 ? 0d : ((((double)resentTotal)*averagePacketSize) / nondupSent)); buf.append("

Percentage of bytes retransmitted (lifetime): ").append(formatPct(bwResent)); - buf.append("

(Includes retransmission required by packet loss)

\n"); + buf.append("(Includes retransmission required by packet loss)\n"); out.write(buf.toString()); buf.setLength(0); out.write(KEY); @@ -2031,7 +2031,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } private static final String KEY = "

Definitions:

" + - "
Peer: the remote peer.
\n" + + "

Peer: the remote peer.
\n" + "Dir: v means they offer to introduce us, ^ means we offer to introduce them.
\n" + "Idle: the idle time is how long since a packet has been received or sent.
\n" + "In/out: the rates show a smoothed inbound and outbound transfer rate (KBytes per second).
\n" + @@ -2049,10 +2049,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority "TX: the number of packets sent to the peer.
\n" + "RX: the number of packets received from the peer.
\n" + "ReTX: the number of packets retransmitted to the peer.
\n" + - "DupRX: the number of duplicate packets received from the peer." + + "DupRX: the number of duplicate packets received from the peer.

" + "
\n"; - /** + /* * Cache the bid to reduce object churn */ private class SharedBid extends TransportBid {