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 f51c4e772..b57ed4652 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: " + _context.logManager().currentFile() + "

" + str; + return "Location: " + _context.logManager().currentFile() + "

" + str; } public String getCriticalLogs() { @@ -34,7 +34,7 @@ public class LogsHelper extends HelperBase { return ""; else { str = str.replaceAll("<", "<").replaceAll(">", ">"); - return "Location: " + f.getAbsolutePath() + "
" + str + "
"; + return "Location: " + f.getAbsolutePath() + "
" + str + "
"; } } 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 983a6ba8b..374aa2e0a 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("
"); } if (rate.getLifetimeEventCount() <= 0) { - buf.append("No lifetime events
 
"); + buf.append("No lifetime events
"); return; } long now = _context.clock().now(); diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 3cca63d2d..59eaca03a 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -8,21 +8,21 @@ <%@include file="summary.jsp" %>

I2P Router Logs

-

Version:

- Please include this information in bug reports. +

I2P Version & Running Environment

+ Please include this information in bug reports:

-I2P
-<%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%>
-<%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%>
-CPU <%=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:

+

Critical Logs


-

Router logs (configure):

+

Router Logs [configure]


-

Service (Wrapper) logs:

+

Service (Wrapper) Logs

diff --git a/apps/routerconsole/jsp/oldstats.jsp b/apps/routerconsole/jsp/oldstats.jsp index 39f6c73d8..7ac5c7cfe 100644 --- a/apps/routerconsole/jsp/oldstats.jsp +++ b/apps/routerconsole/jsp/oldstats.jsp @@ -12,4 +12,4 @@

I2P Router Statistics

-
+
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index 2ae4ff6b2..aca9dca22 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -10,7 +10,6 @@ " /> -
- +
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index e04eae955..391506a7b 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 7f2a7f204..d5e461913 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 000000000..3c9b87d57 Binary files /dev/null and b/installer/resources/themes/console/images/itoopie_sm.png differ diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 55db139fb..0c194ba0e 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 077d776cc..78da364ac 100644 --- a/readme.html +++ b/readme.html @@ -14,7 +14,7 @@ up, you can:

  • browse "eepsites" - on I2P there are anonymously hosted websites - tell your browser to use the HTTP proxy at 127.0.0.1 port 4444, then - browse to an eepsite:
    + browse to an eepsite: