Changeset b4256e4


Ignore:
Timestamp:
Jul 22, 2009 9:07:46 PM (11 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
64ece108
Parents:
b0ea204b
Message:

I2PSnark layout, themes, tunnel tables..

Files:
2 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

    rb0ea204b rb4256e4  
    699699//       , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
    700700//       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
    701        "welterde", "http://BGKmlDOoH3RzFbPRfRpZV2FjpVj8~3moFftw5-dZfDf2070TOe8Tf2~DAVeaM6ZRLdmFEt~9wyFL8YMLMoLoiwGEH6IGW6rc45tstN68KsBDWZqkTohV1q9XFgK9JnCwE~Oi89xLBHsLMTHOabowWM6dkC8nI6QqJC2JODqLPIRfOVrDdkjLwtCrsckzLybNdFmgfoqF05UITDyczPsFVaHtpF1sRggOVmdvCM66otyonlzNcJbn59PA-R808vUrCPMGU~O9Wys0i-NoqtIbtWfOKnjCRFMNw5ex4n9m5Sxm9e20UkpKG6qzEuvKZWi8vTLe1NW~CBrj~vG7I3Ok4wybUFflBFOaBabxYJLlx4xTE1zJIVxlsekmAjckB4v-cQwulFeikR4LxPQ6mCQknW2HZ4JQIq6hL9AMabxjOlYnzh7kjOfRGkck8YgeozcyTvcDUcUsOuSTk06L4kdrv8h2Cozjbloi5zl6KTbj5ZTciKCxi73Pn9grICn-HQqEAAAA.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
    702701//       , "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/"
    703702//       , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
    704        , "crstrack", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
    705        , "PaTracker", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
     703       "POSTMAN", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
     704       ,"WELTERDE", "http://BGKmlDOoH3RzFbPRfRpZV2FjpVj8~3moFftw5-dZfDf2070TOe8Tf2~DAVeaM6ZRLdmFEt~9wyFL8YMLMoLoiwGEH6IGW6rc45tstN68KsBDWZqkTohV1q9XFgK9JnCwE~Oi89xLBHsLMTHOabowWM6dkC8nI6QqJC2JODqLPIRfOVrDdkjLwtCrsckzLybNdFmgfoqF05UITDyczPsFVaHtpF1sRggOVmdvCM66otyonlzNcJbn59PA-R808vUrCPMGU~O9Wys0i-NoqtIbtWfOKnjCRFMNw5ex4n9m5Sxm9e20UkpKG6qzEuvKZWi8vTLe1NW~CBrj~vG7I3Ok4wybUFflBFOaBabxYJLlx4xTE1zJIVxlsekmAjckB4v-cQwulFeikR4LxPQ6mCQknW2HZ4JQIq6hL9AMabxjOlYnzh7kjOfRGkck8YgeozcyTvcDUcUsOuSTk06L4kdrv8h2Cozjbloi5zl6KTbj5ZTciKCxi73Pn9grICn-HQqEAAAA.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
     705       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
     706
    706707    };
    707708   
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    rb0ea204b rb4256e4  
    8383        out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + peerString + "\">\n");
    8484        out.write(HEADER);
    85        
    86 out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" valign=\"top\" class=\"snarkTitle\">I2PSnark<br>Anonymous BitTorrent Client for I2P<hr /></hr></td></tr>");
     85        out.write("</head><body>");
     86        out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" valign=\"top\" class=\"snarkTitle\">I2PSnark<br>Anonymous BitTorrent Client for I2P<hr /></hr></td></tr>");
    8787        out.write("<tr><td align=\"center\"><a href=\"" + req.getRequestURI() + peerString + "\" class=\"snarkRefresh\">Refresh</a>");
    8888        out.write(" | <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\">Forum</a>\n");
     
    9999        }
    100100        out.write("</table>\n");
    101         out.write("<div class=\"snarkMessages\"><table><tr><td valign=\"top\" align=\"left\"><pre>");
     101        out.write("<div class=\"section\"><div class=\"snarkMessages\"><table><tr><td valign=\"top\" align=\"left\"><pre>");
    102102        List msgs = _manager.getMessages();
    103103        for (int i = msgs.size()-1; i >= 0; i--) {
     
    105105            out.write(msg + "\n");
    106106        }
    107         out.write("</pre></td></tr></table></div>\n");
     107        out.write("</pre></td></tr></table></div>");
    108108
    109109        List snarks = getSortedSnarks(req);
     
    654654        out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
    655655        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
    656         out.write("<span class=\"snarkConfigTitle\">Add Torrent:</span><br />\n");
     656        out.write("<div class=\"section\"><span class=\"snarkConfigTitle\">Add Torrent:</span><br />\n");
    657657        out.write("From URL&nbsp;: <input type=\"text\" name=\"newURL\" size=\"80\" value=\"" + newURL + "\" /> \n");
    658658        // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
     
    661661        out.write("<span class=\"snarkAddInfo\">Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "<br />\n");
    662662        out.write("Removing that .torrent file will cause the torrent to stop.<br /></span>\n");
    663         out.write("</form>\n</span>\n"); 
     663        out.write("</form>\n</span></div>"); 
    664664    }
    665665   
     
    670670            baseFile = "";
    671671       
    672         out.write("<span class=\"snarkNewTorrent\"><hr />\n");
     672        out.write("<div class=\"section\"><span class=\"snarkNewTorrent\">\n");
    673673        // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
    674674        out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
     
    694694                  "title=\"Custom tracker URL\" /> ");
    695695        out.write("<input type=\"submit\" value=\"Create torrent\" name=\"action\" />\n");
    696         out.write("</form>\n</span>\n");       
     696        out.write("</form>\n</span></div>");       
    697697    }
    698698   
     
    706706       
    707707        out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
    708         out.write("<span class=\"snarkConfig\"><hr />\n");
     708        out.write("<div class=\"section\"><span class=\"snarkConfig\">\n");
    709709        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
    710710        out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");
     
    744744                  + openTrackers + "\" size=\"50\" /><br />\n");
    745745
    746         //out.write("<hr />\n");
     746        //out.write("\n");
    747747        out.write("EepProxy host: <input type=\"text\" name=\"eepHost\" value=\""
    748748                  + _manager.util().getEepProxyHost() + "\" size=\"15\" /> ");
     
    765765        out.write("<input type=\"submit\" value=\"Save configuration\" name=\"action\" />\n");
    766766        out.write("</span>\n");
    767         out.write("</form>\n");
     767        out.write("</form></div>");
    768768    }
    769769   
     
    782782    private static final String HEADER_BEGIN = "<html>\n" +
    783783                                               "<head>\n" +
    784                                                "<title>I2PSnark - anonymous bittorrent</title>\n";
     784                                               "<title>I2PSnark - Anonymous BitTorrent Client</title>\n";
    785785                                         
    786786    private static final String HEADER = "<link href=\"../themes/console/snark.css\" rel=\"stylesheet\" type=\"text/css\" />";
     
    801801   private static final String TABLE_EMPTY  = "<tr class=\"snarkTorrentEven\">" +
    802802                                              "<td class=\"snarkTorrentEven\" align=\"center\"" +
    803                                               "    valign=\"top\" colspan=\"8\"><i>No torrents</i></td></tr>\n";
    804 
    805     private static final String TABLE_FOOTER = "</table>\n";
    806    
    807     private static final String FOOTER = "</div></div></body></html>";
     803                                              "    valign=\"top\" colspan=\"8\"><i>No torrents loaded.</i></td></tr>\n";
     804
     805    private static final String TABLE_FOOTER = "</table></div>\n";
     806   
     807    private static final String FOOTER = "</div></div></div></body></html>";
    808808
    809809/** inner class, don't bother reindenting */
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java

    rb0ea204b rb4256e4  
    7676            buf.append("<tr><th colspan=\"3\"><font color=\"red\">PERFORMANCE WARNING - Settings include high tunnel quantities</font></th></tr>");
    7777
     78buf.append("<tr><th></th><th><img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"Inbound Tunnels\"/>&nbsp;&nbsp;Inbound</th><th><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound Tunnels\" title=\"Outbound\"/>&nbsp;&nbsp;Outbound</th></tr>\n");
    7879
    79         buf.append("<tr><th></th><th>Inbound</th><th>Outbound</th></tr>\n");
     80//        buf.append("<tr><th></th><th>Inbound</th><th>Outbound</th></tr>\n");
    8081       
    8182        // tunnel depth
    82         buf.append("<tr><td>Depth</td>\n");
    83         buf.append("<td><select name=\"").append(index).append(".depthInbound\">\n");
     83        buf.append("<tr><td align=\"right\">Depth</td>\n");
     84        buf.append("<td align=\"center\"><select name=\"").append(index).append(".depthInbound\">\n");
    8485        int now = in.getLength();
    8586        renderOptions(buf, 0, MAX_LENGTH, now, "", "hop");
     
    8889        buf.append("</select></td>\n");
    8990
    90         buf.append("<td><select name=\"").append(index).append(".depthOutbound\">\n");
     91        buf.append("<td align=\"center\"><select name=\"").append(index).append(".depthOutbound\">\n");
    9192        now = out.getLength();
    9293        renderOptions(buf, 0, MAX_LENGTH, now, "", "hop");
     
    9798
    9899        // tunnel depth variance
    99         buf.append("<tr><td>Randomization</td>\n");
    100         buf.append("<td><select name=\"").append(index).append(".varianceInbound\">\n");
     100        buf.append("<tr><td align=\"right\">Randomization</td>\n");
     101        buf.append("<td align=\"center\"><select name=\"").append(index).append(".varianceInbound\">\n");
    101102        now = in.getLengthVariance();
    102103        renderOptions(buf, 0, 0, now, "", "hop");
     
    109110        buf.append("</select></td>\n");
    110111
    111         buf.append("<td><select name=\"").append(index).append(".varianceOutbound\">\n");
     112        buf.append("<td align=\"center\"><select name=\"").append(index).append(".varianceOutbound\">\n");
    112113        now = out.getLengthVariance();
    113114        renderOptions(buf, 0, 0, now, "", "hop");
     
    121122
    122123        // tunnel quantity
    123         buf.append("<tr><td>Quantity</td>\n");
    124         buf.append("<td><select name=\"").append(index).append(".quantityInbound\">\n");
     124        buf.append("<tr><td align=\"right\">Quantity</td>\n");
     125        buf.append("<td align=\"center\"><select name=\"").append(index).append(".quantityInbound\">\n");
    125126        now = in.getQuantity();
    126127        renderOptions(buf, 1, MAX_QUANTITY, now, "", "tunnel");
     
    129130        buf.append("</select></td>\n");
    130131
    131         buf.append("<td><select name=\"").append(index).append(".quantityOutbound\">\n");
     132        buf.append("<td align=\"center\"><select name=\"").append(index).append(".quantityOutbound\">\n");
    132133        now = out.getQuantity();
    133134        renderOptions(buf, 1, MAX_QUANTITY, now, "", "tunnel");
     
    138139
    139140        // tunnel backup quantity
    140         buf.append("<tr><td>Backup quantity</td>\n");
    141         buf.append("<td><select name=\"").append(index).append(".backupInbound\">\n");
     141        buf.append("<tr><td align=\"right\">Backup quantity</td>\n");
     142        buf.append("<td align=\"center\"><select name=\"").append(index).append(".backupInbound\">\n");
    142143        now = in.getBackupQuantity();
    143144        renderOptions(buf, 0, MAX_BACKUP_QUANTITY, now, "", "tunnel");
     
    146147        buf.append("</select></td>\n");
    147148
    148         buf.append("<td><select name=\"").append(index).append(".backupOutbound\">\n");
     149        buf.append("<td align=\"center\"><select name=\"").append(index).append(".backupOutbound\">\n");
    149150        now = out.getBackupQuantity();
    150151        renderOptions(buf, 0, MAX_BACKUP_QUANTITY, now, "", "tunnel");
     
    155156
    156157        // custom options
    157         buf.append("<tr><td>Inbound options:</td>\n");
    158         buf.append("<td colspan=\"2\"><input name=\"").append(index);
    159         buf.append(".inboundOptions\" type=\"text\" size=\"40\" ");
     158        buf.append("<tr><td align=\"right\">Inbound options:</td>\n");
     159        buf.append("<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
     160        buf.append(".inboundOptions\" type=\"text\" size=\"32\" ");
    160161        buf.append("value=\"");
    161162        Properties props = in.getUnknownOptions();
     
    166167        }
    167168        buf.append("\"/></td></tr>\n");
    168         buf.append("<tr><td>Outbound options:</td>\n");
    169         buf.append("<td colspan=\"2\"><input name=\"").append(index);
    170         buf.append(".outboundOptions\" type=\"text\" size=\"40\" ");
     169        buf.append("<tr><td align=\"right\">Outbound options:</td>\n");
     170        buf.append("<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
     171        buf.append(".outboundOptions\" type=\"text\" size=\"32\" ");
    171172        buf.append("value=\"");
    172173        props = in.getUnknownOptions();
     
    177178        }
    178179        buf.append("\"/></td></tr>\n");
    179         buf.append("<tr><td colspan=\"3\"><hr /></td></tr>\n");
     180//        buf.append("<tr><td colspan=\"3\"><hr /></td></tr>\n");
    180181    }
    181182
  • apps/routerconsole/jsp/configui.jsp

    rb0ea204b rb4256e4  
    3939</form>
    4040<% } else { %>
    41 Theme selection disabled for Internet Explorer, sorry.
     41Theme selection disabled for Internet Explorer, sorry.<hr>If you're not using IE, it's likely that
     42your 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.
    4243<% } %>
    4344</div>
  • apps/routerconsole/jsp/summarynoframe.jsp

    rb0ea204b rb4256e4  
    2929<a href="susimail/susimail" target="blank">Susimail</a>
    3030<a href="susidns/index.jsp" target="_blank">SusiDNS</a>
    31 <a href="i2psnark/" target="_blank">I2PSnark</a>
    32 <a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a><hr />
     31<a href="i2psnark/" target="_blank">Torrents</a>
     32<a href="http://127.0.0.1:7658/" target="_blank">Webserver</a><hr />
    3333<u><b>I2P Internals</b></u><br />
    3434<a href="i2ptunnel/index.jsp" target="_blank">I2PTunnel</a>
  • installer/resources/themes/console/classic/console.css

    rb0ea204b rb4256e4  
    5050div.routersummary {
    5151     background: #fafaff;
    52      width: 200px;
     52     width: 175px;
    5353     color: inherit;
    5454     margin: 0em;
     
    5757     border: medium solid #efefff;
    5858     font-size: 0.82em;
     59     word-wrap: break-word;
    5960}
    6061
  • installer/resources/themes/console/dark/console.css

    rb0ea204b rb4256e4  
    116116     background-repeat:no-repeat;
    117117     -moz-box-shadow: inset 0px 0px 0px 1px #f00;
     118     word-wrap: break-word;
    118119}
    119120
     
    154155     padding: 5px;
    155156     vertical-align: middle;
     157     word-wrap: break-word;
    156158}
    157159
     
    171173
    172174div.configure {
    173      padding: 0 15px;
     175     padding: 0 15px 15px 15px;
    174176     margin: 10px 0px;
    175177     background: #005;
     
    221223
    222224th {
    223      padding: 4px;
     225     padding: 8px;
    224226     color: #eef;
    225227     text-align: center;
     
    241243     vertical-align: middle;
    242244}
    243 
     245/*
    244246tr:last-child {
    245247     background: #004 url('images/lightbluetile.png') !important;
     
    247249     border: 1px solid #99f !important;
    248250}
    249 
     251*/
    250252td {
    251253     padding: 5px 10px;
    252254     color: #eef;
    253      text-align: left;
    254255     vertical-align: middle;
    255256}
     
    267268     padding: 1px 20px 1px 0px;
    268269     line-height: 150%;
     270     word-wrap: break-word;
    269271}
    270272
     
    292294a:link, h2 a:link{
    293295     color: #99f;
     296     text-decoration: none;
     297     font-weight: bold;     
     298     word-wrap: break-word;
    294299}
    295300
     
    350355     margin: 25px 0 20px 0 !important;
    351356     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
     357     word-wrap: break-word;
    352358}
    353359
     
    442448     text-decoration: none;
    443449     min-width: 110px;
     450     opacity: 0.8;
    444451}
    445452
  • installer/resources/themes/console/light/console.css

    rb0ea204b rb4256e4  
    3636     background: #ddddff url('images/lightbluetile.png');
    3737     width: 175px;
    38      -moz-box-shadow: inset 0px 0px 16px 1px #eef;
     38     -moz-box-shadow: inset 0px 0px 1px 0px #002;
    3939}
    4040
     
    8787div.routersummary {
    8888/*  margin: 0px 20px 20px 0px; */
    89      width: auto;
     89     width: 175px;
    9090     padding: 10px;
    9191     text-align: center;
    9292     border: 1px solid #000033;
    93      background: #ddddff url('images/lightbluetile.png');
     93     background: #ddf url('images/lightbluetile.png');
    9494     color: #000;
    9595     font-size: 8pt;
     
    9898     -khtml-border-radius: 4px;
    9999     border-radius: 4px;
     100/*
    100101     float: left;
     102*/     
    101103     -moz-box-shadow: inset 0px 0px 1px 0px #002;
    102104}
     
    117119     background-repeat:no-repeat;
    118120     -moz-box-shadow: inset 0px 0px 1px 0px #d00;
     121     word-wrap: break-word;
    119122}
    120123
     
    215218
    216219div.configure {
    217      padding: 0 15px !important;
     220     padding: 0 15px 15px 15px !important;
    218221     margin: 10px 0px 25px 0;
    219222     background: #ddf url('images/lightbluetile.png');
     
    266269
    267270th {
    268      padding: 4px;
     271     padding: 8px;
    269272     color: #000;
    270273     background: #b4c8ff url('images/tabletitlelight.png') repeat-x;
    271274     text-align: center;
    272      font-size: 8pt;
     275     font-size: 9pt;
    273276}
    274277
     
    294297     padding: 5px;
    295298     color: #000;
    296      text-align: left;
     299     vertical-align: middle;
    297300}
    298301
     
    309312     padding: 1px 20px 1px 10px;
    310313     line-height: 150%;
     314     word-wrap: break-word;
    311315}
    312316
     
    339343     text-decoration: none;
    340344     font-weight: bold;
     345     word-wrap: break-word;
    341346}
    342347
     
    396401     margin: 25px 0 20px 0 !important;
    397402     -moz-box-shadow: inset 0px 0px 1px 0px #002;
     403     word-wrap: break-word;
    398404}
    399405
     
    472478input {
    473479     background: #eef;
    474      color: #003;
     480     color: #001;
    475481     margin: 5px 10px 5px 10px;
    476482     padding: 4px 2px;
     
    479485     text-decoration: none;
    480486     min-width: 110px;
     487     opacity: 0.8;
    481488}
    482489
     
    485492     color: #fff;
    486493     border: 1px solid #f60;
     494     opacity: 0.9;
    487495}
    488496
     
    491499     color: #f60;
    492500     border: 1px solid #f60;
     501     opacity: 1.0;
    493502}
    494503
  • installer/resources/themes/console/snark.css

    rb0ea204b rb4256e4  
    66}
    77
    8 /*
    98.snarkTitle {
    10         text-align: left;
    11         float: left;
    12         margin: 0px 0px 5px 5px;
    13         display: inline;
    14         font-size: 16pt;
    15         font-weight: bold;
    16 }
    17 */
    18 
    19 .snarkTitle {
    20         font-size: 16pt;
     9        font-size: 12pt;
    2110        font-weight: bold;
    2211        text-align: center;
     
    2817
    2918.snarkMessages {
    30         border: none;
    31   background-color: #9f9;
    32   font-family: monospace;
    33   font-size: 10pt;
     19  background-color: #fe9;
     20  font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono !important;
     21  font-size: 9pt;
    3422  font-weight: bold;
    35 /*  width: 100%; */
    3623  text-align: left;
    3724  margin: 0 0 15px 0;
    3825  border: 0px;
    3926  padding: 5px;
    40   border-width: 0px;
    4127  border-spacing: 0px;
    4228  -moz-border-radius: 4px;
     
    4430  border-radius: 4px;
    4531  border: 2px inset #770;
    46   overflow-x: scroll;
     32  text-align: center;
     33}
     34
     35pre {
     36  font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono !important;
     37  width: 100%;
     38  font-size: 8pt;
     39  padding: 0;
    4740}
    4841
     
    5548}
    5649th {
    57         background-color: #C7D5D5;
     50        background-color: #f91;
    5851        padding: 5px;
    5952  font-size: 9pt;
    6053}
     54
     55.SnarkTorrents {
     56        margin: 0;
     57        border: 1px solid #001;
     58}
     59
    6160td {
    6261        padding: 5px;
    6362}
    6463.snarkTorrentEven {
    65         background-color: #bbf;
     64        background-color: #fb1;
    6665  font-size: 8pt;
    6766}
    6867.snarkTorrentOdd {
    69         background-color: #ddf;
     68        background-color: #fa1;
    7069  font-size: 8pt;
    7170}
     
    8483
    8584.snarkConfig {
    86  font-size: 10pt;
     85  font-size: 10pt;
    8786}
    8887
     
    9190        color:#001;
    9291  margin: 20px;
    93   padding: 20px 20px 0 20px;
     92  padding: 0 20px 5px 20px;
    9493  -moz-border-radius: 4px;
    9594  -khtml-border-radius: 4px;
     
    103102
    104103form {
    105   line-height: 300%
     104  line-height: 250%
    106105}
    107106
     
    113112  padding 5px;
    114113}
     114
     115hr {
     116  color: #003;
     117  background: #003;
     118  height: 1px;
     119  border: 0px solid #003;
     120  margin: 5px 0;
     121}
     122
     123div.section {
     124  margin: 20px 0 0 0;
     125  padding: 10px;
     126  background: #ffe;
     127  border: 1px solid #001;
     128  text-align: left;
     129  color: #001;
     130  -moz-border-radius: 4px;
     131  -khtml-border-radius: 4px;
     132  border-radius: 4px;
     133  -moz-box-shadow: inset 0px 0px 1px 0px #002;
     134  word-wrap: break-word;
     135  text-align: center;
     136}
  • router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java

    rb0ea204b rb4256e4  
    456456            out.write("<tr>");
    457457            if (cfg.getReceiveTunnel() != null)
    458                 out.write("<td>" + cfg.getReceiveTunnel().getTunnelId() +"</td>");
    459             else
    460                 out.write("<td>n/a</td>");
     458                out.write("<td align=\"center\">" + cfg.getReceiveTunnel().getTunnelId() +"</td>");
     459            else
     460                out.write("<td align=\"center\">n/a</td>");
    461461            if (cfg.getReceiveFrom() != null)
    462462                out.write("<td align=\"right\">" + netDbLink(cfg.getReceiveFrom()) +"</td>");
    463463            else
    464                 out.write("<td>&nbsp;</td>");
     464                out.write("<td align=\"center\">&nbsp;</td>");
    465465            if (cfg.getSendTunnel() != null)
    466                 out.write("<td>" + cfg.getSendTunnel().getTunnelId() +"</td>");
    467             else
    468                 out.write("<td>&nbsp;</td>");
     466                out.write("<td align=\"center\">" + cfg.getSendTunnel().getTunnelId() +"</td>");
     467            else
     468                out.write("<td align=\"center\">&nbsp;</td>");
    469469            if (cfg.getSendTo() != null)
    470                 out.write("<td align=\"right\">" + netDbLink(cfg.getSendTo()) +"</td>");
    471             else
    472                 out.write("<td>&nbsp;</td>");
     470                out.write("<td align=\"center\">" + netDbLink(cfg.getSendTo()) +"</td>");
     471            else
     472//                out.write("<td align=\"center\">&nbsp;</td>");
     473                out.write("<td align=\"center\">&nbsp;</td>");
    473474            long timeLeft = cfg.getExpiration()-_context.clock().now();
    474475            if (timeLeft > 0)
    475                 out.write("<td align=right>" + DataHelper.formatDuration(timeLeft) + "</td>");
    476             else
    477                 out.write("<td align=right>(grace period)</td>");
    478             out.write("<td align=right>" + cfg.getProcessedMessagesCount() + "KB</td>");
     476                out.write("<td align=\"center\">" + DataHelper.formatDuration(timeLeft) + "</td>");
     477            else
     478                out.write("<td align=\"center\">(grace period)</td>");
     479            out.write("<td align=\"center\">" + cfg.getProcessedMessagesCount() + "KB</td>");
    479480            int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000);
    480481            if (lifetime <= 0)
     
    483484                lifetime = 10*60;
    484485            int bps = 1024 * (int) cfg.getProcessedMessagesCount() / lifetime;
    485             out.write("<td align=right>" + bps + "Bps</td>");
     486            out.write("<td align=\"center\">" + bps + "Bps</td>");
    486487            if (cfg.getSendTo() == null)
    487                 out.write("<td>Outbound Endpoint</td>");
     488                out.write("<td align=\"center\">Outbound Endpoint</td>");
    488489            else if (cfg.getReceiveFrom() == null)
    489                 out.write("<td>Inbound Gateway</td>");
    490             else
    491                 out.write("<td>Participant</td>");
     490                out.write("<td align=\"center\">Inbound Gateway</td>");
     491            else
     492                out.write("<td align=\"center\">Participant</td>");
    492493            out.write("</tr>\n");
    493494            processed += cfg.getProcessedMessagesCount();
    494495        }
    495496        out.write("</table>\n");
    496         out.write("Inactive participating tunnels: " + inactive + "<br />\n");
    497         out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B<br />\n");
     497        out.write("<center>Inactive participating tunnels: " + inactive + "<br />\n");
     498        out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B</center><br />\n");
    498499        renderPeers(out);
    499500    }
     
    543544            live++;
    544545            if (info.isInbound())
    545                 out.write("<tr><td><b>inbound</b></td>");
    546             else
    547                 out.write("<tr><td><b>outbound</b></td>");
    548             out.write("<td align=right>" + DataHelper.formatDuration(timeLeft) + "</td>\n");
    549             out.write("<td align=right>" + info.getProcessedMessagesCount() + "KB</td>\n");
     546                out.write("<tr><td align=\"center\"><img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"Inbound\"/></td>");
     547            else
     548                out.write("<tr><td align=\"center\"><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"/></td>");
     549            out.write("<td align=\"center\">" + DataHelper.formatDuration(timeLeft) + "</td>\n");
     550            out.write("<td align=\"center\">" + info.getProcessedMessagesCount() + "KB</td>\n");
    550551            for (int j = 0; j < info.getLength(); j++) {
    551552                Hash peer = info.getPeer(j);
    552553                TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j));
    553554                if (_context.routerHash().equals(peer)) {
    554                     out.write("<td>" + (id == null ? "" : "" + id) + "</td>");
     555                    out.write("<td align=\"center\">" + (id == null ? "" : "" + id) + "</td>");
    555556                } else {
    556557                    String cap = getCapacity(peer);
    557                     out.write("<td>" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + "</td>");               
     558                    out.write("<td align=\"center\">" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + "</td>");               
    558559                }
    559560                if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) {
    560561                    for (int k = info.getLength(); k < maxLength; k++)
    561                         out.write("<td>&nbsp</td>");
     562                        out.write("<td align=\"center\">&nbsp</td>");
    562563                }
    563564            }
     
    573574            List pending = in.listPending();
    574575            if (pending.size() > 0)
    575                 out.write("Build in progress: " + pending.size() + " inbound<br />\n");
     576                out.write("<center>Build in progress: " + pending.size() + " inbound</center><br />\n");
    576577            live += pending.size();
    577578        }
     
    579580            List pending = outPool.listPending();
    580581            if (pending.size() > 0)
    581                 out.write("Build in progress: " + pending.size() + " outbound<br />\n");
     582                out.write("<center>Build in progress: " + pending.size() + " outbound</center><br />\n");
    582583            live += pending.size();
    583584        }
    584585        if (live <= 0)
    585             out.write("<b>No tunnels, waiting for the grace period to end</b><br />\n");
    586         out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " +
    587                   DataHelper.formatSize(processedOut*1024) + "B out<br />");
     586            out.write("<b><center>No tunnels, waiting for the grace period to end.</center></b><br />\n");
     587        out.write("<center>Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " +
     588                  DataHelper.formatSize(processedOut*1024) + "B out</center><br />");
    588589    }
    589590   
     
    605606        out.write("<table border=\"1\"><tr><th>Peer</th><th>Expl. + Client</th><th>% of total</th><th>Part. from + to</th><th>% of total</th></tr>\n");
    606607        for (Hash h : peerList) {
    607              out.write("<tr><td align=\"right\">");
     608             out.write("<tr><td align=\"center\">");
    608609             out.write(netDbLink(h));
    609              out.write("<td align=\"right\">" + lc.count(h));
    610              out.write("<td align=\"right\">");
     610             out.write("<td align=\"center\">" + lc.count(h));
     611             out.write("<td align=\"center\">");
    611612             if (tunnelCount > 0)
    612613                 out.write("" + (lc.count(h) * 100 / tunnelCount));
    613614             else
    614615                 out.write('0');
    615              out.write("<td align=\"right\">" + pc.count(h));
    616              out.write("<td align=\"right\">");
     616             out.write("<td align=\"center\">" + pc.count(h));
     617             out.write("<td align=\"center\">");
    617618             if (partCount > 0)
    618619                 out.write("" + (pc.count(h) * 100 / partCount));
     
    621622             out.write('\n');
    622623        }
    623         out.write("<tr><td>Tunnels<td align=\"right\">" + tunnelCount);
    624         out.write("<td>&nbsp;<td align=\"right\">" + partCount);
    625         out.write("<td>&nbsp;</table>\n");
     624        out.write("<tr><td align=\"center\"><b>Tunnels</b><td align=\"center\"><b>" + tunnelCount);
     625        out.write("</b><td align=\"center\">&nbsp;<td align=\"center\"><b>" + partCount);
     626        out.write("<td align=\"center\">&nbsp;</b></table>\n");
    626627    }
    627628
Note: See TracChangeset for help on using the changeset viewer.