merge of '8f40f2b7ad2272ecedca14c17598ecaf409340e8'

and 'da96c40b16f6e3f2e4e044f0f48cb53f1e9f2264'

installer/resources/readme/readme.html

@@ -13,23 +13,29 @@
   </div>
 </div>
 <div class="welcome"><h2>Welcome to the Invisible Internet</h2></div>
-<ul class="links"><li class="tidylist"><b>Starting Up&hellip;</b><br>If you've just started I2P, the number of <i>Active Peers</i> indicated under the <i>Peers Section</i> in the sidepanel on the left should start to grow over the next few minutes and you'll see a <i>Local Destination</i> named <i>Shared Clients</i> listed at the bottom of the lefthand sidepanel 
-   (if not, <a href="#trouble">see below</a>). The first time you start I2P it may take a few minutes to bootstrap you into the network and find additional peers to optimize your integration, so please be patient. Once green stars are indicated next to your <i>Local Destinations</i>, there is a wide variety of things you can do with I2P, and below we introduce you to some of them.</li></ul>
+<ul class="links"><li class="tidylist"><b>Starting Up&hellip;</b><br>If you've just started I2P, the number of <i>Active Peers</i> indicated under the <i>Peers Section</i> in the sidepanel on the left should start to grow over the next few minutes and you'll see a <i>Local Destination</i> named <i>Shared Clients</i> listed at the bottom of the lefthand sidepanel and possibly other clients and servers depending on how I2P is configured 
+   (if not, <a href="#trouble">see below</a>). These <i>Local Destinations</i> provide connections on different ports (and sometimes protocols) to the I2P network enabling your bittorrent, e-mail, web proxy and other services to function.</li> 
+
+<li class="tidylist"><b>Network integration</b><br> The first time you start I2P it may take a few minutes to bootstrap (integrate) you into the network and find additional peers to optimize your integration, so please be patient. Once green stars are indicated next to your <i>Local Destinations</i>, there is a wide variety of things you can do with I2P, and below we introduce you to some of them.</ul>
   
 <h3>Services on I2P</h3>
-<ul class="links"><li class="tidylist"><b>Anonymous File Transfer</b><br><a href="/i2psnark" target="_blank">I2PSnark</a> is integrated into I2P, providing anonymous, encrypted <a href="https://secure.wikimedia.org/wikipedia/en/wiki/BitTorrent_(protocol)" target="_blank">BitTorrent</a> transfers. In addition, Sponge develops a bittorrent client called <a href="http://bob.i2p/Robert.html">Robert</a> written in <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Python_%28programming_language%29" target="_blank">Python</a>. There is also a port of <a href="http://www.emule-project.net/" target="_blank">eMule</a> to I2P called <a href="http://echelon.i2p/imule">iMule</a> [Urgently needs developers!], a hookup into the <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Gnutella" target="_blank">Gnutella network</a> in the shape of <a href="http://echelon.i2p/i2phex/" target="_blank">I2Phex</a>, and additional facilities including web-based file hosting etc.</li>
-      <li class="tidylist"><b>Anonymous E-mail</b><br>Postman's I2P-based mail system can be accessed either via <a href="/susimail/">I2P's built-in webmail</a> (aka susimail) or using any mail client that supports smtp and pop3. Accounts can send and receive mail from the normal internet. For an account, visit <a href="http://hq.postman.i2p/" target="_blank">hq.postman.i2p</a>. Additionally, <a href="http://i2pbote.i2p/" target="_blank">I2P-Bote</a> is a new serverless, end-to-end encrypted e-mail system (with web interface) developed by HungryHobo, installable as a plugin.</li>
+<ul class="links">
+
+      <li class="tidylist"><b>Anonymous E-mail</b><br>Postman's I2P-based mail system can be accessed either via <a href="/susimail/">I2P's built-in webmail</a> (aka susimail) or using any mail client that supports smtp and pop3. Accounts can send and receive mail from the normal internet. For an account, visit <a href="http://hq.postman.i2p/" target="_blank">hq.postman.i2p</a>. Additionally, <a href="http://i2pbote.i2p/" target="_blank">I2P-Bote</a> is a new serverless, end-to-end encrypted e-mail system (with web interface) developed by HungryHobo, installable as a <a href="#plugins">plugin</a>.</li>
+
+<li class="tidylist"<b>Invisible Internet & Public Web Browsing</b><br>On I2P you can host anonymous websites (aka eepsites) and other services (eg. ssh over I2p, your own IRC server etc), and you can also access the normal web anonymously via I2P. <a href="http://www.i2p2.de/htproxyports.html" target="_blank">Configure your browser</a> to use the HTTP  <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Proxy_server " target="_blank">proxy</a> I2P provides at <code>127.0.0.1 port 4444</code>, then browse to an eepsite or a normal <code>http://</code> address. <a href="#eepsites">Below</a> we list some of the sites hosted on I2P.</li>
+
+<li class="tidylist"><b>Anonymous File Transfer</b><br><a href="/i2psnark" target="_blank">I2PSnark</a> is integrated into I2P, providing anonymous, encrypted <a href="https://secure.wikimedia.org/wikipedia/en/wiki/BitTorrent_(protocol)" target="_blank">BitTorrent</a> transfers. In addition, Sponge develops a bittorrent client called <a href="http://bob.i2p/Robert.html">Robert</a> written in Python. There is also a port of <a href="http://www.emule-project.net/" target="_blank">eMule</a> to I2P called <a href="http://echelon.i2p/imule">iMule</a> [Needs developers!], an anonymous, secure implementation of a <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Gnutella" target="_blank">Gnutella network</a>, accessible using <a href="http://echelon.i2p/i2phex/" target="_blank">I2Phex</a>, and additional facilities including browser-based file hosting etc.</li>
       <li class="tidylist"><b>Anonymous Chat</b><br>Start your IRC client (eg. chatzilla)
