diff --git a/LICENSE.txt b/LICENSE.txt
index e3b631a3bae576f9d09254ddcc45e485b719babf..f36fa5a439b668d3d94e2eace040e070d0a5ec7e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -241,6 +241,6 @@ distributions. See the source package for the additional license information.
SAM Python Library:
Public domain.
- I2PSnark:
- "Man with hat over face" graphic licensed under a Creative Commons 2.0 license.
- Original photo by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
+ I2PSnark/Console themes:
+ "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
+ Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 0640c2a3107f5c6c24e8bacdc7f4442276683e15..2035f4627963baa237cb09a13ed5a19804b93331 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -226,7 +226,7 @@ public class IndexBean {
// give the messages a chance to make it to the window
try { Thread.sleep(1000); } catch (InterruptedException ie) {}
// and give them something to look at in any case
- return _("Starting tunnel") + ' ' + getTunnelName(_tunnel) + " &hellip";
+ return _("Starting tunnel") + ' ' + getTunnelName(_tunnel) + "…";
}
private String stop() {
@@ -239,7 +239,7 @@ public class IndexBean {
// give the messages a chance to make it to the window
try { Thread.sleep(1000); } catch (InterruptedException ie) {}
// and give them something to look at in any case
- return _("Stopping tunnel") + ' ' + getTunnelName(_tunnel) + " &hellip";
+ return _("Stopping tunnel") + ' ' + getTunnelName(_tunnel) + "…";
}
private String saveChanges() {
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java
index 72cc8b406b3d13104809426bd6c5e33e3b4e86f9..ea75f73ef8ebb91d3a7db1f32296fd79bf2e539f 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl.java
@@ -626,7 +626,9 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
try {
_producer.disconnect(this);
} catch (I2PSessionException ipe) {
- propogateError("Error destroying the session", ipe);
+ //propogateError("Error destroying the session", ipe);
+ if (_log.shouldLog(Log.WARN))
+ _log.warn("Error destroying the session", ipe);
}
}
_availabilityNotifier.stopNotifying();
diff --git a/core/java/src/net/i2p/util/Log.java b/core/java/src/net/i2p/util/Log.java
index 725b389e0ee21a550354103ab3542ed948824df0..b22325adb4d213f809f5f3d2d74824e097d6dfd8 100644
--- a/core/java/src/net/i2p/util/Log.java
+++ b/core/java/src/net/i2p/util/Log.java
@@ -108,8 +108,8 @@ public class Log {
public void log(int priority, String msg, Throwable t) {
// Boost the priority of NPE and friends so they get seen and reported
- if (t != null && t instanceof RuntimeException && !(t instanceof IllegalArgumentException))
- priority = CRIT;
+ //if (t != null && t instanceof RuntimeException && !(t instanceof IllegalArgumentException))
+ // priority = CRIT;
if (priority >= _minPriority) {
_manager.addRecord(new LogRecord(_class, _name,
Thread.currentThread().getName(), priority,
diff --git a/history.txt b/history.txt
index 1f1c17e74e898bc3497d167219119eca93702ba8..b46a0304d3f3dad9e41a30ef1110c21e4b78ed4a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2010-12-13 dr|z3d
+ * Console themes: Midnight & Classic renovations.
+
2010-12-12 zzz
* i2psnark:
- Fix end-game deadlock
@@ -38,7 +41,6 @@
2010-12-06 dr|z3d
* I2PSnark:
- Resolve table header wrapping issue.
- - Phase 2 of UI overhaul, now with 100% more universality!
- Vanilla/Ubergine theme enhancements.
2010-12-05 zzz
diff --git a/installer/resources/certificates/r31453.ovh.net b/installer/resources/certificates/r31453.ovh.net
new file mode 100644
index 0000000000000000000000000000000000000000..8ad89e11bfad5e1c4b8c3a5d62e71bc8c3ec0f77
--- /dev/null
+++ b/installer/resources/certificates/r31453.ovh.net
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyACCQDjoZjFpBtqgzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJB
+VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMRcwFQYDVQQDEw5yMzE0NTMub3ZoLm5ldDAeFw0xMDEyMTMxNjQ3
+MDJaFw0xMTEyMTMxNjQ3MDJaMF4xCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l
+LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFzAVBgNV
+BAMTDnIzMTQ1My5vdmgubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAxmNPRiG6EjklwIxmoy3ziKrj84dy6HwZ6J/HmKrAf36akRiglzSLbcC5GAN6
+cnwnEdEEhUhC9LDBgZ5yvGgkVXIDA6YUn80kboon8ZLfUM3/yQqd/9pMBXgyNymr
+ES9a6kU4NQQSj7nvE2a4fVKQqzhTA6pBD4Q+zJ9T35QvsmyfKUmFgpTX/vAyPivF
+YGWUhRXFpNdXHTq6RYOn1iw4NMT4COR2en1i/p4AZNxlvu6HUShJ68oexLdcCWrt
+BruHCDgKkVcWtJnQ4q7z7kxcAiBiHdDzSmHC9zCEEz9FEc4nhJXXGM+LY0NjoXkk
+V+q7tOJBli0llmHwnWN737OFMlXd5AdooJsOq9Nk4oIn8aK3h5/VkCcCkSXaOzO5
+wroNZ/DzEYgR+0YddN0ey7iosjE/7dQwIJpO8LDQR/ZYX9VLUnBNcZGdJcQ0sloa
+nlBUHBmi+n85LjFBNnphDWnSa4SUnR2eAtJRtGLHRn9ZtKRHh5FLLsFbXhdkB6Fl
+/trmcjohUuC+2FtRM4F0L86atCOm1CkCjPg/db4l3SCFYbe/n+txnQwcyvJtKCpi
+6bepZV2vpGNVeJKi2kivmMF0toO5SLM78F4pcgdxvU9myNsLrEf1M+n4gq9pZg0d
+zuw2lc1l1iYA80zoTjKd9bggfcROjZxu4HxbzTIblHVcCosCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAgEAXsDA+XYokPoHrur1M/w69vXz2DciW3eEcoYEw6wDNxJfyo9S
+9JQo3ke22G9VRPW0yAZL0dfx0dB1kwdyDq1kOcddrjfNDwZdclUl9PklZG1wR3sf
+v0/fNoVIpJiD3dJUWf//Q8CtiRJFL93cCj//pHeryncZzd4my04wBiS7I/7tLDOo
+APpn3k7yJelrV7N0/Mx8ReKQGSj8xyKABCFLyCSghkU2ujlbBAfOAsrklHNnS7KT
+IWHYzMW3pSPMIGU9Ub/7KszhDWRQwK76Rx6IARDRJAuhpAMhO1bVJB3QH49xR2El
+lvspP+3NqYPAGXEi3G3Rny7seFcLKWxPmv3I02Q/iGs1axx5FoW8V0sWpp7l4Ps7
+bwcwo1PD5SN/LQGpt87dut9L3reGpW91rL+xUGB2nLCZf5686/zSM9lwKlgm6+Jv
+d4WoseuKFUEQUIC5y6kUs1J2KbdYSjn73h9u2bmVlBF7bjRCcQ26Ad2buFjctFSF
+ozd8TPLy6EyI9L8D855iJtq3JO76+J8EBFofYTwuHTqMzyX6lu3BomIZWpVVDTsv
+goSsVubtYfymy9xfqT50SgrCbz5RnfF0/D30cV4ePgTMKDjEKY3BMP+TiBNacQo3
+oz2jAqmudtPOTnIpjmN3hVk+WgpZbWVZNCVpCiskr+lPOxWV1EK9YW7PqiE=
+-----END CERTIFICATE-----
diff --git a/installer/resources/icons/flags/catalonia.png b/installer/resources/icons/flags/catalonia.png
deleted file mode 100644
index 5041e308e3a0f57f5ef9651b574d49d30e5dc635..0000000000000000000000000000000000000000
Binary files a/installer/resources/icons/flags/catalonia.png and /dev/null differ
diff --git a/installer/resources/icons/flags/england.png b/installer/resources/icons/flags/england.png
deleted file mode 100644
index 3a7311d5617df952329b1e293fdfddc64e95ca72..0000000000000000000000000000000000000000
Binary files a/installer/resources/icons/flags/england.png and /dev/null differ
diff --git a/installer/resources/icons/flags/europeanunion.png b/installer/resources/icons/flags/europeanunion.png
deleted file mode 100644
index d6d87115808a2a43c079fb8e1b33134ffb523c79..0000000000000000000000000000000000000000
Binary files a/installer/resources/icons/flags/europeanunion.png and /dev/null differ
diff --git a/installer/resources/icons/flags/fam.png b/installer/resources/icons/flags/fam.png
deleted file mode 100644
index cf50c759eb28b5962720aa1ce0617a29003e477d..0000000000000000000000000000000000000000
Binary files a/installer/resources/icons/flags/fam.png and /dev/null differ
diff --git a/installer/resources/icons/flags/scotland.png b/installer/resources/icons/flags/scotland.png
deleted file mode 100644
index a0e57b4122acbf0beea91277639f92c010afe103..0000000000000000000000000000000000000000
Binary files a/installer/resources/icons/flags/scotland.png and /dev/null differ
diff --git a/installer/resources/icons/flags/wales.png b/installer/resources/icons/flags/wales.png
deleted file mode 100644
index e0d7cee1107205e017c840042272f12476ee0aa0..0000000000000000000000000000000000000000
Binary files a/installer/resources/icons/flags/wales.png and /dev/null differ
diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html
index d0f1e29d8f083c5a89e8122841b5455aa752bafe..7a70a0f801c0475f601ac0a1e11d547b0313b648 100644
--- a/installer/resources/readme/readme.html
+++ b/installer/resources/readme/readme.html
@@ -13,14 +13,14 @@
</div>
</div><a name="top"></a>
<div class="welcome"><h2>Welcome to the Invisible Internet</h2></div>
-<ul class="links"><li class="tidylist"><b>Starting Up …</b><br>If you've just started I2P, the number of <i>Active Peers</i> indicated under the <i>Peers</i> section in the sidepanel on the left should start to grow over the next few minutes and you'll also see a <i>Local Destination</i> named <i>Shared Clients</i> listed there, and possibly other clients and servers depending on how I2P is configured (if not, see the troubleshooting section <a href="#trouble">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. Your <a href="/netdb">Network Database</a> indicates all known peers on the network. Additionally, you can monitor existing <a href="/peers">Peer Connections</a>, and view existing <a href="/tunnels">Tunnels</a> and their status. More information is available on the <a href="/help">help page</a>.</li>
+<ul class="links"><li class="tidylist"><b>Starting Up…</b><br>If you've just started I2P, the number of <i>Active Peers</i> indicated under the <i>Peers</i> section in the sidepanel on the left should start to grow over the next few minutes and you'll also see a <i>Local Destination</i> named <i>Shared Clients</i> listed there, and possibly other clients and servers depending on how I2P is configured (if not, see the troubleshooting section <a href="#trouble">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. Your <a href="/netdb">Network Database</a> indicates all known peers on the network. Additionally, you can monitor existing <a href="/peers">Peer Connections</a>, and view existing <a href="/tunnels">Tunnels</a> and their status. More information is available on the <a href="/help">help page</a>.</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.</li></ul>
<h3>Services on I2P</h3>
<ul class="links">
-<li class="tidylist"><b>Invisible Internet & Public Web Browsing</b><br>On I2P you can access anonymous websites (aka eepsites) and other services (e.g. ssh over I2P, IRC, Jabber etc.) in addition to being able to host your own services. You can also access the normal web anonymously via I2P's built-in web proxy (aka outproxy). <a href="http://www.i2p2.de/htproxyports.html" target="_blank">Configure your browser</a> to use the <a href="http://proxy.i2p" target="_blank">HTTP proxy</a> at <code>127.0.0.1 port 4444</code>, then browse to an eepsite or a normal, unencrypted <code>http://</code> address. For a pre-configured browser, you may wish to try <a href="http://echelon.i2p/i2pfox/">I2PFox</a>, a custom build of Firefox security hardened and tailored especially for I2P. If you wish to disable or change outproxy access to the normal internet, remove or modify the outproxy entry for <code>false.i2p</code> under the <i>Outproxies</i> option in the <a href="/i2ptunnel/edit?tunnel=0" target="_blank">I2P HTTP Proxy Tunnel Editor</a>. In the Sites of Interest section <a href="#eepsites">below</a>, we list a few of the sites hosted on I2P.</li>
+<li class="tidylist"><b>Invisible Internet & Public Web Browsing</b><br>On I2P you can access anonymous websites (aka eepsites) and other services (e.g. ssh over I2P, IRC, Jabber etc.) in addition to being able to host your own services. You can also access the normal web anonymously via I2P's built-in web proxy (aka outproxy).<a href="http://www.i2p2.de/htproxyports.html" target="_blank">Configure your browser</a> to use the <a href="http://proxy.i2p" target="_blank">HTTP proxy</a> at <code>127.0.0.1 port 4444</code>, then browse to an eepsite or a normal, unencrypted <code>http://</code> address. For a pre-configured browser, you may wish to try <a href="http://echelon.i2p/i2pfox/">I2PFox</a>, a custom build of Firefox security hardened and tailored especially for I2P. If you wish to disable or change outproxy access to the normal internet, remove or modify the outproxy entry for <code>false.i2p</code> under the <i>Outproxies</i> option in the <a href="/i2ptunnel/edit?tunnel=0" target="_blank">I2P HTTP Proxy Tunnel Editor</a>. In the Sites of Interest section <a href="#eepsites">below</a>, we list a few of the sites hosted on I2P.</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.
@@ -31,7 +31,7 @@ and can be installed as a <a href="readme.html#plugins">plugin</a>.</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_%28protocol%29" 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> [maintained by Complication, seeking new developers!], and additional facilities including browser-based file hosting etc.</li>
<li class="tidylist"><b>Anonymous Chat</b><br>Start your IRC client (e.g. Chatzilla, Pidgin, XChat)
- and connect to the <a href="irc://127.0.0.1:6668/i2p">server</a> at <code>127.0.0.1 port 6668</code>. You do not need to configure a proxy in your IRC client; I2P provides you with a local IRC tunnel (configured in your IRC client as an IRC server or remote host). Your local I2P IRC tunnel on <code>localhost:6668</code> 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-help</code>,<code>#i2p</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 an I2P-based <a href="http://echelon.i2p/qti2pmessenger">Instant Messenger</a> for unmonitorable and uncensorable anonymous chat, as well as alternative IRC servers, Jabber servers, website-based chat etc. And of course you're entirely free to run your own servers over I2P in whatever flavor you choose, or if you're a developer write your own <a href="http://www.i2p2.de/applications.html" target="_blank">I2P applications</a> (both <a href="https://secure.wikimedia.org/wikipedia/en/wiki/User_Datagram_Protocol" target="_blanK">udp</a> and <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Transmission_Control_Protocol" target="_blank">tcp</a> protocols are <a href="http://www.i2p2.i2p/techintro.html#op.transport" target="_blank">provisioned</a>), and <a href="http://www.i2p2.de/streaming.html" target="_blank">realtime streaming</a> is also possible. We also provide full access to the <a href="http://docs.i2p2.i2p/javadoc/" target="_blank"> java-based api</a>.</li>
+ and connect to the <a href="irc://127.0.0.1:6668/i2p">server</a> at <code>127.0.0.1 port 6668</code>. You do not need to configure a proxy in your IRC client; I2P provides you with a local IRC tunnel (configured in your IRC client as an IRC server or remote host). Your local I2P IRC tunnel on <code>localhost:6668</code> 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-help</code>,<code>#i2p</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 an I2P-based <a href="http://echelon.i2p/qti2pmessenger">Instant Messenger</a> for unmonitorable and uncensorable anonymous chat, as well as alternative IRC servers, Jabber servers, website-based chat etc. And of course you're entirely free to run your own servers over I2P in whatever flavor you choose, or if you're a developer write your own <a href="http://www.i2p2.de/applications.html" target="_blank">I2P applications</a> (both <a href="https://secure.wikimedia.org/wikipedia/en/wiki/User_Datagram_Protocol" target="_blanK">udp</a> and <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Transmission_Control_Protocol" target="_blank">tcp</a> protocols are <a href="http://www.i2p2.i2p/techintro.html#op.transport" target="_blank">provisioned</a>), and <a href="http://www.i2p2.de/streaming.html" target="_blank">realtime streaming</a> is also possible. We also provide full access to the <a href="http://docs.i2p2.de/javadoc/" target="_blank"> java-based api</a>.</li>
<li class="tidylist"><b>Forums & Blogging</b><br>If you're looking to run your own blog or forum, you might be interested in <a href="http://syndie.i2p2.de/" target="_blank">Syndie</a>, 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 to keep all associated software (e.g. Php, MySql, Python, Apache) up to date and locked-down! Also, there are quite a few community run forums 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… blogging, chatting, file sharing 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://www.i2p2.i2p/plugins.html" target="_blank">documentation</a>; I2P plugins can be coded in any language.</li>
</ul>
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 54150a450f27a5674b378ba1657cff8574f248aa..3aa0c14240ce11cf4ad54474f5f2452873ee60d8 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -198,11 +198,11 @@ div.routersummary h4 {
letter-spacing: 0.05em;
margin: -7px -1px -8px -1px !important;
padding: 8px 0;
- background: #fff;
text-transform: capitalize;
text-decoration: none !important;
color: #2b2;
line-height: 90%;
+ background: #fff url(../light/images/magic.png);
}
div.routersummary h3 a, div.routersummary h4 a {
@@ -307,6 +307,7 @@ div.main {
-moz-border-radius: 0 0 3px 0;
-khtml-border-radius: 0 0 3px 0;
border-radius: 0 0 3px 0;
+ background: #eef url("/themes/snark/ubergine/images/hat.png") no-repeat scroll right bottom !important;
}
div.main ul {
@@ -324,6 +325,13 @@ div.main li:first-child {
padding-top: 15px;
}
+div.main li b {
+ color: #161!important;
+ letter-spacing: 0.01em;
+ font-size: 9.5pt;
+ line-height: 170%;
+}
+
div.main hr:last-child {
margin: 15px 0 10px 0;
}
@@ -513,11 +521,11 @@ div.messages span.notice {
h1 {
font-size: 18pt;
text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.7);
- text-align: center;
+ text-align: left;
border: 1px solid #89f;
border-bottom: 1px solid #89f;
border-right: 1px solid #89f;
- padding: 19px 10px;
+ padding: 19px 20px;
margin: 0 1px 0 200px;
line-height: 93%;
text-transform: uppercase;
@@ -560,7 +568,7 @@ h2, h3 {
border-radius: 0 3px 0 0;
}
-.routersummary h2, .routersummary h3, div.confignav {
+.routersummary h2, .routersummary h3, div.confignav, th {
background-image: url("images/tinytitle.png") !important;
background-repeat: repeat-x;
background-position: center right;
@@ -619,11 +627,11 @@ td {
}
tr:nth-child(even) {
- background-color: #eef;
+ background: #fff url(../light/images/magic.png);
}
tr:nth-child(odd) {
- background-color: #ddf;
+ background: #eef url(../light/images/magic.png);
}
hr {
@@ -690,7 +698,7 @@ div.joblog h3 {
}
div.joblog h3:first-child {
- margin: 5px 0 15px 0;
+ margin: -10px 0 15px 0;
}
div.joblog hr {
@@ -883,8 +891,9 @@ div.graphspanel h3 {
div.footnote {
text-align: right;
- color: #99f;
+ color: #339;
font-size: 7pt;
+ margin-bottom: -4px !Important;
}
div.footnote hr{
diff --git a/installer/resources/themes/console/classic/default.css b/installer/resources/themes/console/classic/default.css
index efdfd191b97bb1bbc0f2c34b69845599afde6286..1a9900d3ef6229b04fb79a012fa31fa22ca0dc2f 100644
--- a/installer/resources/themes/console/classic/default.css
+++ b/installer/resources/themes/console/classic/default.css
@@ -29,7 +29,7 @@ h4, label {
h4 {
font-size: 10.5pt;
- text-align: center !important;
+ text-align: left !important;
font-weight: bold;
border: 1px solid #77f;
border-top: 2px solid #77f;
@@ -41,6 +41,7 @@ h4 {
white-space: nowrap;
width: 782px;
letter-spacing: 0.09em;
+ background: #fff url("/themes/console/classic/images/titlebg.png") no-repeat right center !important;
}
label {
@@ -122,7 +123,7 @@ hr {
.control {
margin: 2px;
- padding: 2px;
+ padding: 1px 2px 2px 2px;
overflow: hidden;
height: 20px;
width: 60px;
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 813d41753b0b5b2ab9a466d0bb30a4cb805cf3cf..c2a16245ce5fd3507f123bc4aa6796c4da448494 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -1041,6 +1041,7 @@ div.footnote {
text-align: right;
color: #494;
font-size: 7pt;
+ margin-bottom: -8px !important;
}
div.footnote hr{
diff --git a/installer/resources/themes/console/dark/default.css b/installer/resources/themes/console/dark/default.css
index f45e708682559d4e30edb4c3e68150229ade05d5..5380fb80d2665116e7a9424a84ecbd6c63be73b2 100644
--- a/installer/resources/themes/console/dark/default.css
+++ b/installer/resources/themes/console/dark/default.css
@@ -248,7 +248,7 @@ hr {
border: 1px solid #494;
-moz-box-shadow: inset 0px 0px 0px 1px #932;
padding: 5px 20px 11px 10px !important;
- background: #000 url(images/scarface.jpg) center center no-repeat !important;
+/* background: #000 url(images/scarface.jpg) right center no-repeat !important;*/
}
#globalOperationsPanel .control {
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
index 172e5ce65c203bbad33273554480ac41486f952e..f54cacfcab0dcafcfbeb64555d67e06e8ad4e539 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -140,6 +140,6 @@
#tunnelListPage .descriptionField label, #tunnelListPage .destinationField label {
text-align: right;
width: 150px;
- height: 28px;
+ height: 24px;
float: left;
-}
\ No newline at end of file
+}
diff --git a/installer/resources/themes/console/midnight/default.css b/installer/resources/themes/console/midnight/default.css
index 5ee0603faee7b5520f0676cd602f957a9ad72d5b..e4a7392a30e63655e5d93e00ddbdd449e5af57c2 100644
--- a/installer/resources/themes/console/midnight/default.css
+++ b/installer/resources/themes/console/midnight/default.css
@@ -45,6 +45,7 @@ h4 {
white-space: nowrap;
width: 782px;
letter-spacing: 0.09em;
+ background: #001 url("/themes/console/midnight/images/tinytitles.png") repeat-x center center !important;
}
label {
@@ -130,7 +131,7 @@ hr {
.control {
margin: 2px;
- padding: 2px;
+ padding: 1px 2px 2px 2px;
overflow: hidden;
height: 20px;
width: 60px;
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index 49790beef7c724e745096f797b16cdba42328114..92892e4e05304671cd0eb9b2c673a8f4fa2b1eac 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -42,12 +42,13 @@ public class Reseeder {
private static final String DEFAULT_SEED_URL =
"http://a.netdb.i2p2.de/,http://b.netdb.i2p2.de/,http://c.netdb.i2p2.de/," +
- "http://reseed.i2p-projekt.de/,http://www.i2pbote.net/netDb/,http://r31453.ovh.net/static_media/netDb/";
+ "http://reseed.i2p-projekt.de/,http://www.i2pbote.net/netDb/,http://r31453.ovh.net/static_media/files/netDb/";
/** @since 0.8.2 */
private static final String DEFAULT_SSL_SEED_URL =
"https://a.netdb.i2p2.de/,https://c.netdb.i2p2.de/," +
- "https://www.i2pbote.net/netDb/";
+ "https://www.i2pbote.net/netDb/," +
+ "https://r31453.ovh.net/static_media/files/netDb/";
private static final String PROP_INPROGRESS = "net.i2p.router.web.ReseedHandler.reseedInProgress";
/** the console shows this message while reseedInProgress == false */