Console: Drop gateway icon on leasesets page,

just adds clutter with no value.
Change last-changed time on leaseset debug page to use standard formatting
This commit is contained in:
zzz
2020-09-26 14:05:29 +00:00
parent 2989d955d9
commit c3f187abcb
4 changed files with 2 additions and 16 deletions

View File

@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -474,7 +473,7 @@ class NetDbRenderer {
if (debug) { if (debug) {
buf.append("<tr><td><b>Published (RAP) Leasesets:</b></td><td colspan=\"3\">").append(netdb.getKnownLeaseSets()).append("</td></tr>\n") buf.append("<tr><td><b>Published (RAP) Leasesets:</b></td><td colspan=\"3\">").append(netdb.getKnownLeaseSets()).append("</td></tr>\n")
.append("<tr><td><b>Mod Data:</b></td><td>").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData())).append("</td>") .append("<tr><td><b>Mod Data:</b></td><td>").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData())).append("</td>")
.append("<td><b>Last Changed:</b></td><td>").append(new Date(_context.routerKeyGenerator().getLastChanged())).append("</td></tr>\n") .append("<td><b>Last Changed:</b></td><td>").append(DataHelper.formatTime(_context.routerKeyGenerator().getLastChanged())).append("</td></tr>\n")
.append("<tr><td><b>Next Mod Data:</b></td><td>").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData())).append("</td>") .append("<tr><td><b>Next Mod Data:</b></td><td>").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData())).append("</td>")
.append("<td><b>Change in:</b></td><td>").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())).append("</td></tr>\n"); .append("<td><b>Change in:</b></td><td>").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())).append("</td></tr>\n");
} }
@ -639,9 +638,7 @@ class NetDbRenderer {
boolean isMeta = ls.getType() == DatabaseEntry.KEY_TYPE_META_LS2; boolean isMeta = ls.getType() == DatabaseEntry.KEY_TYPE_META_LS2;
for (int i = 0; i < ls.getLeaseCount(); i++) { for (int i = 0; i < ls.getLeaseCount(); i++) {
Lease lease = ls.getLease(i); Lease lease = ls.getLease(i);
buf.append("<li><b>").append(_t("Lease")).append(' ').append(i + 1).append(":</b> <span class=\"netdb_gateway\" title=\"") buf.append("<li><b>").append(_t("Lease")).append(' ').append(i + 1).append(":</b> <span class=\"tunnel_peer\">");
.append(_t("Gateway")).append("\"><img src=\"themes/console/images/info/gateway.png\" alt=\"")
.append(_t("Gateway")).append("\"></span> <span class=\"tunnel_peer\">");
buf.append(_context.commSystem().renderPeerHTML(lease.getGateway())); buf.append(_context.commSystem().renderPeerHTML(lease.getGateway()));
buf.append("</span> "); buf.append("</span> ");
if (!isMeta) { if (!isMeta) {

View File

@ -4444,12 +4444,6 @@ th > img[src^="/imagegen"] { /* scale down header images */
padding: 0 !important; padding: 0 !important;
} }
.netdb_gateway {
margin-left: 0 !important;
margin-right: -10px !important;
vertical-align: bottom;
}
.netdb_tunnel { .netdb_tunnel {
display: inline-block; display: inline-block;
background: #030; background: #030;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

View File

@ -5852,11 +5852,6 @@ p:empty { /* empty paragraph nuke */
padding: 0 !important; padding: 0 !important;
} }
.netdb_gateway {
margin-left: -3px !important;
margin-right: -3px !important;
}
.netdb_tunnel { .netdb_tunnel {
display: inline-block; display: inline-block;
background: #e2e2ff; background: #e2e2ff;