diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index ccdfb1460..234ba80e1 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -698,11 +698,12 @@ public class SnarkManager implements Snark.CompleteListener { // , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/" // , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/" // , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php" - "welterde", "http://BGKmlDOoH3RzFbPRfRpZV2FjpVj8~3moFftw5-dZfDf2070TOe8Tf2~DAVeaM6ZRLdmFEt~9wyFL8YMLMoLoiwGEH6IGW6rc45tstN68KsBDWZqkTohV1q9XFgK9JnCwE~Oi89xLBHsLMTHOabowWM6dkC8nI6QqJC2JODqLPIRfOVrDdkjLwtCrsckzLybNdFmgfoqF05UITDyczPsFVaHtpF1sRggOVmdvCM66otyonlzNcJbn59PA-R808vUrCPMGU~O9Wys0i-NoqtIbtWfOKnjCRFMNw5ex4n9m5Sxm9e20UkpKG6qzEuvKZWi8vTLe1NW~CBrj~vG7I3Ok4wybUFflBFOaBabxYJLlx4xTE1zJIVxlsekmAjckB4v-cQwulFeikR4LxPQ6mCQknW2HZ4JQIq6hL9AMabxjOlYnzh7kjOfRGkck8YgeozcyTvcDUcUsOuSTk06L4kdrv8h2Cozjbloi5zl6KTbj5ZTciKCxi73Pn9grICn-HQqEAAAA.i2p/a=http://tracker.welterde.i2p/stats?mode=top5" // , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/" // , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/" - , "crstrack", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/" - , "PaTracker", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/" + "POSTMAN", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/" + ,"WELTERDE", "http://BGKmlDOoH3RzFbPRfRpZV2FjpVj8~3moFftw5-dZfDf2070TOe8Tf2~DAVeaM6ZRLdmFEt~9wyFL8YMLMoLoiwGEH6IGW6rc45tstN68KsBDWZqkTohV1q9XFgK9JnCwE~Oi89xLBHsLMTHOabowWM6dkC8nI6QqJC2JODqLPIRfOVrDdkjLwtCrsckzLybNdFmgfoqF05UITDyczPsFVaHtpF1sRggOVmdvCM66otyonlzNcJbn59PA-R808vUrCPMGU~O9Wys0i-NoqtIbtWfOKnjCRFMNw5ex4n9m5Sxm9e20UkpKG6qzEuvKZWi8vTLe1NW~CBrj~vG7I3Ok4wybUFflBFOaBabxYJLlx4xTE1zJIVxlsekmAjckB4v-cQwulFeikR4LxPQ6mCQknW2HZ4JQIq6hL9AMabxjOlYnzh7kjOfRGkck8YgeozcyTvcDUcUsOuSTk06L4kdrv8h2Cozjbloi5zl6KTbj5ZTciKCxi73Pn9grICn-HQqEAAAA.i2p/a=http://tracker.welterde.i2p/stats?mode=top5" + , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/" + }; /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 9b5513d49..c98827d18 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -82,8 +82,8 @@ public class I2PSnarkServlet extends HttpServlet { // we want it to go to the base URI so we don't refresh with some funky action= value out.write("\n"); out.write(HEADER); - -out.write("
"); + out.write(""); + out.write("
I2PSnark
Anonymous BitTorrent Client for I2P
"); out.write("
I2PSnark
Anonymous BitTorrent Client for I2P
Refresh"); out.write(" | Forum\n"); Map trackers = _manager.getTrackers(); @@ -98,13 +98,13 @@ out.write("
" + name + ""); } out.write("
\n"); - out.write("
");
+        out.write("
");
         List msgs = _manager.getMessages();
         for (int i = msgs.size()-1; i >= 0; i--) {
             String msg = (String)msgs.get(i);
             out.write(msg + "\n");
         }
-        out.write("
\n");
+        out.write("
"); List snarks = getSortedSnarks(req); String uri = req.getRequestURI(); @@ -653,14 +653,14 @@ out.write("
\n"); out.write("\n"); - out.write("Add Torrent:
\n"); + out.write("
Add Torrent:
\n"); out.write("From URL : \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) //out.write("From file:
\n"); out.write("
\n"); out.write("Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "
\n"); out.write("Removing that .torrent file will cause the torrent to stop.
\n"); - out.write("\n\n"); + out.write("\n
"); } private void writeSeedForm(PrintWriter out, HttpServletRequest req) throws IOException { @@ -669,7 +669,7 @@ out.write("
\n"); + out.write("
\n"); // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
\n"); out.write("\n"); @@ -693,7 +693,7 @@ out.write("
"); out.write("\n"); - out.write("\n\n"); + out.write("\n"); } private void writeConfigForm(PrintWriter out, HttpServletRequest req) throws IOException { @@ -705,7 +705,7 @@ out.write("
\n"); - out.write("
\n"); + out.write("
\n"); out.write("\n"); out.write("Configuration:
\n"); out.write("Data directory: "); + out.write(""); else - out.write(""); - out.write("\n"); - out.write("\n"); + out.write(""); + out.write("\n"); + out.write("\n"); for (int j = 0; j < info.getLength(); j++) { Hash peer = info.getPeer(j); TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j)); if (_context.routerHash().equals(peer)) { - out.write(""); + out.write(""); } else { String cap = getCapacity(peer); - out.write(""); + out.write(""); } if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) { for (int k = info.getLength(); k < maxLength; k++) - out.write(""); + out.write(""); } } out.write("\n"); @@ -572,19 +573,19 @@ public class TunnelPoolManager implements TunnelManagerFacade { if (in != null) { List pending = in.listPending(); if (pending.size() > 0) - out.write("Build in progress: " + pending.size() + " inbound
\n"); + out.write("
Build in progress: " + pending.size() + " inbound

\n"); live += pending.size(); } if (outPool != null) { List pending = outPool.listPending(); if (pending.size() > 0) - out.write("Build in progress: " + pending.size() + " outbound
\n"); + out.write("
Build in progress: " + pending.size() + " outbound

\n"); live += pending.size(); } if (live <= 0) - out.write("No tunnels, waiting for the grace period to end
\n"); - out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " + - DataHelper.formatSize(processedOut*1024) + "B out
"); + out.write("
No tunnels, waiting for the grace period to end.

\n"); + out.write("
Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " + + DataHelper.formatSize(processedOut*1024) + "B out

"); } private void renderPeers(Writer out) throws IOException { @@ -604,25 +605,25 @@ public class TunnelPoolManager implements TunnelManagerFacade { out.write("

Tunnel Counts By Peer:

\n"); out.write("

\n"); - //out.write("
\n"); + //out.write("\n"); out.write("EepProxy host: "); out.write("port: "); +buf.append("\n"); - buf.append("\n"); +// buf.append("\n"); // tunnel depth - buf.append("\n"); - buf.append("\n"); + buf.append("\n"); - buf.append("\n"); // tunnel depth variance - buf.append("\n"); - buf.append("\n"); + buf.append("\n"); - buf.append("\n"); // tunnel quantity - buf.append("\n"); - buf.append("\n"); + buf.append("\n"); - buf.append("\n"); // tunnel backup quantity - buf.append("\n"); - buf.append("\n"); + buf.append("\n"); - buf.append("\n"); // custom options - buf.append("\n"); - buf.append("\n"); + buf.append("\n"); - buf.append("\n"); - buf.append("\n"); + buf.append("\n"); - buf.append("\n"); +// buf.append("\n"); } private void renderOptions(StringBuilder buf, int min, int max, int now, String prefix, String name) { diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index ae5fa5636..3835db33b 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -38,7 +38,8 @@ <% } else { %> -Theme selection disabled for Internet Explorer, sorry. +Theme selection disabled for Internet Explorer, sorry.
If you're not using IE, it's likely that +your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes. <% } %> diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp index c31297c08..655741b83 100644 --- a/apps/routerconsole/jsp/summarynoframe.jsp +++ b/apps/routerconsole/jsp/summarynoframe.jsp @@ -28,8 +28,8 @@ I2P Services
SusimailSusiDNS -I2PSnark -Eepsite
+Torrents +Webserver
I2P Internals
I2PTunnelTunnels diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index d8d65c36a..3957331dc 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -49,13 +49,14 @@ div.routersummaryouter { div.routersummary { background: #fafaff; - width: 200px; + width: 175px; color: inherit; margin: 0em; padding: 5px; text-align: left; border: medium solid #efefff; font-size: 0.82em; + word-wrap: break-word; } div.warning { diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index a9e33febc..a5c7acfb2 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -115,6 +115,7 @@ div.warning { background-position:15px center; background-repeat:no-repeat; -moz-box-shadow: inset 0px 0px 0px 1px #f00; + word-wrap: break-word; } div.main { @@ -153,6 +154,7 @@ div.news li { margin: 0 10px 0 30px; padding: 5px; vertical-align: middle; + word-wrap: break-word; } div.confignav { @@ -170,7 +172,7 @@ div.confignav { } div.configure { - padding: 0 15px; + padding: 0 15px 15px 15px; margin: 10px 0px; background: #005; -moz-border-radius: 4px; @@ -220,7 +222,7 @@ table { } th { - padding: 4px; + padding: 8px; color: #eef; text-align: center; font-size: 8pt; @@ -240,17 +242,16 @@ tr:nth-child(odd) { background: #003 url('images/darkbluetile.png') !important; vertical-align: middle; } - +/* tr:last-child { background: #004 url('images/lightbluetile.png') !important; font-weight: bold; border: 1px solid #99f !important; } - +*/ td { padding: 5px 10px; color: #eef; - text-align: left; vertical-align: middle; } @@ -266,6 +267,7 @@ div.main li { margin: 2px 0px 2px 30px; padding: 1px 20px 1px 0px; line-height: 150%; + word-wrap: break-word; } .tidylist { @@ -291,6 +293,9 @@ code { a:link, h2 a:link{ color: #99f; + text-decoration: none; + font-weight: bold; + word-wrap: break-word; } a:visited{ @@ -349,6 +354,7 @@ h2 { vertical-align: middle; margin: 25px 0 20px 0 !important; -moz-box-shadow: inset 0px 0px 1px 0px #eef; + word-wrap: break-word; } h2 a:visited { @@ -441,6 +447,7 @@ input { padding: 1px 2px; text-decoration: none; min-width: 110px; + opacity: 0.8; } input:hover { diff --git a/installer/resources/themes/console/images/inbound.png b/installer/resources/themes/console/images/inbound.png new file mode 100644 index 000000000..df0083f93 Binary files /dev/null and b/installer/resources/themes/console/images/inbound.png differ diff --git a/installer/resources/themes/console/images/outbound.png b/installer/resources/themes/console/images/outbound.png new file mode 100644 index 000000000..a3e8722f0 Binary files /dev/null and b/installer/resources/themes/console/images/outbound.png differ diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index d185b9218..cbe52417c 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -35,7 +35,7 @@ div.logo { border-radius: 4px; background: #ddddff url('images/lightbluetile.png'); width: 175px; - -moz-box-shadow: inset 0px 0px 16px 1px #eef; + -moz-box-shadow: inset 0px 0px 1px 0px #002; } div.toolbar { @@ -86,18 +86,20 @@ div.routersummaryouter { div.routersummary { /* margin: 0px 20px 20px 0px; */ - width: auto; + width: 175px; padding: 10px; text-align: center; border: 1px solid #000033; - background: #ddddff url('images/lightbluetile.png'); + background: #ddf url('images/lightbluetile.png'); color: #000; font-size: 8pt; clear: left;/* fixes a bug in Opera */ -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; +/* float: left; +*/ -moz-box-shadow: inset 0px 0px 1px 0px #002; } @@ -116,6 +118,7 @@ div.warning { background-position:15px center; background-repeat:no-repeat; -moz-box-shadow: inset 0px 0px 1px 0px #d00; + word-wrap: break-word; } div.main { @@ -214,7 +217,7 @@ div.confignav { } div.configure { - padding: 0 15px !important; + padding: 0 15px 15px 15px !important; margin: 10px 0px 25px 0; background: #ddf url('images/lightbluetile.png'); -moz-border-radius: 4px; @@ -265,11 +268,11 @@ table { } th { - padding: 4px; + padding: 8px; color: #000; background: #b4c8ff url('images/tabletitlelight.png') repeat-x; text-align: center; - font-size: 8pt; + font-size: 9pt; } tr { @@ -293,7 +296,7 @@ tr:last-child { td { padding: 5px; color: #000; - text-align: left; + vertical-align: middle; } tt { @@ -308,6 +311,7 @@ div.main li { margin: 2px 5px 0px 20px; padding: 1px 20px 1px 10px; line-height: 150%; + word-wrap: break-word; } .tidylist { @@ -338,6 +342,7 @@ a:link{ color: #007; text-decoration: none; font-weight: bold; + word-wrap: break-word; } a:visited{ @@ -395,6 +400,7 @@ h2 { -khtml-border-radius: 4px; margin: 25px 0 20px 0 !important; -moz-box-shadow: inset 0px 0px 1px 0px #002; + word-wrap: break-word; } h2 a:hover { @@ -471,25 +477,28 @@ button:active{ input { background: #eef; - color: #003; + color: #001; margin: 5px 10px 5px 10px; padding: 4px 2px; font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; border: 1px solid #001; text-decoration: none; min-width: 110px; + opacity: 0.8; } input:hover { background: #f60; color: #fff; border: 1px solid #f60; + opacity: 0.9; } input:active { background: #002; color: #f60; border: 1px solid #f60; + opacity: 1.0; } submit { diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css index a6a66852a..a35cba046 100644 --- a/installer/resources/themes/console/snark.css +++ b/installer/resources/themes/console/snark.css @@ -5,19 +5,8 @@ body { font-size: 9pt; } -/* .snarkTitle { - text-align: left; - float: left; - margin: 0px 0px 5px 5px; - display: inline; - font-size: 16pt; - font-weight: bold; -} -*/ - -.snarkTitle { - font-size: 16pt; + font-size: 12pt; font-weight: bold; text-align: center; } @@ -27,23 +16,27 @@ body { } .snarkMessages { - border: none; - background-color: #9f9; - font-family: monospace; - font-size: 10pt; + background-color: #fe9; + font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono !important; + font-size: 9pt; font-weight: bold; -/* width: 100%; */ text-align: left; margin: 0 0 15px 0; border: 0px; padding: 5px; - border-width: 0px; border-spacing: 0px; -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; border: 2px inset #770; - overflow-x: scroll; + text-align: center; +} + +pre { + font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono !important; + width: 100%; + font-size: 8pt; + padding: 0; } table { @@ -54,19 +47,25 @@ table { border-spacing: 0px; } th { - background-color: #C7D5D5; + background-color: #f91; padding: 5px; font-size: 9pt; } + +.SnarkTorrents { + margin: 0; + border: 1px solid #001; +} + td { padding: 5px; } .snarkTorrentEven { - background-color: #bbf; + background-color: #fb1; font-size: 8pt; } .snarkTorrentOdd { - background-color: #ddf; + background-color: #fa1; font-size: 8pt; } .snarkNewTorrent { @@ -83,14 +82,14 @@ td { } .snarkConfig { - font-size: 10pt; + font-size: 10pt; } .page { background-color: #fff; color:#001; margin: 20px; - padding: 20px 20px 0 20px; + padding: 0 20px 5px 20px; -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; @@ -102,7 +101,7 @@ td { } form { - line-height: 300% + line-height: 250% } p { @@ -111,4 +110,27 @@ p { a:link { padding 5px; +} + +hr { + color: #003; + background: #003; + height: 1px; + border: 0px solid #003; + margin: 5px 0; +} + +div.section { + margin: 20px 0 0 0; + padding: 10px; + background: #ffe; + border: 1px solid #001; + text-align: left; + color: #001; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: inset 0px 0px 1px 0px #002; + word-wrap: break-word; + text-align: center; } \ No newline at end of file diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index cd3a5e0ac..1c164188f 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -455,46 +455,47 @@ public class TunnelPoolManager implements TunnelManagerFacade { } out.write(""); if (cfg.getReceiveTunnel() != null) - out.write(""); + out.write(""); else - out.write(""); + out.write(""); if (cfg.getReceiveFrom() != null) out.write(""); else - out.write(""); + out.write(""); if (cfg.getSendTunnel() != null) - out.write(""); + out.write(""); else - out.write(""); + out.write(""); if (cfg.getSendTo() != null) - out.write(""); + out.write(""); else - out.write(""); +// out.write(""); + out.write(""); long timeLeft = cfg.getExpiration()-_context.clock().now(); if (timeLeft > 0) - out.write(""); + out.write(""); else - out.write(""); - out.write(""); + out.write(""); + out.write(""); int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); if (lifetime <= 0) lifetime = 1; if (lifetime > 10*60) lifetime = 10*60; int bps = 1024 * (int) cfg.getProcessedMessagesCount() / lifetime; - out.write(""); + out.write(""); if (cfg.getSendTo() == null) - out.write(""); + out.write(""); else if (cfg.getReceiveFrom() == null) - out.write(""); + out.write(""); else - out.write(""); + out.write(""); out.write("\n"); processed += cfg.getProcessedMessagesCount(); } out.write("

\n"); out.write("\n"); out.write("\n"); - out.write("\n"); + out.write(""); } // rounding makes us look faster :) @@ -781,7 +781,7 @@ out.write("
\n" + - "I2PSnark - anonymous bittorrent\n"; + "I2PSnark - Anonymous BitTorrent Client\n"; private static final String HEADER = ""; @@ -800,11 +800,11 @@ out.write("
\n"; + " valign=\"top\" colspan=\"8\">No torrents loaded.\n"; - private static final String TABLE_FOOTER = "
" + "No torrents
\n"; + private static final String TABLE_FOOTER = "
\n"; - private static final String FOOTER = ""; + private static final String FOOTER = ""; /** inner class, don't bother reindenting */ private static class FetchAndAdd implements Runnable { diff --git a/apps/i2psnark/snark.css b/apps/i2psnark/snark.css deleted file mode 100644 index 40817a68d..000000000 --- a/apps/i2psnark/snark.css +++ /dev/null @@ -1,93 +0,0 @@ -body { - background-color: #eef; - color:#001; - font-family:"Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; -} - -.snarkTitle { - text-align: left; - float: left; - margin: 0px 0px 5px 5px; - display: inline; - font-size: 16pt; - font-weight: bold; -} -.snarkRefresh { - font-size: 10pt; -} -.snarkMessages { - border: none; - background-color: #ddf; - font-family: monospace; - font-size: 10pt; - font-weight: 100; - width: 100%; - text-align: left; - margin: 0px 0px 15px 15px; - border: 0px; - padding: 5px; - border-width: 0px; - border-spacing: 0px; - -moz-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; - border: 1px solid #001; -} -table { - margin: 0px 0px 0px 0px; - border: 0px; - padding: 0px; - border-width: 0px; - border-spacing: 0px; -} -th { - background-color: #C7D5D5; - padding: 5px; - font-size: 9pt; -} -td { - padding: 5px; -} -.snarkTorrentEven { - background-color: #E7E7E7; -} -.snarkTorrentOdd { - background-color: #DDDDCC; -} -.snarkNewTorrent { - font-size: 10pt; -} -.snarkAddInfo { - font-size: 10pt; - line-height: 130% !important; -} -.snarkConfigTitle { - font-size: 11pt; - font-weight: bold; -} -.snarkConfig { - font-size: 10pt; -} - -.page { - background-color: #fff; - color:#001; - margin: 20px; - padding: 20px 20px 0 20px; - -moz-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; - border: 1px solid #001; - font-size: 9pt !important; - line-height: 160% !important; - -moz-box-shadow: inset 0px 0px 1px 0px #002; - text-align: center; -} - -form { - line-height: 300% -} - -p { - line-height: 150% -} \ No newline at end of file diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java index d73b75765..5c1462b57 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -75,19 +75,20 @@ public class ConfigTunnelsHelper extends HelperBase { out.getQuantity() + out.getBackupQuantity() >= WARN_QUANTITY) buf.append("
PERFORMANCE WARNING - Settings include high tunnel quantities
\"Inbound\"  Inbound\"Outbound  Outbound
InboundOutbound
InboundOutbound
Depth
Depth
Randomization
Randomization
Quantity
Quantity
Backup quantity
Backup quantity
Inbound options:Inbound options:
Outbound options:Outbound options:
" + cfg.getReceiveTunnel().getTunnelId() +"" + cfg.getReceiveTunnel().getTunnelId() +"n/an/a" + netDbLink(cfg.getReceiveFrom()) +"  " + cfg.getSendTunnel().getTunnelId() +"" + cfg.getSendTunnel().getTunnelId() +"  " + netDbLink(cfg.getSendTo()) +"" + netDbLink(cfg.getSendTo()) +"   " + DataHelper.formatDuration(timeLeft) + "" + DataHelper.formatDuration(timeLeft) + "(grace period)" + cfg.getProcessedMessagesCount() + "KB(grace period)" + cfg.getProcessedMessagesCount() + "KB" + bps + "Bps" + bps + "BpsOutbound EndpointOutbound EndpointInbound GatewayInbound GatewayParticipantParticipant
\n"); - out.write("Inactive participating tunnels: " + inactive + "
\n"); - out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B
\n"); + out.write("
Inactive participating tunnels: " + inactive + "
\n"); + out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B

\n"); renderPeers(out); } @@ -542,23 +543,23 @@ public class TunnelPoolManager implements TunnelManagerFacade { continue; // don't display tunnels in their grace period live++; if (info.isInbound()) - out.write("
inbound
\"Inbound\"
outbound" + DataHelper.formatDuration(timeLeft) + "" + info.getProcessedMessagesCount() + "KB
\"Outbound\"" + DataHelper.formatDuration(timeLeft) + "" + info.getProcessedMessagesCount() + "KB" + (id == null ? "" : "" + id) + "" + (id == null ? "" : "" + id) + "" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + "" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + "  
\n"); for (Hash h : peerList) { - out.write("
PeerExpl. + Client% of totalPart. from + to% of total
"); + out.write("
"); out.write(netDbLink(h)); - out.write("" + lc.count(h)); - out.write(""); + out.write("" + lc.count(h)); + out.write(""); if (tunnelCount > 0) out.write("" + (lc.count(h) * 100 / tunnelCount)); else out.write('0'); - out.write("" + pc.count(h)); - out.write(""); + out.write("" + pc.count(h)); + out.write(""); if (partCount > 0) out.write("" + (pc.count(h) * 100 / partCount)); else out.write('0'); out.write('\n'); } - out.write("
Tunnels" + tunnelCount); - out.write(" " + partCount); - out.write(" 
\n"); + out.write("
Tunnels" + tunnelCount); + out.write(" " + partCount); + out.write(" 
\n"); } /** @return total number of non-fallback expl. + client tunnels */