-        and connect to the <a href="irc://127.0.0.1:6668/i2p">server</a> at <code>127.0.0.1 port 6668</code>. Your local I2P IRC proxy on localhost:6668 will direct you to one of two IRC servers hosted on I2P by Postman and Badger, but neither you nor they know where the other is, and your mom, ISP or government is unable to intercept your conversation! Once you're there, #i2p, #i2p-help, #i2p-chat and #i2p-dev are just a few of the available channels you may wish to /join. There's also a I2P based <a href=http://echelon.i2p/qti2pmessenger>instant messenger</a> for unmonitorable, uncensorable, anonymous chat.</li>
-      <li class="tidylist"><b>Forums & Blogging</b><br><a href="http://syndie.i2p2.de/" target="_blank">Syndie</a> is a distributed forum and blogging platform for I2P [Urgently needs developers!]. There's also an I2P plugin port of the Java-based <a href="http://pebble.sourceforge.net/" target="_blank">pebble</a> blogging platform ported to I2P by zzz, available on <a href="http://i2plugins.i2p" target="_blank">i2plugins.i2p</a>. And of course all normal blogging, forum and cms software will run over I2P, though you're advised to take extra precautions with security when setting up and keep all associated software (eg. Php, MySql, Python, Apache etc) up to date and locked down!</li>
-      <li class="tidylist"><b>Plugins for I2P</b><br>Extend the usefulness of I2P by installing plugins&hellip; blogging, chatting, filesharing and other plugins have already been written or ported and await your <a href="http://i2plugins.i2p/plugins/" target="_blank">installation</a>! Browse the plugins and related info at <a href="http://i2plugins.i2p" target="_blank">i2plugins.i2p</a>. If you're a <a href="http://i2plugins.i2p/developers/" target="_blank">developer</a>, a complete language agnostic framework for writing your own plugins is provided with <a href="http://i2plugins.i2p/specs/" target="_blank">documentation</a>; I2P plugins can be coded in any language.
-      <li class="tidylist"<b>I2P Darknet & Public Web browsing</b><br>On I2P you can host anonymous websites (aka eepsites) and other services (eg. ssh over I2p, your own IRC server etc), and you can also access the normal web anonymously via I2P. Configure your browser to use the HTTP  <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Proxy_server " target="_blank">proxy</a> I2P provides at <code>127.0.0.1 port 4444</code>, then 
-    browse to an eepsite or a normal <code>http://</code> address. <a href="#eepsites">Below</a> we list some of the sites hosted on I2P.<br></ul>
+        and connect to the <a href="irc://127.0.0.1:6668/i2p">server</a> at <code>127.0.0.1 port 6668</code>. Your local I2P IRC proxy on localhost:6668 will direct you to one of two IRC servers hosted on I2P by Postman and Badger, but neither you nor they know where the other is, and your mom, ISP or government is unable to intercept your conversation! Once you're there, <code>#i2p</code>, <code>#i2p-help</code>, <code>#i2p-chat</code> and <code>#i2p-dev</code> are just a few of the available channels you may wish to /join. There's also a I2P based <a href=http://echelon.i2p/qti2pmessenger>instant messenger</a> for unmonitorable, uncensorable, anonymous chat.</li>
+      <li class="tidylist"><b>Forums & Blogging</b><br><a href="http://syndie.i2p2.de/" target="_blank">Syndie</a> is a distributed forum and blogging platform for I2P [Needs developers!]. There's also an I2P plugin port of the Java-based <a href="http://pebble.sourceforge.net/" target="_blank">pebble</a> blogging platform ported to I2P by zzz, available on <a href="http://i2plugins.i2p" target="_blank">i2plugins.i2p</a>. And of course all normal blogging, forum and cms software will run over I2P, though you're advised to take extra precautions with security when setting up and keep all associated software (eg. Php, MySql, Python, Apache etc) up to date and locked down! Also, there are quite a few forums running on I2P in various languages; see <a href="#eepsites">below</a> for some suggestions.</li>
+      <a name="plugins"></a><li class="tidylist"><b>Plugins for I2P</b><br>Extend the usefulness of I2P by installing plugins&hellip; blogging, chatting, filesharing and other plugins have already been written or ported and await your <a href="http://i2plugins.i2p/plugins/" target="_blank">installation</a>! Browse the plugins and related info at <a href="http://i2plugins.i2p" target="_blank">i2plugins.i2p</a>. If you're a <a href="http://i2plugins.i2p/developers/" target="_blank">developer</a>, a complete language agnostic framework for writing your own plugins is provided with <a href="http://i2plugins.i2p/specs/" target="_blank">documentation</a>; I2P plugins can be coded in any language.</li>
+<br></ul>
 
 <h3>Anonymous Encrypted Webserving on I2P</h3>
 <ul class="links">
 
