I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 0757f4f3 authored by z3d's avatar z3d
Browse files

merge of '14fd58d7e574b7ae755514ce48508d9080b269d8' 

     and 'b09bd2e70d37e27a7f6e51afa4f1ae2d2298d30c'
parents 1ef448d5 a2f287cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+ 2
− 2
View file @ 0757f4f3
......@@ -357,7 +357,7 @@ public class SummaryHelper extends HelperBase {
Collections.sort(clients, new AlphaComparator());
StringBuilder buf = new StringBuilder(512);
buf.append("<h3><a href=\"i2ptunnel/index.jsp\" target=\"_blank\" title=\"Add/remove/edit &amp; control your client and server tunnels (local destinations).\" title=\"View existing tunnels and tunnel build status.\">Local destinations</a></h3><hr><div class=\"tunnels\"><table>");
buf.append("<h3><a href=\"i2ptunnel/index.jsp\" target=\"_blank\" title=\"Add/remove/edit &amp; control your client and server tunnels\">Local Destinations</a></h3><hr><div class=\"tunnels\"><table>");
for (Iterator iter = clients.iterator(); iter.hasNext(); ) {
Destination client = (Destination)iter.next();
......@@ -389,7 +389,7 @@ public class SummaryHelper extends HelperBase {
}
} else {
// yellow light
buf.append("<td><img src=\"/themes/console/images/local_inprogress.png\" alt=\"Building&hellip;\" title=\"Tunnel building in progress&hellip;\"></td></tr>\n");
buf.append("<td><img src=\"/themes/console/images/local_inprogress.png\" alt=\"Building&hellip;\" title=\"Building tunnels&hellip;\"></td></tr>\n");
}
}
buf.append("</table></div><hr>\n");
......
apps/routerconsole/jsp/logs.jsp
+ 2
− 2
View file @ 0757f4f3
......@@ -20,9 +20,9 @@
<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>
<jsp:getProperty name="logsHelper" property="criticalLogs" /><br>
<jsp:getProperty name="logsHelper" property="criticalLogs" />
<h3>Router Logs [<a href="configlogging.jsp">configure</a>]</h3>
<jsp:getProperty name="logsHelper" property="logs" /><br>
<jsp:getProperty name="logsHelper" property="logs" />
<h3>Service (Wrapper) Logs</h3><a name="servicelogs"> </a>
<jsp:getProperty name="logsHelper" property="serviceLogs" />
</div></div></body></html>
installer/resources/themes/console/dark/console.css
+ 19
− 16
View file @ 0757f4f3
......@@ -126,8 +126,8 @@ div.routersummary h3 {
border: 0;
font-size: 9.5pt;
letter-spacing: 0.04em;
margin: -7px -9px -10px -9px;
padding: 3px 0 4px 0;
margin: -7px -9px -8px -9px;
padding: 2px 0 3px 0 !important;
background: #007;
text-transform: uppercase;
-moz-border-radius: 0;
......@@ -143,7 +143,7 @@ div.routersummary h4 {
font-size: 8.5pt;
letter-spacing: 0.03em;
margin: -7px -9px -10px -9px !important;
padding: 2px 3px 5px 3px;
padding: 1px 3px 4px 3px;
background: #005;
text-transform: capitalize;
text-decoration: none !important;
......@@ -154,11 +154,11 @@ div.routersummary h4 {
div.routersummary table {
border: 0;
text-align: center !important;
margin: -4px -4px -4px -5px !important;
margin: -5px -4px -5px -5px !important;
width: 185px !important;
overflow: hidden;
font-size: 8pt;
padding: 0px -10px;
padding: 0 -10px;
background-image: none !important;
background-color: transparent !important;
}
......@@ -169,12 +169,6 @@ div.routersummary tr {
border: 0 !important;
}
/*
div.routersummary form {
margin-top: 8px;
}
*/
div.routersummary form {
margin: -6px 0 -7px;
}
......@@ -203,21 +197,29 @@ div.routersummary a:hover {
}
div.routersummary td {
padding: 2px 2px 1px 2px;
padding: 0px 2px 0px 2px;
background-image: none !important;
border: 0 !important;
}
div routersummary hr:last-child {
margin-top: 5px;
margin-bottom: 0px !important;
margin-bottom: -5px !important;
}
div.tunnels {
padding-top: 2px !important;
padding-top: 3px !important;
margin-left: -2px;
}
div.tunnels table {
margin-top: -3px !important;
}
div.tunnels td {
padding: 1px 2px 1px 2px;
}
div.warning {
margin: 5px 20px 10px 240px;
padding: 5px 25px 20px 75px;
......@@ -727,7 +729,7 @@ hr {
hr:last-child {
margin-top: 20px;
margin-bottom: 20px !important;
margin-bottom: 20px;
}
sidebarlogo {
......@@ -886,8 +888,9 @@ div.joblog:ul {
div.joblog li:first-child {
margin-top: 10px;
}
div.joblog li:last-child {
margin-bottom: -15px;
margin-bottom: 0;
}
div.joblog form:first-child {
......
installer/resources/themes/console/light/console.css
+ 20
− 22
View file @ 0757f4f3
......@@ -119,12 +119,17 @@ div.routersummary hr {
-moz-box-shadow: inset 0px 1px 1px 1px #001;
}
div routersummary hr:last-child {
margin-top: 5px;
margin-bottom: -5px !important;
}
div.routersummary h3 {
border: 0;
font-size: 9.5pt;
letter-spacing: 0.04em;
margin: -7px -9px -7px -9px;
padding: 3px 0;
padding: 1px 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));
......@@ -136,7 +141,7 @@ div.routersummary h4 {
font-size: 8.5pt;
letter-spacing: 0.02em;
margin: -7px -9px -7px -9px !important;
padding: 2px 3px 3px 3px;
padding: 0px 3px 1px 3px;
background: #c1d1f7;
text-transform: capitalize;
text-decoration: none !important;
......@@ -146,7 +151,7 @@ div.routersummary h4 {
div.routersummary table {
border: 0;
text-align: center !important;
margin: -5px -5px;
margin: -7px -5px -6px -5px;
width: 185px !important;
overflow: hidden;
font-size: 8pt;
......@@ -162,10 +167,10 @@ div.routersummary tr {
}
div.tunnels {
margin-top: 5px !important;
margin-top: 6px !important;
margin-left: -2px !important;
margin-bottom: 3px !important;
padding-top: 1px;
padding-top: 3px !important;
}
.tunnels tr {
......@@ -178,7 +183,7 @@ div.routersummary form {
div.routersummary form:last-child {
margin: 4px 0 -12px 0 !important;
padding: 4px;
padding: 0;
}
div.routersummary p {
......@@ -206,16 +211,6 @@ div.routersummary td {
border: 0 !important;
}
div.routersummary tr:nth-child(even) {
background-color: #f60;
background-image: none !important;
}
div.routersummarytr:nth-child(odd) {
background-color: #f00;
background-image: none !important;
}
/* proxy error messages */
div.warning {
......@@ -904,22 +899,25 @@ div.joblog {
overflow: auto;
}
div.joblog:li {
div.joblog:ul {
word-wrap: break-word !important;
text-align: justify !important;
line-height: 80% !important;
text-align: justify;
line-height: 100% !important;
}
div.joblog:ul {
div.joblog:li {
word-wrap: break-word !important;
text-align: justify;
text-align: justify !important;
line-height: 80% !important;
padding: 0;
}
div.joblog li:first-child {
margin-top: 10px;
}
div.joblog li:last-child {
margin-bottom: -15px;
margin-bottom: 5px;
}
div.joblog form:first-child {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]