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 374aa2e0a6..1f450239b4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -58,7 +58,7 @@ public class StatsGenerator { buf.append("Statistics gathered during this router's uptime ("); long uptime = _context.router().getUptime(); buf.append(DataHelper.formatDuration(uptime)); - buf.append("). The data gathered is quantized over a 1 minute period, so should just be used as an estimate

"); + buf.append("). The data gathered is quantized over a 1 minute period, so should just be used as an estimate."); out.write(buf.toString()); buf.setLength(0); diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 278a32eddd..b6838df826 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -71,4 +71,4 @@

-
+
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index acdb918f8d..01301649e9 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -7,16 +7,16 @@ <%@include file="summary.jsp" %>

I2P Router Help & Support

-
+

If you'd like to help improve or translate the documentation, or help with other aspects of the project, please see the documentation for volunteers. -

Further assistance is available here:

+

Further assistance is available here:


-You may also try the I2P forum -or IRC.
+
  • Deutsch FAQ. +

    You may also try the I2P forum +or IRC.

    Summary Bar Information

    Many of the stats on the summary bar may be @@ -165,7 +165,7 @@ details on other applications available, as well as their licenses, please see t client applications can be found on our download page. .

    -

    Release history


    +

    Release history

    <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %> diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 59eaca03a5..26f7d2ea79 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -11,12 +11,12 @@

    I2P Version & Running Environment

    Please include this information in bug reports:

    -I2P version:
    -Java version: <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%>
    -Platform: <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%>
    -Processor: <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)
    -Jbigi: <%=net.i2p.util.NativeBigInteger.loadStatus()%>
    -Encoding: <%=System.getProperty("file.encoding")%>

    +I2P version:
    +Java version: <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%>
    +Platform: <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%>
    +Processor: <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)
    +Jbigi: <%=net.i2p.util.NativeBigInteger.loadStatus()%>
    +Encoding: <%=System.getProperty("file.encoding")%>

    " />

    Critical Logs

    diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index f25f4d0dd7..84cefeff5e 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -169,11 +169,10 @@ div.routersummary hr { div.routersummary h3 { border: 0px solid #f00; -/* border-bottom: 1px solid #99f !important;*/ - font-size: 10pt; + font-size: 9.5pt; letter-spacing: 0.05em; margin: -7px 1px -7px 1px; - padding: 5px 0px 5px 0px; + padding: 3px 0; background: #c5d5fb; text-transform: uppercase; } @@ -181,10 +180,10 @@ div.routersummary h3 { div.routersummary h4 { border: 0px solid #f00; border-bottom: 0 !important; - font-size: 9pt; + font-size: 8.5pt; letter-spacing: 0.05em; margin: -7px 1px -7px 1px !important; - padding: 2px 3px 3px 3px; + padding: 2px 3px; background: #c1d1f7; text-transform: capitalize; text-decoration: none !important; @@ -632,6 +631,15 @@ p { padding: 0 2px; /* Ignored by IE8 */ } +.links { + padding-bottom: -2px; + text-align: justify; +} + +.links li { + list-style-image: url("../images/link.png") !important; +} + a:link{ color: #006; text-decoration: none; diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 921b321f53..ff6e9f3cb2 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -124,10 +124,10 @@ div.routersummary hr { div.routersummary h3 { border: 0; - font-size: 10pt; + font-size: 9.5pt; letter-spacing: 0.04em; margin: -7px -9px -10px -9px; - padding: 3px 0px 5px 0px; + padding: 3px 0 4px 0; background: #007; text-transform: uppercase; -moz-border-radius: 0; @@ -154,7 +154,7 @@ div.routersummary h4 { div.routersummary table { border: 0; text-align: center !important; - margin: -4px -4px -4px -4px; + margin: -5px -4px -4px -4px; width: 185px !important; overflow: hidden; font-size: 8pt; @@ -332,7 +332,7 @@ div.confignav { -khtml-border-radius: 4px; border-radius: 4px; border: 1px solid #99f; - font-size: 10pt !important; + font-size: 9.5pt !important; font-weight: bold !important; line-height: 160% !important; -moz-box-shadow: inset 0px 0px 1px 0px #eef; @@ -556,12 +556,14 @@ a:hover{ } .links { - list-style-image: url("images/link_dark.png"); - margin: 0 5px 0 0px; - padding: 0px 5px; + padding-bottom: -2px; text-align: justify; } +.links li { + list-style-image: url("../images/link_dark.png") !important; +} + p { text-align: justify; line-height: 160%; @@ -605,7 +607,7 @@ h2 { -moz-border-radius: 4px; -khtml-border-radius: 4px; vertical-align: middle; - margin: 15px 0 15px 0 !important; + margin: 15px 0 12px 0 !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; @@ -625,12 +627,11 @@ h3 { border: 1px solid #99f; border-left: 5px solid #99f; padding: 3px 5px 3px 5px; -/* margin: 20px 0 15px 0;*/ + margin: 12px 0 12px 0; border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; -khtml-border-radius: 0 4px 4px 0; background: #002; -/* background: url(images/lightbluebg.png);*/ } h4 { @@ -709,6 +710,7 @@ hr { hr:last-child { margin-top: 20px; + margin-bottom: 20px !important; } diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 6ec4d363f4..bfef5ace25 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -121,10 +121,10 @@ div.routersummary hr { div.routersummary h3 { border: 0; - font-size: 10pt; + font-size: 9.5pt; letter-spacing: 0.04em; margin: -7px -9px -7px -9px; - padding: 5px 0px 5px 0px; + padding: 3px 0; background: #c5d5fb; text-transform: uppercase; background-image: -moz-linear-gradient(top, bottom, from(#ddf), to(#c5d5fb), color-stop(25%, #c5d5fb), color-stop(100%, #ddf)); @@ -146,7 +146,7 @@ div.routersummary h4 { div.routersummary table { border: 0; text-align: center !important; - margin: -2px -4px; + margin: -4px -4px; width: 185px !important; overflow: hidden; font-size: 8pt; @@ -162,7 +162,7 @@ div.routersummary tr { } .tunnels { - margin-top: 0 !important; + margin-top: -2px !important; margin-left: -7px !important; } @@ -352,7 +352,7 @@ div.confignav { -khtml-border-radius: 4px; border-radius: 4px; border: 1px solid #000022; - font-size: 10pt !important; + font-size: 9.5pt !important; font-weight: bold !important; line-height: 160% !important; -moz-box-shadow: inset 0px 0px 1px 0px #002; @@ -570,8 +570,8 @@ a:active{ .links { list-style: url(images/link.png); - margin: 10px 5px 0 0px; - padding: 10px 20px 10px 30px; + padding-bottom: -2px; + text-align: justify; } p { @@ -609,7 +609,7 @@ h2 { border-radius: 4px; -moz-border-radius: 4px; -khtml-border-radius: 4px; - margin: 15px 0px 15px 0 !important; + margin: 15px 0px 12px 0 !important; -moz-box-shadow: inset 0px 0px 1px 0px #002; word-wrap: break-word; } @@ -626,7 +626,7 @@ h3 { border: 1px solid #002; border-left: 5px solid #002; padding: 3px 5px 3px 5px; - margin: 15px 0 15px 0; + margin: 12px 0 12px 0; border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; -khtml-border-radius: 0 4px 4px 0; diff --git a/readme_nl.html b/readme_nl.html index 78f26ecba9..d014dccd59 100644 --- a/readme_nl.html +++ b/readme_nl.html @@ -4,7 +4,7 @@

    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:

      -
    • surfen naar "eepsites" - op I2P zijn er anonieme websites - stel je browser in om de HTTP proxy op 127.0.0.1, poort 4444 te gebruiken, en surf vervolgens naar een eepsite:

      +
    • surfen naar "eepsites" - op I2P zijn er anonieme websites - stel je browser in om de HTTP proxy op 127.0.0.1, poort 4444 te gebruiken, en surf vervolgens naar een eepsite:
      • inproxy.tino.i2p en perv.i2p: sites die lijsten bijhouden van actieve eepsites
        • diff --git a/readme_zh.html b/readme_zh.html index 81ba4fd4dc..1787bdf24c 100644 --- a/readme_zh.html +++ b/readme_zh.html @@ -9,7 +9,7 @@

        欢迎使用 I2P!

        如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将会增加，并会出现名为共享客户端("shared clients") 的本地目标。(如果没有,请见 疑难解答)。待出现以上消息后，您可以:

          -
        • 浏览 I2P 站点 "eepsites" - I2P 网络内匿名运行的小站 - 您要首先设置浏览器的 HTTP 代理 为 127.0.0.1:4444 然后才能浏览 I2P 站点 -
            +
          • 浏览 I2P 站点 "eepsites" - I2P 网络内匿名运行的小站 - 您要首先设置浏览器的 HTTP 代理 为 127.0.0.1:4444 然后才能浏览 I2P 站点 -