From c3f187abcb02d8a2b85b8b717ddc956a1bec67c8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 26 Sep 2020 14:05:29 +0000
Subject: [PATCH] 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

---
 .../net/i2p/router/web/helpers/NetDbRenderer.java |   7 ++-----
 .../resources/themes/console/dark/console.css     |   6 ------
 .../themes/console/images/info/gateway.png        | Bin 219 -> 0 bytes
 .../resources/themes/console/light/console.css    |   5 -----
 4 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 installer/resources/themes/console/images/info/gateway.png

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
index 18ee54596..29c29bca4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -474,7 +473,7 @@ class NetDbRenderer {
         if (debug) {
             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("<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("<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;
             for (int i = 0; i < ls.getLeaseCount(); i++) {
                 Lease lease = ls.getLease(i);
-                buf.append("<li><b>").append(_t("Lease")).append(' ').append(i + 1).append(":</b> <span class=\"netdb_gateway\" title=\"")
-                   .append(_t("Gateway")).append("\"><img src=\"themes/console/images/info/gateway.png\" alt=\"")
-                   .append(_t("Gateway")).append("\"></span> <span class=\"tunnel_peer\">");
+                buf.append("<li><b>").append(_t("Lease")).append(' ').append(i + 1).append(":</b> <span class=\"tunnel_peer\">");
                 buf.append(_context.commSystem().renderPeerHTML(lease.getGateway()));
                 buf.append("</span> ");
                 if (!isMeta) {
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 58854f9bd..7b164832e 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -4444,12 +4444,6 @@ th > img[src^="/imagegen"] { /* scale down header images */
      padding: 0 !important;
 }
 
-.netdb_gateway {
-     margin-left: 0 !important;
-     margin-right: -10px !important;
-     vertical-align: bottom;
-}
-
 .netdb_tunnel {
      display: inline-block;
      background: #030;
diff --git a/installer/resources/themes/console/images/info/gateway.png b/installer/resources/themes/console/images/info/gateway.png
deleted file mode 100644
index 21a343f04e0d6e862cc3e15d74eca8ea99a4a4f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt@=JY5_^
zEPBuOZ{$5>AmDo6kdgU8ZcG7p1=|s)4nc!Oeky!Ncnp{_1za~ZW@a!btF|evuenxl
z)y-eZo#`d{c1ghxdzKkL17f|8iCz8sr`3?%B~0vUWQh6(IT4S7EoW;uO&m7&?@}my
zC2QewcdzyBx?SrTAIvM<uGo05N8y2Ut)}enfVsuuDhp2kc=z+$A!hdJsu_D$ea`{9
Ojlt8^&t;ucLK6U2RZ*P)

diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 37d7b146f..f3aacde00 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -5852,11 +5852,6 @@ p:empty { /* empty paragraph nuke */
      padding: 0 !important;
 }
 
-.netdb_gateway {
-     margin-left: -3px !important;
-     margin-right: -3px !important;
-}
-
 .netdb_tunnel {
      display: inline-block;
      background: #e2e2ff;