From 1811e3b9cd66d04b5112c9490001576cce104a06 Mon Sep 17 00:00:00 2001 From: z3d <z3d@mail.i2p> Date: Mon, 12 Oct 2009 23:55:21 +0000 Subject: [PATCH] Whitespace rationalization; theme enhancements; draft itoopie graphic for proxy errors. --- .../src/net/i2p/router/web/LogsHelper.java | 4 +- .../net/i2p/router/web/StatsGenerator.java | 2 +- apps/routerconsole/jsp/logs.jsp | 22 +-- apps/routerconsole/jsp/oldstats.jsp | 2 +- apps/routerconsole/jsp/profiles.jsp | 3 +- .../themes/console/classic/console.css | 125 +++++++++++++----- .../resources/themes/console/dark/console.css | 52 ++++++-- .../themes/console/images/itoopie_sm.png | Bin 0 -> 4866 bytes .../themes/console/light/console.css | 59 ++++++++- readme.html | 2 +- readme_de.html | 2 +- readme_fr.html | 6 +- readme_nl.html | 6 +- readme_sv.html | 6 +- readme_zh.html | 4 +- 15 files changed, 218 insertions(+), 77 deletions(-) create mode 100644 installer/resources/themes/console/images/itoopie_sm.png diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java index f51c4e772d..b57ed46527 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -10,7 +10,7 @@ public class LogsHelper extends HelperBase { public String getLogs() { String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); - return "Location: <code>" + _context.logManager().currentFile() + "</code><br><br>" + str; + return "Location: <b><code>" + _context.logManager().currentFile() + "</code></b><br><br>" + str; } public String getCriticalLogs() { @@ -34,7 +34,7 @@ public class LogsHelper extends HelperBase { return ""; else { str = str.replaceAll("<", "<").replaceAll(">", ">"); - return "Location:<code> " + f.getAbsolutePath() + "</code> <pre>" + str + "</pre>"; + return "Location:<b><code> " + f.getAbsolutePath() + "</code></b> <pre>" + str + "</pre>"; } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java index 983a6ba8bf..374aa2e0a6 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -138,7 +138,7 @@ public class StatsGenerator { buf.append("</i><br>"); } if (rate.getLifetimeEventCount() <= 0) { - buf.append("No lifetime events<br> <br>"); + buf.append("No lifetime events<br>"); return; } long now = _context.clock().now(); diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 3cca63d2d4..59eaca03a5 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -8,21 +8,21 @@ <%@include file="summary.jsp" %> <h1>I2P Router Logs</h1> <div class="main" id="main"> - <div class="joblog"><h3>Version:</h3><a name="version"> </a> - Please include this information in bug reports. + <div class="joblog"><h3>I2P Version & Running Environment</h3><a name="version"> </a> + <i>Please include this information in bug reports:</i> <p> -I2P <jsp:getProperty name="helper" property="version" /><br> -<%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%><br> -<%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br> -CPU <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br> -jbigi <%=net.i2p.util.NativeBigInteger.loadStatus()%><br> -Encoding <%=System.getProperty("file.encoding")%><br></p><br> +I2P version: <b><jsp:getProperty name="helper" property="version" /></b><br> +Java version: <b><%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%></b><br> +Platform: <b><%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%></b><br> +Processor: <b><%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)</b><br> +Jbigi: <b><%=net.i2p.util.NativeBigInteger.loadStatus()%></b><br> +Encoding: <b><%=System.getProperty("file.encoding")%></b></p> <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" /> <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> - <h3>Critical logs:</h3><a name="criticallogs"> </a> + <h3>Critical Logs</h3><a name="criticallogs"> </a> <jsp:getProperty name="logsHelper" property="criticalLogs" /><br> - <h3>Router logs (<a href="configlogging.jsp">configure</a>):</h3> + <h3>Router Logs [<a href="configlogging.jsp">configure</a>]</h3> <jsp:getProperty name="logsHelper" property="logs" /><br> - <h3>Service (Wrapper) logs:</h3><a name="servicelogs"> </a> + <h3>Service (Wrapper) Logs</h3><a name="servicelogs"> </a> <jsp:getProperty name="logsHelper" property="serviceLogs" /> </div></div></body></html> diff --git a/apps/routerconsole/jsp/oldstats.jsp b/apps/routerconsole/jsp/oldstats.jsp index 39f6c73d82..7ac5c7cfe7 100644 --- a/apps/routerconsole/jsp/oldstats.jsp +++ b/apps/routerconsole/jsp/oldstats.jsp @@ -12,4 +12,4 @@ <h1>I2P Router Statistics</h1> <div class="main" id="main"> <jsp:getProperty name="oldhelper" property="stats" /> -</div></body></html> +<hr></div></body></html> diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index 2ae4ff6b26..aca9dca222 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -10,7 +10,6 @@ <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" /> <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:getProperty name="profilesHelper" property="profileSummary" /> - <br> <a name="shitlist"> </a> <jsp:getProperty name="profilesHelper" property="shitlistSummary" /> -</div></div></body></html> +<hr></div></div></body></html> diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index e04eae9553..391506a7b9 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -68,8 +68,8 @@ div.warning { border: 5px solid #fb7; text-align: left; color: inherit; - background-image:url("../images/errortriangle.png"); - background-position: 17px center; + background-image:url("../images/itoopie_sm.png"); + background-position: 12px center; background-repeat:no-repeat; -moz-border-radius: 15px; -moz-box-shadow: inset 0px 0px 0px 2px #f60; @@ -249,7 +249,7 @@ div.warning h3 { div.main { margin: 0px 0px 0px 195px; - padding: 15px; + padding: 15px 15px 10px 15px; background: #eef; border: 5px solid #bbf; border-top: 0; @@ -266,10 +266,12 @@ div.main ul { div.main li { padding: 0 0 5px 0; list-style: square; + word-wrap: break-word; + margin-right: 20px; } div.main li:first-child { - padding-top: 5px; + padding-top: 15px; } div.main textarea { @@ -279,16 +281,17 @@ div.main textarea { div.news { margin: -5px 0px 0 195px; - padding: -10px 15px 8px 15px; + padding: -10px 0px 8px 0px; background: #ffffc0; border: 5px solid #bbf; - text-align: justify; - color: inherit; + text-align: right; + color: #770; min-width: 600px; padding-bottom: 8px; padding-left: 10px; padding-right: 10px; -moz-box-shadow: inset 0px 0px 0px 1px #99f; + font-size: 7pt; } /* convert the list entry to our title */ @@ -296,25 +299,27 @@ div.news { div.news li { text-align: justify; list-style: none; - margin: -15px 15px -20px -20px; + margin: -15px 15px -30px -20px; padding: 0px 0 15px 0; - border-bottom: 5px solid #cc7; + border-bottom: 2px dotted #cc7; border-top: 0px solid #cc7; padding: 3px 5px 5px 5px; - font-size: 12pt; + font-size: 10pt; color: #540; } div.news p { color: #330; + font-size: 9pt; } + div.news a:link { - color: #773; + color: #663; text-shadow: 0px 0px 1px rgba(128, 128, 48, 0.3); } div.news a:visited { - color: #f00 !important; + color: #773 !important; text-shadow: 0px 0px 1px rgba(128, 128, 48, 0.3); } @@ -322,7 +327,7 @@ div.news hr { color: #cc7; background: #cc7; height: 2px; - border: 0px solid #cc7; + border: 0px solid #cccc77; margin: 5px 0; } @@ -339,10 +344,14 @@ div.configure { padding: 0px 20px 0px 20px; } +div.configure hr { + margin: 15px 0; +} + div.configure table { font-size: 9pt; font-weight: bold; - -moz-box-shadow: inset 0px 0px 1px 1px #001; + border: 1px solid #bbf; } div.configure tr, div.configure td { @@ -367,8 +376,8 @@ div.messages { } div.messages li, div.messages ul { - padding: 15px 0 5px 5px; - margin: -15px 0 0 0; + padding: 10px 0 0 5px; + margin: -10px 0 0 0; } div.messages span.error { @@ -397,16 +406,16 @@ h1 { h2 { font-size: 14pt; padding: 0px 10px 10px 10px; - border-bottom: 5px solid #bbf; - border-top: 0px solid #bbf; + border-bottom: 3px solid #aaf; + border-top: 0px solid #aaf; letter-spacing: 0.04em; } h3 { font-size: 12pt; padding: 0 10px 10px 10px; - border-bottom: 5px solid #bbf; - border-top: 0px solid #bbf; + border-bottom: 3px solid #aaf; + border-top: 0px solid #aaf; letter-spacing: 0.04em; } @@ -417,7 +426,7 @@ h3 { table { border-collapse: collapse; - border: 5px solid #bbf; + border: 1px solid #bbf; margin: 0 0 5px 0; cell-padding: 1px; font-size: 7.5pt; @@ -442,7 +451,7 @@ th { background-color: #fff; padding: 8px 2px; text-align: center; - border-bottom: 1px solid #88f; + border-bottom: 1px solid #bbf; } tt { @@ -466,11 +475,11 @@ tr:nth-child(odd) { } hr { - color: #bbf; - background: #bbf; - height: 5px; - border: 0px solid #bbf; - margin: 5px 0; + color: #aaf; + background: #aaf; + height: 3px; + border: 0px solid #aaf; + margin: 3px 0; } .statusnotes { @@ -484,6 +493,53 @@ hr { border-top: 0; padding: 4px 0 2px 0; } + +div.joblog { + margin-top: -10px; + line-height: 130% !important; +} + +div.joblog:li { + word-wrap: break-word !important; + text-align: justify !important; + line-height: 80% !important; +} + +div.joblog:ul { + word-wrap: break-word !important; + text-align: justify; +} + +div.joblog li:first-child { + margin-top: -10px; +} +div.joblog li:last-child { + margin-bottom: -10px; +} + +div.joblog form:first-child { + margin-top: 10px; +} + +div.joblog table { + margin-top: 15px; +} + +div.joblog p { + line-height: 130%; +} + +div.joblog h3 { + margin: -5px 0 5px 0; +} + +div.joblog hr { + margin: 15px 0 15px; +} + +div.joblog ol { + margin-bottom: 0px; +} input { margin: 3px 5px 3px 0; @@ -565,7 +621,7 @@ tt { } .tablefooter { - border: 1px solid #88f; + border: 1px solid #bbf; } .tablefooter tr, .tablefooter td { @@ -575,11 +631,13 @@ tt { line-height: 150%; word-wrap: nowrap; padding: 8px 1px; + border-top: 2px solid #bbf; } .tidylist { text-align: justify; padding-right: 30px; + margin-right: 20px; } div.graphspanel { @@ -595,11 +653,12 @@ div.graphspanel { } div.graphspanel img { - border: 1px solid #99f; + border: 1px solid #77f; padding: 2px; margin: 6px; - background: #ddf; - -moz-box-shadow: inset 0px 0px 1px 1px #99f; + background: #ccf; + -moz-box-shadow: inset 0px 0px 0px 0px #002; + opacity: 0.9; } div.graphspanel img:hover { @@ -609,10 +668,11 @@ div.graphspanel img:hover { text-align: center !important; background: #001; -moz-box-shadow: inset 0px 0px 2px 1px #f60; + opacity: 1; } div.graphspanel hr { - margin: 20px 0; + margin: 10px 0; } div.graphspanel form { @@ -622,4 +682,5 @@ div.graphspanel form { div.graphspanel h3 { text-align: left; + margin: 10px 20px 10px 20px; } \ No newline at end of file diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 7f2a7f2045..d5e461913e 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -214,8 +214,8 @@ div.warning { -khtml-border-radius: 4px; border-radius: 4px; text-align: justify; - background-image:url("images/errortriangle.png"); - background-position:15px center; + background-image:url("../images/itoopie_sm.png"); + background-position:10px center; background-repeat:no-repeat; -moz-box-shadow: inset 0px 0px 0px 1px #f00; -khtml-box-shadow: inset 0px 0px 0px 1px #f00; @@ -269,7 +269,7 @@ div.main textarea { div.news { margin: 15px 15px 15px 220px; - padding: 20px 30px 20px 30px; + padding: 5px 30px 15px 30px; border: 1px solid #99f; background: #004; background-image: -moz-linear-gradient(top, bottom, from(#003), to(#005), color-stop(30%, #003), color-stop(100%, #001)); @@ -287,12 +287,26 @@ div.news { div.news li { text-align: justify; list-style: url('images/info_dark.png'); - margin: 0 10px 0 30px; - padding: 5px; + margin: 0 10px 0 20px; + padding: 5px 5px 5px 0; vertical-align: middle; word-wrap: break-word; } +div.news h4 { + border-bottom: 1px; + border-bottom-style: dotted; + border-bottom-color: #99f; + padding: 0 0 5px 0; + margin: 5px 0 10px 0; + font-size: 10pt; + opacity: 0.8; +} + +div.news p { + margin-top: -5px; +} + div.confignav { padding: 15px 10px !important; margin: 15px 0; @@ -792,8 +806,8 @@ form {} color: #eef; text-align: center; border: 1px solid #99f !important; - border-top: 0px !important; - margin: -5px 0 5px 0; +/* border-top: 0px !important;*/ + margin: -3px 0 5px 0; padding: 7px; background: #004; -moz-box-shadow: inset 0px 0px 0px 1px #009; @@ -801,7 +815,7 @@ form {} box-shadow: inset 0px 0px 0px 1px #009; } -.joblog { +div.joblog { margin: 15px 0 15px 0; padding: 5px 20px 10px 20px !important; border: 1px solid #99f; @@ -811,7 +825,7 @@ form {} border-radius: 4px; -moz-border-radius: 4px; -khtml-border-radius: 4px; - text-align: justify; + text-align: justify !important; -moz-box-shadow: inset 0px 0px 1px 0px #eef; -khtml-box-shadow: inset 0px 0px 1px 0px #eef; box-shadow: inset 0px 0px 1px 0px #eef; @@ -820,18 +834,34 @@ form {} div.joblog:li { word-wrap: break-word !important; - text-align: justify; + text-align: justify !important; + line-height: 80% !important; } - .joblog:ul { +div.joblog:ul { word-wrap: break-word !important; text-align: justify; } +div.joblog li:first-child { + margin-top: 10px; +} +div.joblog li:last-child { + margin-bottom: -15px; +} + div.joblog form:first-child { margin-top: 10px; } +div.joblog table { + margin-top: 15px; +} + +div.joblog p { + line-height: 130%; +} + .smallhead { font-size: 7pt } diff --git a/installer/resources/themes/console/images/itoopie_sm.png b/installer/resources/themes/console/images/itoopie_sm.png new file mode 100644 index 0000000000000000000000000000000000000000..3c9b87d573bdff9a98db1fb8da68ffec4140d2e6 GIT binary patch literal 4866 zcmV+d6aDOoP)<h;3K|Lk000e1NJLTq001@s002Y?1^@s7y{Ptq00009a7bBm000id z000id0mpBsWB>pXv`IukRCt`lI|+1DRkHPZO(#u4Is~&oAR!2ZM3z7R1%ko+4~RJ< z1c!s8-w_YQ(KrYMg9sS#$jBIlfxrR%gQN0AKxBzB!y-7y7ULk%NMr|@#00XDPIr3C z{Z+T$dvtfYJDsph!R`0n-Rjn@x^=7S-T=4*bNx`rxeWg^xk92_lcpwMb~`VS(yf-C ze-5Bj@*W6O^drzuS5UD^7zH}9t^*sY;Ge>+Zg+ja4#FT-1bvx85SZL@;lhQHiIWp+ z6bc2Hj3&5#^!lLJUw^$!Nfk0OGSZ3)ifTVu^GU?bOE(wA#l@M^)6?U5%W2c5DF+T5 z*q5URXvI{6Eib!LGum?!Brs7yZ7nd1<yHkgcC8kvKxk|P&}iDW)Qi){u%cVnItJ;y zfIl(0c54>k>vMuQA0IDB2G>GZym;}{O~*IE!@m(={ST+$)mLA=kIxVmj1UANxTvUT zZc0i@@z}9r&+=9Z#kagOB)Gf7;pnMUDz*4&#B>q!jNWKw(#R>5m-EqEyj65-<eaEl z{ycT+6eGBD<(6>xZ0L&3HDOt;--hKdoK;i++qDbWnl->4S4QypG@y|AYIMZ{V`Z6@ z7$7nM8>-zJ3LcF|;oKji7rV_4R*O|Gcp>wJ@%Z>k`sM<U)0^1Z+S-%e7yfo3ghz%$ z((oi`b+p2-SAT_*2TsD0B})k7!$@$=^5x5aQi&bZA>$0#IAqo{voc(VkP@8&nIkg! zJJ!J^Xm0^OGh8kfuJKjD6*7ADa%TaqVZXeCkPw{q$APU_;cTGODLB*pHGI+8JCh}( zrly9Km6b`-;uUsKqr}ASEI3#xNe7or@!cyZeTmkzY2cU9lG<|vaaGE76)t6kD0A?b z5CNAi0etrzY8pM(6Vee)I`7c4GiHJ@tQeBnu%QBbT+z)<7A1L<Doau!1j7-gLBysK z21?aHxi?ayTHy#a`IFa~h>b9?+U@USV?oBCQ>%HN*9HVBBU2bkJWrY+4J+DT#FH*W z=hjG)_8@%3{O!}fF=>`;7Tc{6^ofP(S=0NdRH`bhYf|Bl9`heSDc4qCss3?w-s+T) z&=90c315Bo6_|}?sJc*9f>IubnkxqDpCL?oYCt_kMMdrZ<;*Wvnwy&wr%su=q`IQo zKzeW3ykR201ghU%z?Q@-+P`A3u_v?L`NEhHb>z=-r3DKXbO{a)j=<MYOhls!heI@4 zv0^hm>oDCwB(45Bmgj+xs8qmk&tS7=IW^bBiEbO|;Xpd_2edJ<>C=7dRu4T(>59J& z6@JQ0XbM0~j2d^s2Hsam$w^qh-dUKC5G@lnaNzyiA{aUp;xMD8qg3snX`>Mv3_+}+ zp@H|RMk$Vq6L@}F+7Q${N~YKAS!U)Vo)mTn{s>++!uF<;jH1pUBWUtezU?KN4Q!Xx z8DwGNDA}{m`bI$Jof?sJ2aTJV=MB6qDzX_g??NA#13h>~EF6b_Gb`wD{a&|@hM&>A zN`)?7JEXGy@GZU0!L-`7OyyCRj5N(2NQM!(M$v$BW@7HLWoVyS#{#N7uZX^ZM))77 zKxX%lvQ~T6@ue=v5E%9Be~*K(kYIRs$Cp5g*#cv{RxZHhHG4}wM23ZeYT^u^{rc5S zDz%D{<w1~|o(kE2$cBR77eI@t1?CjafxZv)mFvFshqvJBxvTVwI}#)Wj12Xdrlh3A z@b!_etJdyY+on8sLN2_u{jE0n8<%bbtzDZiY0@Op?=3!&VPPm*EfJ`m$sE^{nqI$Q z{akyieeyfI-;o>4&6*2M4NdUaGmk-hQatoY?gQ`6eV2A6IQ-e+Be^f;F2%h8b+Mxv z#q}mW>xK*&((uF+PdEsffW~omjYiXp%qXeT-Me>>{Qmpz-}FYgE0C9g?d0#lg9pEw zm6dhErQCs!N=lrvS6+D~OsCUD<0vA<jpvR5QrCiNtqQH{Dp#J-#uj3;*}@QEDDJC7 zCEuUg+vHrRpapHmL7NeY3EMSTt=5}wzx{SIN8qn9A}1;}X0ut1l&i6!5~o{<1LEyS zF=L(s^Bh>mhIPmquwpxVXJ)|_Rsy(fm=%~Z{I=)>?3EBa^boK&-f-^LUAxMPms0$l zKxCp04<7WbhzAXl5oX;Eq6#w0$&qbuYbhv@5r%aJ5jS!!UIcdSnzN(GNauDUA(%PS znV+5Q{O;eMe|JhSu8<Q#oy5j=m;DNz&gmu)&&a<ZFquqj#tb#j$MsDJz4-0^f$iAg zq^h*ERPOZHv16>NO7tlaEEWrY0=U^9c^yV3?ZT^8tzxuT$+*eO%jNl*nM!W_golTt z-O+^KAv}M`5RPnLr;t%fN>Z|{tVv9()o|bLRzCNR5m6U8Z{)~MB0GGzW5$jP&lYtQ zSxrYRD@tlLN2cp2vRE2rAZtuYQ>JuY^a;*^pBRd3I(ZTp`mls-RcDcH22m$AH26kT zSO_dkp=6QHa0;cB9YLa#kW7O}*%zjcH*BDF2kgiZz=bTv0ART6(Qbz%3E?bn9eeI) zBuQ^XfEsSVgL39yR(}n@`yIgci2KoI)Z;%T^n+lpBfSr;z#6c5>)XvpC08dh3nE|_ zI3s!=K{cF!n^5!;z=LT5b`#z1w20Qo&)&*h{j(?Ohb&uy?%4IyxIcazTIp<k%AYF- zV1T3i+2|C=Y3(7~kEwqhR!)SIvYkI~9>DSA0LAtPd?Lya%Ag+GJ%<F@oPNa*en;ju zNKru6zw{h4bkXzoZODAjAc|`+#lH9d*q>(3p!Ygo9ebM_s?6gJhAtscvvniP&z_9) z@)OL4vtV`ch-k`s2(pO?dL0>KaL^YrpVk#>`s-NQjRJ+C;i2%<{HI|5w*7GS`?Ek1 zl6kA<!F@e>;1>>kehB{Y$v>c}zR7Q&J`2dHc<-O@waI^J;!7~?g=vsFF4Zl6`OM`! zdg+${&kTyd%%4A>HYnyAH<jSYm!AYfcSD=}=9|qB6ddHBSkcz4Ta|v15fU=P(EyFs z>-9auyM}LnZN_VD8XVnw6!vc3+a^CIJ_bT`Av@7I>3RC}>6rZd{BY68l|d;YBD<j* z?!Lr?NaR=euwlbWFI>GaL*G@ejPB)J%$F-JL-n<4h=`7WkN*4-WK7L~+Fxs7ZT?y? zH=7+f&*kLej!tHK2tI?bAJw>V<LrkIALc4WDF&{(VTwW<-GFw!24_%cZf;f;?<{_% zTU0mL^T8fC`sGo;4&cHM7ohY|DP;XV3l8l#1lATSRGg}Snrk(RL4yWu(Q360a!%-^ zfTC!a6d4&ARzfHce}aO7dY~f_?dm`*Tej>g@B;$vDXeW^V9AmtZYDYTXgJ7UmM&d- zozE#E5<ESX)YR0x`uh6l#>U1(iMK|h@&11O`h93H7;Z@Q@Vy~9IoV$bNrQ5rE+{Av zR45D<{AfacQSeX>13dcZqu=?XED#{83|V8uep@I6s37+SZNfT4SdAo8Am7%0H|+zh z9DLkBWH-<eyh(Xn8c&=!VIMz!d<!C?3RWCRD+vQV1VISM5fl+nyB2KMgzq=7zZ>{n zUszbkw}Lhui4osmq*RAftHY6Lv4I+&YH;#Sf!~4{Eo~JObw-g>Vu=~cOeoE!HEY(m zoiO<vH7yAwpFB<ttrwJ7jto0f;vfWkl9Fj9ual4=D{Sa}S|cJNY=MSoZwJUfI|c6E zDYqqqgPln{4fITOPBY_f53Zv?M;BF?q~jcxp6+yj+Ou!TnME6lTkJ00G9Bkl_)ij) zf~i3wX#99*z_z2Ffs|+x=FWBFA_XGT?ln;>2sxc5q^7!a#$<9j;eirVR_5-cQ_9J? z#eGcc?iEpQ5JD0k>12@{j>JSIdZ96_xcF1<f3H~aBGc<tauh*IRJUJ06^oCLW}7x` z;&pfJ+QkMB9>8K_)!bL7di(adaj(-}QJ^pwL}frx3CXvo!wmB8y+MBd9QkmAI7`Q? zAAb0u*SeIi)2U<$ShvoNb9X#E<_haXBs?-g$fdZC6eU@?awY#pb<GD#5fl0*PS6^} zZ34Mk%y1vz`JthqZ13K^ye;J`l?pePGa^DJY|GswteB8U@g*tc<!N}V>HPWgObns& z$P5}ZNT8CR=t*_Yodedbo9qYU77)xQVf5&SP;}LN&AImd$RjdgNA4zJ8>9hwYQUNr zU{5{eR47y)76xq5BL6C%4(`b>_f#IPDK=InZ1deDY!rxVEI+^Vsy)zDT<oSm((fi= z1S=$Dbmir45k=f|*|hJvR&*ndRDNFGohOPyM*#PJACrJiX`9GXA_7S@-!4J4cj<I) zDqc#P?gc?4>(^WnQ?#!eCWD|tjpx*Sfe=E9Wy=;|N%sp(i4(L4;+Pb-ses{ZI&^2@ z&Kq4)%J0ZP195=JF5E0WAq-T|6SVLtGA+p^@Rtc?P?=N@<>k)rsZ#;a7;XbPWO1rO z51DoY%!DY2b%u|8LJpjR_t4I6b;gp&Z5am?!D|P6oiWmx6o~-WMq2d4;_#PF$Gt@{ ze}HB<B^cq%VdwY8jR1RhDbQ3O1qM$Pk_#6g6hR_vhwIpvGn@e+1|{18Z-hmH(?{a* zcoYZJ7V$6}V&n=7;395nl{_LxAzPZw^;_%^i7n|;*6i8HEf~<2r~u)w@GJZajIb7o zIuB;oUg*kIK(R}IqDXE7#iV!;jAGK?!ccxqHW^B#83f$d;OVCU-hbcOsBdopCR~Yu zH6E991BC=Q374RSi|92NiPQ5fRB$iG_pO1B5+(s%`5^+66j*%_grJ+;_V#Ha($Tjs z!0`i0sJD#{6u%5#;8ab9AK~RGlVEJh0Qld(AA;hO|8lJ|0#iw#{RJF70jFqg!}KV9 z>@LWINohlPL1VKC3O?Qrf7$tW{!JG}K10<q86pDe*oZoTICBjwaBkCTh>wbt%i^ET zg<r1MUWN{yMR$ZS2?#48@_rT~b&Q)_w4en;tCB~=gOFI<8X#H`1ZJ%Q&Z#V**6U!v z_@OW?>mjJGsfTq7i$JeZgI1%0E7dooe#rQz*r(5M{hcB#OrcaXBqSxkqK%7qaGP$_ zL_|eEm#%H^46R?h9!?)U4HmP7M|7v=Ol=oI;U5d(;!hW)&ncKb@8}@?pWAo=bVr7$ zHEQ`5W>j1h^zPr=D^Uc`FMl2~pU4D#m>!0YA07~n#=1rb=@J4sfq-re1$a8l0KfW} zqW;H^AJ>G1g{dtTi(0GIQoQftn=9UILR4K!4wOLJBkjjr^j-B}Y&62=!p)GkHjgI9 zXI;AZLlTfODh0}pl~pa6zu>afYK_upG&a|pEK8RzrEq%Scj7i|*r2Yesv>hB$Y!%? zv2hS3DQZg3)2C0ze(~iOAN5G=p&gJq0J5LY_Bl{GV0h={clb4_?3`@)=F4wj!i))C zxp!de0ocEFKj-kC5B505j2<&9Jw2Un&d~iI8{+0fVQN8QEtuDWgj$eDizksXVY6n< zQiq3!2V+G##RwKtkQfS9dWQE)OG|s~+qdtp<9;(vRdTQdMo%6MvGK9|=!J;E*@g>0 zUVx$LL%F!_e19kO?$;Xzj~UEQxajES!HExovB3ys$IBpjL^8zmj)4>VPeA3RO4Ib; zPJc2XA)$?xA>I=s0$Wh2v>^A*C{4}C1XEgCS_|D7lL^bs&DH7=P}FFl(5+v(sI2jI ztBU^SqPDhnvNSa)CZI+s4b}(q%gidZ3LJI^+^o9^W|Ns~Nctww25DjBe~pBwUQztJ z=HE4Nsr(XLJ%5$|oq#KZgoKpj<m9}DPp_8+#5-wp^Ug@e9ds;FS664;xN)ORx&uwz zq1$(KWvnZSp0|z&wr$(?@R>7b7W*pq2G}1B%z-oP-{SQEoanRJ+1dGh`t)h=R}Tp^ z<JcRKd&FTn0x?N{+!BQB>_Qwvs>A3|4Y{T6$RPexARZt!<Cq(9-BB{4@R=o1BhJxm z66f^dGZ-7_NLd7W(eGXYbDks7agIq$Wak;n%gfCuRSvfSi(*N~sX<6Nx=xB9WUo%l z(}-tDbYj`z{qJ^x2*HP)G$W3~BAr>00zok}H8eD|(Atvf`#rM)ks!|`5lD$NCVrEj z<a&4}&@&KDi?K+8RyuT}m?Wt^XSWW19!3cXu;L`!NX^qb7FqqBkp(PbL}+DYr4lui zO08C_!~;4aNF^T7DRJgx0_g;po|q@lI}t1OMT3`!!E%0rNC8%SCk4}reQ|<t-P5-n zC&-RC?9I*1_L!I$M<9oNcVz7l(J0#j?t=<MEZ|lk;7kf|>-bv01uf&kZ%!EfkwRl* oBSXuE6NeMWuswgj-IL1y2jw)q$#2Ymj{pDw07*qoM6N<$g4<Lv#sB~S literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 55db139fbf..0c194ba0e9 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -198,7 +198,7 @@ div.routersummarytr:nth-child(odd) { div.warning { margin: 5px 20px 10px 240px; - padding: 0px 25px 20px 75px; + padding: 5px 25px 20px 75px; background: #fff; border: 1px solid #002; text-align: left; @@ -207,11 +207,12 @@ div.warning { -khtml-border-radius: 4px; border-radius: 4px; text-align: justify; - background-image:url("images/errortriangle.png"); - background-position:15px center; + background-image:url("../images/itoopie_sm.png"); + background-position:10px center; background-repeat:no-repeat; -moz-box-shadow: inset 0px 0px 1px 0px #d00; word-wrap: break-word; + min-width: 400px; } /* console error messages */ @@ -803,7 +804,7 @@ form {} background: #bcf; -moz-box-shadow: inset 0px 0px 2px 1px #eef; } - +/* .joblog { margin: 15px 0; padding: 10px 20px !important; @@ -830,6 +831,56 @@ form {} .joblog table { margin-top: 10px; } +*/ + +div.joblog { + margin: 15px 0; + padding: 10px 20px !important; + border: 1px solid #003; + background-color: #004; + background: #ddf url('images/lightbluetile.png'); + color: #001; + border-radius: 4px; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + text-align: justify; + -moz-box-shadow: inset 0px 0px 1px 0px #002; + overflow: auto; + } + + div.joblog:li { + word-wrap: break-word !important; + text-align: justify !important; + line-height: 80% !important; +} + +div.joblog:ul { + word-wrap: break-word !important; + text-align: justify; +} + +div.joblog li:first-child { + margin-top: 10px; +} +div.joblog li:last-child { + margin-bottom: -10px; +} + +div.joblog form:first-child { + margin-top: 10px; +} + +div.joblog table { + margin-top: 15px; +} + +div.joblog p { + line-height: 130%; +} + +div.joblog hr { + margin: 15px 0; +} .smallhead { font-size: 7pt diff --git a/readme.html b/readme.html index 077d776cc9..78da364ac5 100644 --- a/readme.html +++ b/readme.html @@ -14,7 +14,7 @@ up, you can:</p> <ul> <li><b>browse "eepsites"</b> - on I2P there are anonymously hosted websites - tell your browser to use the <b>HTTP proxy at 127.0.0.1 port 4444</b>, then - browse to an eepsite:<br /> + browse to an eepsite:<br> <ul class="links"> <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> and <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: sites tracking active diff --git a/readme_de.html b/readme_de.html index 14dcc90eae..8a7080ad8c 100644 --- a/readme_de.html +++ b/readme_de.html @@ -5,7 +5,7 @@ <p>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, <a href="#trouble">siehe Unten</a>). Sobald das erscheint, kannst Du:</p> <ul> <li class="tidylist"><b>"Eepsites" besuchen</b> - In I2P sind anonym gehostete Websites - - Stelle Deinen Browser so ein, über den <b>HTTP proxy: 127.0.0.1 port 4444</b> zu surfen, dann besuche eine Eepsite:<br /> + Stelle Deinen Browser so ein, über den <b>HTTP proxy: 127.0.0.1 port 4444</b> zu surfen, dann besuche eine Eepsite:<br> <ul class="links"> <li class="tidylist"><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> und <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: Webseiten, die aktive Eepsites beobachten</li> diff --git a/readme_fr.html b/readme_fr.html index faaf90136e..a37411fc2a 100644 --- a/readme_fr.html +++ b/readme_fr.html @@ -4,7 +4,7 @@ <h2>Bienvenu a I2P!</h2> <p>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, <a href=#trouble>voir plus bas</a>). Une fois qu'ils apparaissent, vous pouvez:</p> <ul> - <li class="tidylist"><b>parcourir les "eepsites"</b> - sur I2P il y a des sites web anonymes hébergés - dites à votre navigateur d'utiliser <b>le HTTP proxy a l'adresse 127.0.0.1 port 4444</b>, ensuite vous pouvez naviguer sur les eepsites:<br /> + <li class="tidylist"><b>parcourir les "eepsites"</b> - sur I2P il y a des sites web anonymes hébergés - dites à votre navigateur d'utiliser <b>le HTTP proxy a l'adresse 127.0.0.1 port 4444</b>, ensuite vous pouvez naviguer sur les eepsites:<br> <ul class="links"> <li class="tidylist"><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> et <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: listent les eepsites actifs</li> @@ -16,9 +16,9 @@ <li class="tidylist"><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: un proxy Freenet 0.5</li> <li class="tidylist"><a href="http://echelon.i2p">echelon.i2p</a>: archive</li> <li class="tidylist"><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: Pastebin anonyme</li> - <br /> + <br> </ul> - Il y a bien plus d'eepsites - suivez juste les liens au départ de ceux sur lesquels vous êtes, mettez-les dans vos favoris et visitez-les souvent!</li><br /> + Il y a bien plus d'eepsites - suivez juste les liens au départ de ceux sur lesquels vous êtes, mettez-les dans vos favoris et visitez-les souvent!</li><br> <li class="tidylist"><b>Parcourez le web</b> - Il y a pour l'instant un outproxy HTTP sur I2P attaché à votre propre proxy HTTP sur le port 4444 - vous devez simplement configurer le proxy de votre navigateur pour l'utiliser (comme expliqué ci-dessus) et aller sur n'importe quel URL normale - vos requêtes seront relayées par le réseau i2p.</li> <li class="tidylist"><b>Transfer de fichiers</b> - Il y a un <a href="i2psnark/">port</a> intégré de <a href="http://www.klomp.org/snark/">Snark</a> le client <a href="http://www.bittorrent.com/">BitTorrent</a>.</li> <li class="tidylist"><b>Utiliser le service de mail anonyme</b> - Postman a créé un sytème de mails compatible avec un client de messagerie normal (POP3 / SMTP) qui permet d'envoyer des emails autant au sein d'i2p que vers et à partir de l'internet normal! Créez-vous un compte à <a href="http://hq.postman.i2p/">hq.postman.i2p</a>. diff --git a/readme_nl.html b/readme_nl.html index 0e46e7a1fa..a4067d353b 100644 --- a/readme_nl.html +++ b/readme_nl.html @@ -4,7 +4,7 @@ <h2>Welkom bij I2P!</h2> <p>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, <a href=#trouble>zie hieronder</a>). Eenmaal je deze bestemming ziet, kan je:</p> <ul> - <li><b>surfen naar "eepsites"</b> - op I2P zijn er anonieme websites - stel je browser in om de <b>HTTP proxy op 127.0.0.1, poort 4444</b> te gebruiken, en surf vervolgens naar een eepsite:<br /><br /> + <li><b>surfen naar "eepsites"</b> - op I2P zijn er anonieme websites - stel je browser in om de <b>HTTP proxy op 127.0.0.1, poort 4444</b> te gebruiken, en surf vervolgens naar een eepsite:<br><br> <ul> <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> en <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: sites die lijsten bijhouden van actieve eepsites</li> @@ -17,8 +17,8 @@ <li><a href="http://echelon.i2p">echelon.i2p</a>: software archive and information for I2P</li> <li class="tidylist"><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: anonieme Pastebin</li> - </ul><br /> - Er zijn nog veel meer eepsites - volg gewoon de links vanaf diegene die je ziet. Voeg de beste toe aan je favorieten, en bezoek ze regelmatig!</li><br /> + </ul><br> + Er zijn nog veel meer eepsites - volg gewoon de links vanaf diegene die je ziet. Voeg de beste toe aan je favorieten, en bezoek ze regelmatig!</li><br> <li><b>surfen op het web</b> - er is momenteel een HTTP "outproxy" in I2P, vastgehaakt aan je eigen HTTP proxy op poort 4444 - stel eenvoudigweg de proxy van je browser in om deze te gebruiken (zoals hierboven voor eepsites) en ga naar een willekeurige normale URL - je verzoeken voor websites worden rondgestuurd via het I2P-network.</li> <li><b>bestanden versturen</b> - er is een geintegreerde <a href="i2psnark/">aangepaste versie</a> van de <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> diff --git a/readme_sv.html b/readme_sv.html index 8d35f797da..eb85ff9d13 100644 --- a/readme_sv.html +++ b/readme_sv.html @@ -9,7 +9,7 @@ nedan</a>). När de syns kan du:</p> <ul> <li><b>surfa på "eepsidor"</b> - inom I2P finns det anonyma sajter - ställ in din webbläsare till att använda <b>HTTP proxy vid -127.0.0.1 port 4444</b>, surfa sen till en eepsida:<br /> +127.0.0.1 port 4444</b>, surfa sen till en eepsida:<br> <ul class="links"> <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> och @@ -30,9 +30,9 @@ wiki som alla kan förändra, innehåller många länkar</ Freenet proxy</li> <li><a href="http://echelon.i2p">echelon.i2p</a>: programvaruförrÃ¥d och information om I2P</li> <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: anonym och säker pastebin</li> - </ul><br /> + </ul><br> Det finns många fler eepsidor - följ bara länkarna från dom du ser, - spara dina favoriter och besök dom ofta!</li><br /> + spara dina favoriter och besök dom ofta!</li><br> <li><b>surfa på nätet</b> - det finns för närvarande en "utproxy" i I2P som är ansluten till din egen HTTP proxt på port 4444 - ställ helt enkelt in din diff --git a/readme_zh.html b/readme_zh.html index fd3e85ff96..9bc1ed6bfe 100644 --- a/readme_zh.html +++ b/readme_zh.html @@ -7,7 +7,7 @@ <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div> </div> <h2>欢迎使用 I2P!</h2> -<p>如果 I2P å·²ç»è¿è¡Œï¼Œæœªæ¥çš„å‡ åˆ†é’Ÿé‡ŒæŽ§åˆ¶å°å·¦ä¾§çš„活动节点(Active)æ•°é‡å°†ä¼šå¢žåŠ ,并会出现å为共享客户端("shared clients") çš„æœ¬åœ°ç›®æ ‡ã€‚(如果没有,è¯·è§ <a href="/i2p-zhcn/i2psrc/i2p.i2p/readme_zh.html#trouble">疑难解ç”</a>)。待出现以上消æ¯åŽï¼Œæ‚¨å¯ä»¥:</p> +<p>如果 I2P å·²ç»è¿è¡Œï¼Œæœªæ¥çš„å‡ åˆ†é’Ÿé‡ŒæŽ§åˆ¶å°å·¦ä¾§çš„活动节点(Active)æ•°é‡å°†ä¼šå¢žåŠ ,并会出现å为共享客户端("shared clients") çš„æœ¬åœ°ç›®æ ‡ã€‚(如果没有,è¯·è§ <a href="#trouble">疑难解ç”</a>)。待出现以上消æ¯åŽï¼Œæ‚¨å¯ä»¥:</p> <ul> <li><B>æµè§ˆ I2P 站点 "eepsites"</B> - I2P 网络内匿åè¿è¡Œçš„å°ç«™ - 您è¦é¦–先设置æµè§ˆå™¨çš„ <b>HTTP 代ç†</b> 为 127.0.0.1:4444 然åŽæ‰èƒ½æµè§ˆ I2P 站点 - <ul> <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> å’Œ <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: 这两个站点用于跟踪哪些 I2P 站点在线。</li> @@ -21,7 +21,7 @@ </ul> <br> I2P网络ä¸è¿˜æœ‰å¾ˆå¤šå…¶ä»–网站(EEPSITE) - 访问上é¢çš„ç½‘ç«™ä½ ä¼šæ‰¾åˆ°æ›´å¤šï¼Œæ”¶è—ä½ å–œçˆ±çš„ I2P 网站,别忘了常去看看ï¼</li><br> <li><b>æµè§ˆ Web 网页</b> - ç›®å‰ IP2 网络ä¸çš„出å£ä»£ç†("Outproxy")åªæœ‰ä¸€ä¸ªï¼Œå®ƒä»¥HTTP代ç†çš„å½¢å¼æŒ‚接在本地计算机的4444端å£ä¸Šã€‚- å°†æµè§ˆå™¨çš„代ç†è®¾ç½®æŒ‡å‘为上述地å€(127.0.0.1:4444)åŽï¼Œè®¿é—®ä»»ä½•æ™®é€šé“¾æŽ¥å³å¯ - 您的HTTP请求将在 I2P ç½‘ç»œå†…éƒ¨ä¼ é€’ã€‚</li> - <li><b>文件交æ¢</b> - I2Pçš„å…¶ä¸ä¸€ä¸ªæœ¬åœ° <a href="/i2p-zhcn/i2psrc/i2p.i2p/i2psnark/">端å£</a> 用于内置的 <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> 客户端。</li> + <li><b>文件交æ¢</b> - I2Pçš„å…¶ä¸ä¸€ä¸ªæœ¬åœ° <a href="/i2psnark">端å£</a> 用于内置的 <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> 客户端。</li> <li><b>匿å电邮</b> - POSTMAN 建立了兼容普通邮件客户端 (POP3 / SMTP)的邮件系统,这个系统å¯ä»¥åœ¨ I2P ç½‘ç»œå†…éƒ¨æ”¶å‘ Email 也å¯ä»¥æ”¶å‘æ¥è‡ªå¤–部 Internet 的邮件ï¼I2P的邮件å¸æˆ·è¯·åˆ° <a href="http://hq.postman.i2p/">hq.postman.i2p</a> 申请。I2Pä¸é›†æˆäº†Webç•Œé¢çš„pop3/stmp邮件客户端 <a href="/susimail/susimail">SUSIMail</a>,并已设置好使用POSTMAN 的邮件æœåŠ¡ã€‚</li> <li><b>匿åèŠå¤©</b> - æ‰“å¼€ä½ çš„ IRC èŠå¤©ç¨‹åºï¼Œè¿žæŽ¥è‡³ <b>127.0.0.1:6668 </b>å³å¯è®¿é—®I2P的匿å IRC æœåŠ¡å™¨ï¼Œä½†æ— è®ºä½ è¿˜æ˜¯æœåŠ¡å™¨éƒ½ä¸çŸ¥é“èŠå¤©çš„人在哪里。</li> <li><b>匿ååšå®¢</b> - 请访问 <a href="http://syndie.i2p2.de/">Syndie</a></li> -- GitLab