From 2738d5851d0f95bb7e9b5c25b544d4e9f47b0352 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Sat, 17 Oct 2009 07:04:40 +0000
Subject: [PATCH] More UI whitespace removals and optimizations.
---
.../net/i2p/router/web/StatsGenerator.java | 2 +-
apps/routerconsole/jsp/configpeer.jsp | 2 +-
apps/routerconsole/jsp/help.jsp | 12 +++++-----
apps/routerconsole/jsp/logs.jsp | 12 +++++-----
.../themes/console/classic/console.css | 18 ++++++++++-----
.../resources/themes/console/dark/console.css | 22 ++++++++++---------
.../themes/console/light/console.css | 18 +++++++--------
readme_nl.html | 2 +-
readme_zh.html | 2 +-
9 files changed, 50 insertions(+), 40 deletions(-)
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<p />");
+ 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 @@
<div class="wideload">
<jsp:getProperty name="peerhelper" property="blocklistSummary" />
-</div></div></div></body></html>
+</div></div><br></div></body></html>
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 @@
</head><body>
<%@include file="summary.jsp" %>
<h1>I2P Router Help & Support</h1>
-<div class="main" id="main"><div align="justify">
+<div class="main" id="main"><p>
If you'd like to help improve or translate the documentation, or
help with other aspects of the project, please see the documentation for
<a href="http://www.i2p2.i2p/getinvolved.html">volunteers.</a>
-<br><br>Further assistance is available here:<br></div>
+<br><br>Further assistance is available here:</p>
<ul class="links">
<li class="tidylist"><a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
-<li class="tidylist"><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.</ul><br>
-You may also try the <a href="http://forum.i2p/">I2P forum</a>
-or IRC.<br>
+<li class="tidylist"><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.</ul>
+<p>You may also try the <a href="http://forum.i2p/">I2P forum</a>
+or IRC.</p>
<h2>Summary Bar Information</h2><p>
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 <a href="http://www.i2p2.i2p/download">download page</a>.
.</p>
-<h2>Release history</h2><br>
+<h2>Release history</h2>
<jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
<% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
<jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
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 @@
<div class="joblog"><h3>I2P Version & Running Environment</h3><a name="version"> </a>
<i>Please include this information in bug reports:</i>
<p>
-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>
+<b>I2P version:</b> <jsp:getProperty name="helper" property="version" /><br>
+<b>Java version:</b> <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%><br>
+<b>Platform:</b> <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br>
+<b>Processor:</b> <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br>
+<b>Jbigi:</b> <%=net.i2p.util.NativeBigInteger.loadStatus()%><br>
+<b>Encoding:</b> <%=System.getProperty("file.encoding")%></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>
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 @@
<div class="welcome"><h2>Welkom bij I2P!</h2></div>
<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>
<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>
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 @@
<div class="welcome"><h2>欢迎使用 I2P!</h2></div>
<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><B>æµè§ˆ I2P 站点 "eepsites"</B> - I2P 网络内匿åè¿è¡Œçš„å°ç«™ - 您è¦é¦–先设置æµè§ˆå™¨çš„ <b>HTTP 代ç†</b> 为 127.0.0.1:4444 然åŽæ‰èƒ½æµè§ˆ I2P 站点 - <ul><br>
<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>
<li><a href="http://forum.i2p/">forum.i2p</a>:I2På®˜æ–¹è®ºå› <a href="http://forum.i2p2.de/">forum.i2p2.de</a> 的匿åå…¥å£ (个人的I2P站点会在论å›çš„EEPSITE讨论区å‘布)</li>
<li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> ä¸Žé•œåƒ <a href="http://i2p-projekt.i2p/">i2p-projekt.i2p</a>: å¯ä»¥å®‰å…¨åŒ¿å的访问I2P官网 <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
--
GitLab