diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProofHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProofHelper.java deleted file mode 100644 index 47d3f55cc..000000000 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProofHelper.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.i2p.router.web.helpers; - -import java.util.Date; - -import net.i2p.data.DataHelper; -import net.i2p.data.router.RouterAddress; -import net.i2p.data.router.RouterInfo; -import net.i2p.data.Signature; -import net.i2p.router.web.HelperBase; - -/** - * Sign a statement about this router. - * @since 0.9.8 - */ -public class ProofHelper extends HelperBase { - - public String getProof() { - StringBuilder buf = new StringBuilder(512); - RouterInfo us = _context.router().getRouterInfo(); - buf.append("Hash: ").append(us.getIdentity().calculateHash().toBase64()).append('\n'); - //buf.append("Ident: ").append(us.getIdentity().toBase64()).append('\n'); - for (RouterAddress addr : us.getAddresses()) { - buf.append(addr.getTransportStyle()).append(": ").append(addr.getHost()).append('\n'); - } - buf.append("Caps: ").append(us.getCapabilities()).append('\n'); - buf.append("Date: ").append(new Date()); // no trailing newline - String msg = buf.toString(); - byte[] data = DataHelper.getUTF8(msg); - Signature sig = _context.dsa().sign(data, _context.keyManager().getSigningPrivateKey()); - buf.setLength(0); - buf.append("---BEGIN I2P SIGNED MESSAGE---\n"); - buf.append(msg); - buf.append("\n---BEGIN I2P SIGNATURE---\n"); - buf.append(sig.toBase64()); - buf.append("\n---END I2P SIGNATURE---"); - return buf.toString(); - } -} diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java index 085ea15dd..61446bbe9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java @@ -531,15 +531,6 @@ class SummaryBarRenderer { .append("\n"); svcs.put(tx, rbuf.toString()); - tx = _t("Proof"); - rbuf.setLength(0); - rbuf.append("") - .append(nbsp(tx)) - .append("\n"); - svcs.put(tx, rbuf.toString()); - tx = _t("Stats"); rbuf.setLength(0); rbuf.append(" -<%@page pageEncoding="UTF-8"%> - - -<%@include file="css.jsi" %> -<%=intl.title("Proof")%> -<%@include file="summaryajax.jsi" %> - -<%@include file="summary.jsi" %>

Proof of Ownership

-

- - - -

diff --git a/apps/routerconsole/jsp/themes/console/dark/console.css b/apps/routerconsole/jsp/themes/console/dark/console.css index 67c355d35..6d4e80be3 100644 --- a/apps/routerconsole/jsp/themes/console/dark/console.css +++ b/apps/routerconsole/jsp/themes/console/dark/console.css @@ -4994,30 +4994,6 @@ ul#banlist + hr { margin-right: 5px; } -#proof p { - margin: 15px; - padding: 30px 5px 0; - border: 1px solid #000; - border-radius: 2px; - box-shadow: inset 0 0 0 1px #020, 0 0 1px #000; - background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat #001900; - background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat rgba(0,32,0,0.4); - background-blend-mode: color-burn; -} - -#proof textarea { - line-height: 160%; - font-size: 9pt; - overflow: hidden; - word-break: break-all; - white-space: pre-wrap; - height: 200px; -} - -#proof textarea:focus { - outline: none; -} - #oldconsole p { margin: 15px 0 10px; padding: 10px 20px; @@ -5445,21 +5421,6 @@ table#leasesetdebug th a:hover, table#leasesetsummary th a:hover { width: 100%; } -.main#proof { - padding: 0; -} - -.main#proof textarea, .main#proof textarea:focus { - padding: 5px 20px; - margin: 0; - width: 100%; - border: none; - background: none !important; - box-shadow: none; - color: #e6e6e7 !important; - filter: none; -} - #leasesetdebug, #leasesetsummary { margin-bottom: 14px; } diff --git a/apps/routerconsole/jsp/themes/console/images/info/rosette.png b/apps/routerconsole/jsp/themes/console/images/info/rosette.png deleted file mode 100644 index 2884f873d..000000000 Binary files a/apps/routerconsole/jsp/themes/console/images/info/rosette.png and /dev/null differ diff --git a/apps/routerconsole/jsp/themes/console/light/console.css b/apps/routerconsole/jsp/themes/console/light/console.css index 90c3db2d3..531b6571b 100644 --- a/apps/routerconsole/jsp/themes/console/light/console.css +++ b/apps/routerconsole/jsp/themes/console/light/console.css @@ -1270,7 +1270,7 @@ p:empty + .sb_notice { box-shadow: inset 0 0 0 1px #dee2e6; } -.news, .main#news, .main#proof, .main#oldconsole, #warning2 { +.news, .main#news, .main#oldconsole, #warning2 { background: #f6f6fa; background-size: 100% 100%, auto 160px, 100% 100% !important; } @@ -1292,7 +1292,7 @@ p:empty + .sb_notice { min-width: 546px; } -.main#proof, .main#oldconsole { +.main#oldconsole { background-size: 100% 100%, auto 70%, 100% 100% !important; } @@ -6423,7 +6423,7 @@ h3#ntcpcon, h3#udpcon { margin-bottom: 1px; } -#oldconsole p, #proof p { +#oldconsole p { margin: 20px 5px 10px; padding: 10px 0; line-height: 180%; @@ -6441,39 +6441,6 @@ h3#ntcpcon, h3#udpcon { text-align: right; } -#proof textarea, #proof textarea:focus, #proof p { - margin: 0 !important; - padding: 0 !important; -} - -#proof p { - margin: 15px 0 5px !important; - padding: 15px 0 0 20px !important; - width: calc(100% - 22px); -} - -#proof p::before { - content: ""; - display: inline-block; - background: url(/themes/console/images/info/rosette.png) right 5px top no-repeat !important; - background-size: 24px 24px; - height: 32px; - width: 100%; - margin: -8px 0 -10px; - opacity: 0.7; -} - -#proof textarea, #proof textarea:focus { - background: none; - border: none; - box-shadow: none; - color: #33333f !important; - filter: none; - outline: none; - line-height: 160%; - height: 200px; -} - .homelinkedit th:first-child, #sidebarconf th:first-child, #consolepass th:first-child { text-align: center; background: #f6f6ff url(/themes/console/images/buttons/delete.png) center center no-repeat !important; @@ -7429,17 +7396,6 @@ input[name="pluginURL"] { padding-left: 8px; } -.main#proof { - padding: 0; - min-width: 576px; -} - -.main#proof textarea { - margin: -5px 10px !important; - word-break: break-all; - white-space: pre-wrap; -} - .cells { padding: 3px 2px !important; } @@ -7502,20 +7458,6 @@ input[name="pluginURL"] { width: 100px; overflow: auto; } - -#proof p { - border: none; - box-shadow: none; - background: none; -} - -#proof p::before { - display: inline; -} - -#proof textarea { - padding-right: 15px !important; -} } @media screen and (max-width: 1500px) { diff --git a/apps/routerconsole/jsp/themes/console/light/console_ar.css b/apps/routerconsole/jsp/themes/console/light/console_ar.css index 10d89082f..05aa63db6 100644 --- a/apps/routerconsole/jsp/themes/console/light/console_ar.css +++ b/apps/routerconsole/jsp/themes/console/light/console_ar.css @@ -10,7 +10,7 @@ pre { text-align: right; } -#help pre, #logs li, #proof textarea { +#help pre, #logs li { text-align: left; direction: ltr; }