-<li class="tidylist"><b>Ready to roll!</b><br>I2P comes built-in with a ready-to-go webserver for hosting your own anonymous website (eepsite) on the I2P <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Darknet_%28file_sharing%29" target="_blank">darknet</a>: a <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> instance listening on <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. To host your own content
+<li class="tidylist"><b>Ready to roll!</b><br>I2P comes built-in with a ready-to-go webserver for hosting your own anonymous website (eepsite) on the I2P network: a <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> instance listening on <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. To host your own content
   simply place your files in the <code>eepsite/docroot/</code> directory (or place 
   any standard JSP/Servlet <code>.war</code> files under <code>eepsite/webapps</code>, 
   or standard CGI script under <code>eepsite/cgi-bin</code>) and they'll show 
@@ -56,7 +62,7 @@ your eepsite will be visible (but not discoverable) to others. Detailed instruct
         Peer into the filesharing world of the <a href="http://freenetproject.org/" target="_blank">Freenet</a> darknet with Tino's I2P to Freenet proxy.</li>
         <li class="tidylist"><b>Eepsite Search Engine</b><br><a href="http://eepsites.i2p/" target="_blank">eepsites.i2p</a>: An 
         anonymously hosted eepsite search engine.</li>
-      <li class="tidylist"><b>Explore the darknet!</b><br>There are many more eepsites - just follow the links from the ones you see, 
+      <li class="tidylist"><b>Discover I2P</b><br>There are many more eepsites - just follow the links from the ones you see, 
       bookmark your favorites, and visit them often! There's a custom build of Firefox built especially for I2P called <a href="http://echelon.i2p/i2pfox/">I2PFox</a> you might like to investigate for locked down darknet exploration!</li>
     </ul>
 </ul>

installer/resources/themes/console/classic/console.css

