From eda91af7c7fcacd3192f3915753925e24180300d Mon Sep 17 00:00:00 2001
From: hankhill19580 <hankhill19580@gmail.com>
Date: Mon, 11 Nov 2019 17:57:08 +0000
Subject: [PATCH] pick a better icon for hidden services manager, improve some
 text, and hide some of the stuff in /monitoring

---
 .../router/web/helpers/ConfigHomeHandler.java   |  6 +++++-
 .../net/i2p/router/web/helpers/HomeHelper.java  |  7 ++-----
 apps/routerconsole/jsp/confighome.jsp           | 17 +++++++++--------
 apps/routerconsole/jsp/home.jsp                 |  2 +-
 history.txt                                     |  2 ++
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
index 1fdb4e43ab..d52443b6e6 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
@@ -85,8 +85,12 @@ public class ConfigHomeHandler extends FormHandler {
                     app = new App(name, "", url, "/themes/console/images/eepsite.png");
                 else if ("2".equals(group))
                     app = new App(name, "", url, "/themes/console/images/title_window.png");
-                else
+                else if ("3".equals(group))
                     app = new App(name, "", url, "/themes/console/images/question.png");
+                else if ("4".equals(group))
+                    app = new App(name, "", url, "/themes/console/images/server.png");
+                else if ("5".equals(group))
+                    app = new App(name, "", url, "/themes/console/images/chart_line.png");
                 apps.add(app);
                 addFormNotice(_t("Added") + ": " + app.name);
             } else {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
index c0a20bf905..1fa13e3940 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
@@ -38,7 +38,7 @@ public class HomeHelper extends HelperBase {
     // No commas allowed in text strings!
     static final String DEFAULT_SERVICES =
         _x("Email") + S + _x("Anonymous webmail client") + S + "/webmail" + S + I + "email.png" + S +
-        _x("I2P Tunnel") + S + _x("Port-Forwarding to and from I2P") + S + "/i2ptunnelmgr" + S + I + "itoopie_xsm.png" + S +
+        _x("Hidden Services Manager") + S + _x("Control your client and server tunnels") + S + "/i2ptunnelmgr" + S + I + "server_32x32.png" + S +
         _x("Torrents") + S + _x("Built-in anonymous BitTorrent Client") + S + "/torrents" + S + I + "i2psnark.png" + S +
         _x("Web Server") + S + _x("Local web server for hosting your own content on I2P") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S +
         _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S +
@@ -97,10 +97,7 @@ public class HomeHelper extends HelperBase {
     // No commas allowed in text strings!
     static final String DEFAULT_MONITORING =
         _x("Logs") + S + _x("View the logs") + S + "/logs" + S + I + "billiard_marker.png" + S +
-        _x("Router Stats") + S + _x("View router stats") + S + "/stats" + S + I + "info/bandwidth.png" + S +
-        _x("Charts and Graphs") + S + _x("Visualize information about the router") + S + "/graphs" + S + I + "chart_line.png" + S +
-        _x("Network Database") + S + _x("View the NetDB") + S + "/netdb" + S + I + "support.png" + S +
-        _x("Peers") + S + _x("View your known peers") + S + "/peers" + S + I + "group.png" + S +
+        _x("Graphs") + S + _x("Visualize information about the router") + S + "/graphs" + S + I + "chart_line.png" + S +
         "";
 
     public boolean shouldShowWelcome() {
diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp
index ae6f5ea218..88c4dee425 100644
--- a/apps/routerconsole/jsp/confighome.jsp
+++ b/apps/routerconsole/jsp/confighome.jsp
@@ -62,12 +62,13 @@ input.default {
 <%
    }  // shouldShowSearch()
 %>
-<h3 class="tabletitle"><%=intl._t("Blogs, Forums, and Web Sites")%></h3>
+
+<h3 class="tabletitle"><%=intl._t("Applications")%></h3>
 <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
- <input type="hidden" name="group" value="1">
- <jsp:getProperty name="homehelper" property="configFavorites" />
- <div class="formaction" id="homesites">
+ <input type="hidden" name="group" value="2">
+ <jsp:getProperty name="homehelper" property="configServices" />
+ <div class="formaction" id="homeapps">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
   <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
@@ -76,12 +77,12 @@ input.default {
  </div>
 </form>
 
-<h3 class="tabletitle"><%=intl._t("Applications")%></h3>
+<h3 class="tabletitle"><%=intl._t("Websites")%></h3>
 <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
- <input type="hidden" name="group" value="2">
- <jsp:getProperty name="homehelper" property="configServices" />
- <div class="formaction" id="homeapps">
+ <input type="hidden" name="group" value="1">
+ <jsp:getProperty name="homehelper" property="configFavorites" />
+ <div class="formaction" id="homesites">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
   <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 01ad5f1eae..189461632c 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -93,7 +93,7 @@
     </div>
   </div>
   <div class="ag2">
-    <h4 class="app2"><%=intl._t("Blogs, Forums, and Web Sites")%></h4>
+    <h4 class="app2"><%=intl._t("Websites")%></h4>
     <div class="homesites">
       <jsp:getProperty name="homehelper" property="favorites" /><br>
     <div class="clearer">&nbsp;</div>
diff --git a/history.txt b/history.txt
index bedd0a6333..bd530578ca 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,8 @@
 2019-11-06 idk
  * Router:
   - Use Local Application Data(%LOCALAPPDATA%) instead of Roaming for config
+ * Console:
+  - Change home page organization, headlines, to expose more information
 
 2019-11-02 zzz
  * Router: NSR/ES fixes for proposal 144