From 748203f4e7bf40accc14218509301c112da6583c Mon Sep 17 00:00:00 2001 From: z3d Date: Sat, 18 Jul 2009 21:27:57 +0000 Subject: [PATCH] Intitial proxy error tweaks, readme alt tag fixology. (Blame the French!) --- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 8 ++-- .../resources/ahelper-conflict-header.ht | 2 +- installer/resources/dnf-header.ht | 2 +- installer/resources/dnfb-header.ht | 2 +- installer/resources/dnfh-header.ht | 2 +- installer/resources/dnfp-header.ht | 2 +- .../resources/themes/console/dark/console.css | 26 ++++++++--- .../themes/console/light/console.css | 41 +++++++++++++----- .../console/light/images/tabletilelighter.png | Bin 0 -> 1184 bytes readme.html | 2 +- readme_de.html | 2 +- readme_fr.html | 2 +- readme_nl.html | 2 +- readme_sv.html | 2 +- readme_zh.html | 2 +- 15 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 installer/resources/themes/console/light/images/tabletilelighter.png diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 1bb6690f65..e17bc42884 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -386,9 +386,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable String conflictURL = protocol + alias + ".i2p/?" + initialFragments; out.write(header); out.write(("To visit the destination in your host database, click here. To visit the conflicting addresshelper link by temporarily giving it a random alias, click here.

").getBytes()); - out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); + out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); out.write(new Date().toString().getBytes()); - out.write("\n".getBytes()); + out.write("

\n".getBytes()); out.flush(); } s.close(); @@ -727,9 +727,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } } } - out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); + out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); out.write(new Date().toString().getBytes()); - out.write("\n".getBytes()); + out.write("

\n".getBytes()); out.flush(); } } diff --git a/installer/resources/ahelper-conflict-header.ht b/installer/resources/ahelper-conflict-header.ht index b9d63600f4..305512bbf3 100644 --- a/installer/resources/ahelper-conflict-header.ht +++ b/installer/resources/ahelper-conflict-header.ht @@ -11,7 +11,7 @@ Proxy-Connection: close
diff --git a/installer/resources/dnf-header.ht b/installer/resources/dnf-header.ht index 6352adaa26..c3c1b9f5b1 100644 --- a/installer/resources/dnf-header.ht +++ b/installer/resources/dnf-header.ht @@ -11,7 +11,7 @@ Proxy-Connection: close
diff --git a/installer/resources/dnfb-header.ht b/installer/resources/dnfb-header.ht index 4fe1aaedef..3e16430dce 100644 --- a/installer/resources/dnfb-header.ht +++ b/installer/resources/dnfb-header.ht @@ -11,7 +11,7 @@ Proxy-Connection: close
diff --git a/installer/resources/dnfh-header.ht b/installer/resources/dnfh-header.ht index 477a5f88f1..c65d410218 100644 --- a/installer/resources/dnfh-header.ht +++ b/installer/resources/dnfh-header.ht @@ -11,7 +11,7 @@ Proxy-Connection: close
diff --git a/installer/resources/dnfp-header.ht b/installer/resources/dnfp-header.ht index 0799fe1a02..3e26d8f165 100644 --- a/installer/resources/dnfp-header.ht +++ b/installer/resources/dnfp-header.ht @@ -11,7 +11,7 @@ Proxy-Connection: close
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index c2d6c24bfc..b1b624a507 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -100,12 +100,19 @@ div.routersummary { } div.warning { - margin: 0em 1em 1em 224px; - padding: .5em 1em; - background: #ffefef; - border: medium solid #ffafaf; + margin: 0 20px 10px 224px; + padding: 20px 25px 20px 75px; + background: #fff; + border: 1px solid #d00; text-align: left; color: inherit; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + text-align: justify; + background-image:url("images/errortriangle.png"); + background-position:15px center; + background-repeat:no-repeat; } div.main { @@ -229,9 +236,9 @@ tr:nth-child(odd) { } tr:last-child { - background: #bbf url('images/lightbluetile.png') !important; + background: #004 url('images/lightbluetile.png') !important; font-weight: bold; - font-size: 8pt; + border: 1px solid #99f !important; } td { @@ -469,4 +476,9 @@ textarea { border: 1px solid #99f; } -form {} \ No newline at end of file +form {} + +.proxyfooter { + font-color: #f00; + font-size: 7pt; +} \ No newline at end of file diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index ad985fd1cb..728a858025 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -26,11 +26,14 @@ pre { div.logo { float: left; padding: 10px 10px 10px 14px; - text-align: left; + text-align: center; font-color: #fff; - border: 0px solid #f00; margin: 0 20px 0 14px; - display: none !important; + border: 1px solid #002; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + background: #ddddff url('images/lightbluetile.png'); } div.toolbar { @@ -97,12 +100,19 @@ div.routersummary { } div.warning { - margin: 0em 1em 1em 224px; - padding: .5em 1em; - background: #ffefef; - border: medium solid #ffafaf; + margin: 0 20px 10px 224px; + padding: 20px 25px 20px 75px; + background: #fff; + border: 1px solid #d00; text-align: left; color: inherit; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + text-align: justify; + background-image:url("images/errortriangle.png"); + background-position:15px center; + background-repeat:no-repeat; } div.main { @@ -209,7 +219,7 @@ table { margin: 5px 0px 5px 0px; cell-padding: 1px; font-size: 7pt; - background: #ddf; + background: #b4c8ff url('images/tabletitlelight.png') repeat-x; } th { @@ -235,7 +245,6 @@ tr:nth-child(odd) { tr:last-child { background: #bbf url('images/tabletilelighter.png') !important; font-weight: bold; - font-size: 8pt; border: 1px solid #002 !important; } @@ -473,4 +482,16 @@ textarea { border: 1px solid #001; } -form {} \ No newline at end of file +form {} + +.proxyfooter { + margin: 0 20px 10px 224px; + padding: 20px 25px 20px 75px; + font-color: #f00; + font-size: 7pt; + text-align: right !important; + border-radius: 4px; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border: 1px solid #001; +} \ No newline at end of file diff --git a/installer/resources/themes/console/light/images/tabletilelighter.png b/installer/resources/themes/console/light/images/tabletilelighter.png new file mode 100644 index 0000000000000000000000000000000000000000..5586bb0635f0adfd89b8898a6e29a60833c7afe7 GIT binary patch literal 1184 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5kiGhJJ)Rr?I$l)yTh%9Dc;5!V$jK}j=q%bhB z1bMnRhE&XXd&@IVI8lK0LDpLE*|F&$sL*ZxPX^s`)L(J9gYnN8+z{wX)xW!rX?#y`t_YI?5(k1>H1Ra--}jz>m470H&sk8uLPsN`tM)WtpBR_{u3BQ zz21H9Z(Q{|^_b`4(Z7_#f2yuCxaO6#Rs}n8=|$At*H8cbn)O%q`>o6`QP@@C)Q%#t zxxQ95ly`O5r#W>~AMbp=9A1mFiZAhzMl+IN$#K{MGZN!p|Nq4$sdo{aO)FziMAkcJk-vg?Hns{{79b z+mx~I^7;L@=GphYewX_BcwJr9zdxJjzrWiuGvbJn*v4BIIwE+_f><3_+uXpkt4@+& zH(0U*FZ0$mha*`fYCxT?Ys^eQCg4?$tl-)*0|-cF$Vw&pf=Tz%mK_Fry>3z7Z=JA6$px62y0ba2RIIV_k literal 0 HcmV?d00001 diff --git a/readme.html b/readme.html index e15b81fed6..ffabaddf33 100644 --- a/readme.html +++ b/readme.html @@ -2,7 +2,7 @@
English Chinese Deutsch - + Français Nederlands Svenska
diff --git a/readme_de.html b/readme_de.html index ed3644e8cf..f6e3a1d1ca 100644 --- a/readme_de.html +++ b/readme_de.html @@ -1,5 +1,5 @@
-
English Chinese Deutsch Nederlands Svenska
+
English Chinese Deutsch Français Nederlands Svenska

Willkommen zu I2P!

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

diff --git a/readme_fr.html b/readme_fr.html index 3c908294d5..cc429e20e2 100644 --- a/readme_fr.html +++ b/readme_fr.html @@ -1,5 +1,5 @@
-
English Chinese Deutsch Nederlands Svenska
+
English Chinese Deutsch Français Nederlands Svenska

Bienvenu a I2P!

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

diff --git a/readme_nl.html b/readme_nl.html index 557b378120..973ceed31d 100644 --- a/readme_nl.html +++ b/readme_nl.html @@ -1,5 +1,5 @@
-
English Chinese Deutsch Nederlands Svenska
+
English Chinese Deutsch Français Nederlands Svenska

Welkom bij I2P!

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

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

Welcome to I2P!

Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom diff --git a/readme_zh.html b/readme_zh.html index 360d1cce1c..47c9cf9a4f 100644 --- a/readme_zh.html +++ b/readme_zh.html @@ -2,7 +2,7 @@

English Chinese Deutsch - + Français Nederlands Svenska