@@ -304,7 +304,7 @@ div.main {
 }
 
 div.main ul {
-     margin: -10px 0 -10px -10px;
+     margin: -10px 0 10px -10px;
 }
 
 div.main li {

installer/resources/themes/console/dark/console.css

@@ -91,11 +91,10 @@ div.routersummaryouter {
 }
 
 div.routersummary {
-     width: 175px;
+     width: 173px;
      padding: 10px;
      text-align: center;
      border: 1px solid #494;
-     background: #000;
      background: #000 url(images/camotile2.png);
      color: #EE9;
      font-size: 8pt;
@@ -104,10 +103,9 @@ div.routersummary {
      -khtml-border-radius: 4px;
      border-radius: 4px;
      float: left;
-/*     -moz-box-shadow: inset 0px 0px 0px 0px #EE9;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #EE9;     
-     box-shadow: inset 0px 0px 1px 0px #EE9;*/
      -moz-box-shadow: 0 1px 5px #000;
+     -khtml-box-shadow: 0 1px 5px #000;
+     box-shadow: 0 1px 5px #000;
 }
 
 div.routersummary input[type=text] {
@@ -158,7 +156,7 @@ div.routersummary h4 {
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -5px -7px -5px -7px !important;
+     margin: -5px -7px -5px -8px !important;
      width: 188px !important;
      overflow: hidden;
      font-size: 8pt;
@@ -219,7 +217,7 @@ div.tunnels {
 }
 
 div.tunnels table {
-     margin: -5px 0 -5px -2px !important;
+     margin: -5px 0 -5px -3px !important;
 }
 
 div.tunnels td {
@@ -234,6 +232,7 @@ div.tunnels td:first-child {
 
 div.tunnels td:last-child {
      text-align: right;
+     padding-right: 1px;
 }
 
 div.tunnels tr {
@@ -315,7 +314,6 @@ div.news {
      padding: 5px 30px 10px 30px;
      border: 1px solid #494;
      background: #000;
-/*     background-image: -moz-linear-gradient(top, bottom, from(#030), to(#050), color-stop(30%, #030), color-stop(100%, #000));///*/
      background: #000 url("images/bg2.png")no-repeat scroll bottom right;
      color: #7b7;
      border-radius: 4px;
@@ -402,11 +400,11 @@ div.messages {
      background: #000  /*url('images/infotile.png') center left no-repeat;*/
      font-weight: bold;
      font-size: 9pt;
-     color: #ddf;
+     color: #4f4;
 }
 
 div.messages span.error {
-     color: #dd0;
+     color: #d90;
 }
 
 div.messages span.notice {
@@ -759,7 +757,7 @@ button:active {
 }
 
 .langbox img {
-     opacity: 0.7;
+     opacity: 0.5;
      -moz-box-shadow: 0 0 1px #000;
 }
 

installer/resources/themes/console/light/console.css

@@ -1,4 +1,6 @@
-/* I2P Console Theme "Corporat" by dr|z3d. Aka "light". As in beer.*/
+/* I2P Theme: Light */
+/* I2P Description: Light theme with soft blue highlights. */
+/* Author: dr|z3d */
 
 body {
      margin: 15px 0 0 10px;

installer/resources/themes/snark/vanilla/snark.css

@@ -98,13 +98,16 @@ body {
 }
 
 .snarkMessages a:link {
-     color: #37f !important;
+     color: #f60 !important;
 }
 
 .snarkMessages a:hover {
-     color: #59f !important;
+     color: #f90 !important;
 }
 
+.snarkMessages a:visited {
+     color: #d30 !important;
+}
 .logshim {
      margin-top: -10px !important;
 }
@@ -128,6 +131,7 @@ table {
      color: #323;
      width: 100%;
      opacity: 1 !important;
+     font-weight: bold;
 }
 
 tr { 
@@ -135,7 +139,7 @@ tr {
 }
 
 thead, tfoot {
-     text-shadow:0 1px 1px #b48;
+     text-shadow:0 1px 0px #930;
      background: url("images/bling.png") repeat-x scroll center center #867;
 }
 
@@ -234,7 +238,6 @@ td:first-child {
 }
 
 .snarkTorrentAction {
-     text-shadow:1px 1px #540;
      padding: 1px 1px 1px 1px !important;
      margin: 0 !important;
      text-align: center;
@@ -242,12 +245,9 @@ td:first-child {
 }
 
 .snarkTorrentAction img {
-     margin: 0 2px !important;
-     opacity: 0.6;
 }
 
 .snarkTorrentAction img:hover {
-     -moz-box-shadow: 0 0 1px 1px #f90;
      opacity: 1;
 }
 
@@ -327,7 +327,7 @@ td:first-child {
 .snarkFileSize {
      padding: 4px 2px;
      font-weight: bold;
-     color: #b6b !important;
+     color: #727 !important;
 }
 
 .snarkFileStatus {
@@ -341,7 +341,7 @@ td:first-child {
 .snarkTorrentETA {
      font-weight: bold;
      font-style: italic;
-     color: #dd7 !important;
+     color: #505 !important;
 }
 
 .thumb {
@@ -381,7 +381,7 @@ td:first-child {
 }
 
 .page {
-     background: #fff; /*url('/themes/snark/ubergine/images/tile2.png');*/
+     background: #fff url('images/tile2.png');
      color: #310;
      min-width: 970px !important;
      margin: 5px 0 0 0;
@@ -418,20 +418,20 @@ hr {
 }
 
 a:link {
-     color: #903;
+     color: #742;
      text-decoration: none;
      font-weight: bold;
      word-wrap: break-word;
 }
 
 a:visited {
-     color: #703;
+     color: #962;
      text-decoration: none;
      font-weight: bold;
 }
 
 a:hover {
-     color: #b06
+     color: #f30;
      font-weight: bold;
 }
 
@@ -456,18 +456,20 @@ input.r {
 
 input[type=submit] {
      text-shadow: 0px 0px #410;
-     color: #000;
+     color: #f30;
      background: #fff;
      border: 1px outset #bbb;
      padding: 2px;
+     background: #fef url('images/bling.png') repeat-x scroll center center;
 }
 
 input[type=submit]:hover {
      border: 1px inset #bbb;
      text-shadow: 0 0;	 
      background: #fef;
-     color: #fff;
-     text-shadow: 0px 1px 1px #513;
+     color: #f60;
+     background: #fef url('images/bling2.png') repeat-x scroll center center;
+
 }
 
 input[type=submit]:active {
@@ -487,7 +489,6 @@ input[type=image] {
 }
 
 input[type=image]:hover {
-     border: 1px outset #bbb;
 }
 
 input[type=text]:active, input[type=text]:hover, input.r:hover {
@@ -589,7 +590,7 @@ div.newtorrentsection {
      -khtml-box-shadow: inset 0px 0px 1px 0px #fff;
      box-shadow: inset 0px 0px 1px 0px #fff;
      word-wrap: break-word;
-     background: #fef url('/themes/snark/ubergine/images/snark_create.png') no-repeat scroll right center;
+     background: #ffd url('/themes/snark/ubergine/images/snark_create.png') no-repeat scroll right center;
      opacity: 1.0;
 }
 
@@ -606,7 +607,7 @@ div.addtorrentsection {
      -khtml-box-shadow: inset 0px 0px 1px 0px #fff;
      box-shadow: inset 0px 0px 1px 0px #fff;
      word-wrap: break-word;
-     background: #fef url('/themes/snark/ubergine/images/snark_add.png') no-repeat scroll right center;
+     background: #ffd url('/themes/snark/ubergine/images/snark_add.png') no-repeat scroll right center;
      opacity: 1.0;
 }
 
@@ -623,7 +624,7 @@ div.configsection {
      box-shadow: inset 0px 0px 1px 0px #fff;
      word-wrap: break-word;
      text-align: center;
-     background: #fef;
+     background: #ffd;
      font-weight: bold;
 }
 
@@ -640,7 +641,7 @@ div.configsectionpanel {
      box-shadow: inset 0px 0px 1px 0px #fff;
      word-wrap: break-word;
      text-align: center;
-     background: #fef url('/themes/snark/ubergine/images/configuration.png') no-repeat scroll right center;
+     background: #ffd url('/themes/snark/ubergine/images/configuration.png') no-repeat scroll right center;
      font-weight: bold;
 }