From 44dc7b808f184eea2f4ef83acb139017c43d32e8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 3 May 2020 08:28:05 -0400
Subject: [PATCH 1/2] Clean up help text for consistency and translatability

---
 webui/src/main/webapp/AboutMe.jsp           | 10 +++++-----
 webui/src/main/webapp/AdvancedSharing.jsp   |  2 +-
 webui/src/main/webapp/BrowseHost.jsp        |  6 +++---
 webui/src/main/webapp/ConfigurationPage.jsp |  2 +-
 webui/src/main/webapp/Downloads.jsp         |  2 +-
 webui/src/main/webapp/Feeds.jsp             | 10 +++++-----
 webui/src/main/webapp/FileDetails.jsp       |  2 +-
 webui/src/main/webapp/Home.jsp              |  4 ++--
 webui/src/main/webapp/MuStatus.jsp          |  2 +-
 webui/src/main/webapp/MuWire.jsp            |  2 +-
 webui/src/main/webapp/SharedFiles.jsp       | 13 ++++++-------
 webui/src/main/webapp/TrustLists.jsp        |  2 +-
 webui/src/main/webapp/TrustUsers.jsp        |  4 ++--
 webui/src/main/webapp/Uploads.jsp           |  2 +-
 webui/src/main/webapp/searchbox.jsi         |  2 +-
 15 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/webui/src/main/webapp/AboutMe.jsp b/webui/src/main/webapp/AboutMe.jsp
index 0ccbfe07..83d21f7d 100644
--- a/webui/src/main/webapp/AboutMe.jsp
+++ b/webui/src/main/webapp/AboutMe.jsp
@@ -10,7 +10,7 @@
 
 <% 
 String pagetitle=Util._t("About Me");
-String helptext = Util._t("This page shows information about your MuWire identity");
+String helptext = Util._t("This page shows information about your MuWire identity.");
 
 Core core = (Core) application.getAttribute("core");
 
@@ -23,7 +23,7 @@ Core core = (Core) application.getAttribute("core");
 <script>
 function copyFullId() {
 	copyToClipboard("full-id")
-	alert("Full Id Copied To Clipboard")
+	alert("Full ID copied to clipboard")
 }
 </script>
     </head>
@@ -34,10 +34,10 @@ function copyFullId() {
 <%@include file="sidebar.jsi"%>    	
 	</aside>
 	<section class="main foldermain">
-		<p><%=Util._t("Your short MuWire id is {0}", core.getMe().getHumanReadableName())%></p>
-		<p><%=Util._t("Your full MuWire id is")%></p>
+		<p><%=Util._t("Your short MuWire ID: {0}", core.getMe().getHumanReadableName())%></p>
+		<p><%=Util._t("Your full MuWire ID:")%></p>
 		<p><textarea class="fullId" id="full-id" readOnly="true"><%=core.getMe().toBase64()%></textarea></p>
-		<p><a href='#' onclick="window.copyFullId();return false;"><%=Util._t("Copy To Clipboard")%></a></p>
+		<p><a href='#' onclick="window.copyFullId();return false;"><%=Util._t("Copy to clipboard")%></a></p>
 	</section>
     </body>
 </html>
diff --git a/webui/src/main/webapp/AdvancedSharing.jsp b/webui/src/main/webapp/AdvancedSharing.jsp
index 1b6be874..f4a23407 100644
--- a/webui/src/main/webapp/AdvancedSharing.jsp
+++ b/webui/src/main/webapp/AdvancedSharing.jsp
@@ -6,7 +6,7 @@
 <% 
 
 String pagetitle=Util._t("Advanced Sharing"); 
-String helptext = Util._t("On this page you can configure advanced settings for each shared directory.");
+String helptext = Util._t("Use this page to configure advanced settings for each shared directory.");
 
 %>
 
diff --git a/webui/src/main/webapp/BrowseHost.jsp b/webui/src/main/webapp/BrowseHost.jsp
index c150bee2..13ee0aca 100644
--- a/webui/src/main/webapp/BrowseHost.jsp
+++ b/webui/src/main/webapp/BrowseHost.jsp
@@ -9,7 +9,7 @@
 <% 
 
 String pagetitle=Util._t("Browse Host");
-String helptext = Util._t("On this page you can browse the files shared by other MuWire users");
+String helptext = Util._t("Use this page to browse the files shared by other MuWire users.");
 
 String currentBrowse = null;
 if (request.getParameter("currentHost") != null) {
@@ -39,7 +39,7 @@ if (request.getParameter("currentHost") != null) {
 	    <aside>
 		<div class="menubox-divider"></div>
 		<div class="menubox">
-			<h2><%=Util._t("Enter a full MuWire id")%></h2>
+			<h2><%=Util._t("Enter a full MuWire ID")%></h2>
 			<form action="/MuWire/Browse" method="post">
 				<input type="text" name="host">
 				<input type="hidden" name="action" value="browse">
@@ -48,7 +48,7 @@ if (request.getParameter("currentHost") != null) {
 				  <input type="submit" value=<%=Util._t("Browse")%>>
 				  <div class="tooltip"><%=Util._t("Help")%>
 				  	<span class="tooltiptext">
-				  		<%=Util._t("Enter the full id of a MuWire user to see what files they are sharing")%>
+				  		<%=Util._t("Enter the full ID of a MuWire user to see what files they are sharing")%>
 				  	</span>
 				  </div>
 				</div>
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index e9c1d982..6bee9c79 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -12,7 +12,7 @@
 
 <% 
 String pagetitle=Util._t("Configuration");
-String helptext = Util._t("On this page you can change various MuWire options");
+String helptext = Util._t("Use this page to change MuWire options.");
 
 Core core = (Core) application.getAttribute("core");
 
diff --git a/webui/src/main/webapp/Downloads.jsp b/webui/src/main/webapp/Downloads.jsp
index 85601203..2c9375fc 100644
--- a/webui/src/main/webapp/Downloads.jsp
+++ b/webui/src/main/webapp/Downloads.jsp
@@ -12,7 +12,7 @@
 
 <% 
 String pagetitle=Util._t("Downloads");
-String helptext = Util._t("This page shows files which you are currently downloading from other MuWire users."); 
+String helptext = Util._t("This page shows the files you are currently downloading from other MuWire users."); 
 %>
 
 <html>
diff --git a/webui/src/main/webapp/Feeds.jsp b/webui/src/main/webapp/Feeds.jsp
index 1cb9d5ed..ffbee04f 100644
--- a/webui/src/main/webapp/Feeds.jsp
+++ b/webui/src/main/webapp/Feeds.jsp
@@ -6,10 +6,10 @@
 <% 
 
 String pagetitle=Util._t("Feeds"); 
-String helptext = Util._t("Every MuWire user can have a file feed to which they can publish shared files of their choosing.  " +
-						"You can subscribe to the feeds of other users.  That is similar to following someone on a social network.");
-helptext +=  "<br/>" + Util._t("On this page you can view the file feeds of users you are subscribed to.  You can configure each feed " +
-						"separately with various options, and you can download the published files.");
+String helptext = Util._t("Every MuWire user can have a file feed to publish shared files of their choosing. " +
+                          "You can subscribe to the feeds of other users. This is similar to following someone on a social network.") +
+        "<br/>" + Util._t("On this page you can view the file feeds of users you are subscribed to. You can configure each feed " +
+			  "separately with various options, and you can download the published files.");
 
 %>
 
@@ -36,7 +36,7 @@ helptext +=  "<br/>" + Util._t("On this page you can view the file feeds of user
 				  <input type="submit" value=<%=Util._t("Subscribe")%>>
 				  <div class="tooltip"><%=Util._t("Help")%>
 				  	<span class="tooltiptext">
-				  		<%=Util._t("Enter the full id of a MuWire user to see what files they have published to their feed")%>
+				  		<%=Util._t("Enter the full ID of a MuWire user to see what files they have published to their feed")%>
 				  	</span>
 				  </div>
 				</div>
diff --git a/webui/src/main/webapp/FileDetails.jsp b/webui/src/main/webapp/FileDetails.jsp
index 1bfa8961..93c4b335 100644
--- a/webui/src/main/webapp/FileDetails.jsp
+++ b/webui/src/main/webapp/FileDetails.jsp
@@ -7,7 +7,7 @@
 <% 
 
 String pagetitle=Util._t("File Details"); 
-String helptext = Util._t("Details about the selected shared file.");
+String helptext = Util._t("View details about the selected shared file here.");
 
 String path = request.getParameter("path");
 File file = Util.getFromPathElements(path);
diff --git a/webui/src/main/webapp/Home.jsp b/webui/src/main/webapp/Home.jsp
index 6e17a09b..aa865681 100644
--- a/webui/src/main/webapp/Home.jsp
+++ b/webui/src/main/webapp/Home.jsp
@@ -10,8 +10,8 @@
 <%
         String pagetitle=Util._t("Home");
         
-        String helptext = Util._t("On this page you can search for files shared by other MuWire users");
-        helptext += "<br/>" + Util._t("You can group the results by sender or by file");
+        String helptext = Util._t("Search for files shared by other MuWire users.") +
+                "<br/>" + Util._t("You can group the results by sender or by file.");
         
 	session.setAttribute("persona", persona);
 	session.setAttribute("version", version);
diff --git a/webui/src/main/webapp/MuStatus.jsp b/webui/src/main/webapp/MuStatus.jsp
index e8cf2168..5a892957 100644
--- a/webui/src/main/webapp/MuStatus.jsp
+++ b/webui/src/main/webapp/MuStatus.jsp
@@ -7,7 +7,7 @@
 <% 
 
 String pagetitle=Util._t("MuWire Status");
-String helptext = Util._t("This page shows various internal MuWire metrics");
+String helptext = Util._t("This page shows internal MuWire metrics.");
  
 Core core = (Core) application.getAttribute("core");
 String buildNumber = (String)application.getAttribute("buildNumber");
diff --git a/webui/src/main/webapp/MuWire.jsp b/webui/src/main/webapp/MuWire.jsp
index da8a7c5a..3f3a89e6 100644
--- a/webui/src/main/webapp/MuWire.jsp
+++ b/webui/src/main/webapp/MuWire.jsp
@@ -7,7 +7,7 @@
 
 <%
 	String pagetitle = Util._t("Initial Setup");
-	String helptext = Util._t("On this page you can set up your MuWire nickname and download locations");
+	String helptext = Util._t("Set up your MuWire nickname and download locations now.");
 %>
 
 <html>
diff --git a/webui/src/main/webapp/SharedFiles.jsp b/webui/src/main/webapp/SharedFiles.jsp
index f5478395..29dbcbe0 100644
--- a/webui/src/main/webapp/SharedFiles.jsp
+++ b/webui/src/main/webapp/SharedFiles.jsp
@@ -5,10 +5,10 @@
 <% 
 
 String pagetitle= Util._t("Shared Files");
-String helptext = Util._t("Shared files are those files you decide to share with other MuWire users.");
-helptext += "<br/>" + Util._t("To share a file, enter it's path in the box to the left.");
-helptext += "<br/>" + Util._t("You can view your shared files as a tree or as a table.");
-helptext += "<br/>" + Util._t("The \"Actions\" menu lets you perform various actions on the shared file.");
+String helptext = Util._t("Shared files are those files you decide to share with other MuWire users.") +
+        "<br/>" + Util._t("To share a file, enter its path in the box to the left.") +
+        "<br/>" + Util._t("You can view your shared files as a tree or as a table.") +
+        "<br/>" + Util._t("The \"Actions\" menu lets you perform various actions on the shared file.");
 
 String viewAs = request.getParameter("viewAs");
 if (viewAs == null)
@@ -44,10 +44,9 @@ if (viewAs == null)
 				  <div class="menu-icon"></div>
 				  <input type="submit" value="<%=Util._t("Share")%>">
 				  <div class="tooltip"><%=Util._t("Help")%>
-				  	<span class="tooltiptext"><%=Util._t("Enter path to file or folder you wish to share.")%>
+				  	<span class="tooltiptext"><%=Util._t("Enter the full path for the file or folder to be shared.")%>
 				  		<br/>
-				  		<%=Util._t("When sharing files on network drives (like a NAS) please visit")%>
-				  		<a href="/MuWire/AdvancedSharing"><%=Util._t("Advanced Sharing")%></a>
+				  		<%=Util._t("When sharing files on network drives (like a NAS) please visit {0}Advanced Sharing{1}", "<a href=\"/MuWire/AdvancedSharing\">", "</a>")%>
 				  	</span>
 				  </div>
 				</div>
diff --git a/webui/src/main/webapp/TrustLists.jsp b/webui/src/main/webapp/TrustLists.jsp
index e5ecec86..92eb398b 100644
--- a/webui/src/main/webapp/TrustLists.jsp
+++ b/webui/src/main/webapp/TrustLists.jsp
@@ -5,7 +5,7 @@
 <% 
 
 String pagetitle=Util._t("Subscriptions"); 
-String helptext = Util._t("This page shows the trust lists of users whom you have subscribed to.");
+String helptext = Util._t("This page shows the trust lists of the users you have subscribed to.");
 %>
 
 <html>
diff --git a/webui/src/main/webapp/TrustUsers.jsp b/webui/src/main/webapp/TrustUsers.jsp
index 62338568..f90a00a0 100644
--- a/webui/src/main/webapp/TrustUsers.jsp
+++ b/webui/src/main/webapp/TrustUsers.jsp
@@ -5,8 +5,8 @@
 <% 
 
 String pagetitle=Util._t("Users"); 
-String helptext = Util._t("This page shows the users you have marked as Trusted or Distrusted.");
-helptext += "<br/>" + Util._t("You can subscribe to the trust lists of the users you trust and see who they trust or distrust in turn.");
+String helptext = Util._t("This page shows the users you have marked as Trusted or Distrusted.") +
+        "<br/>" + Util._t("You can subscribe to the trust lists of your Trusted users and see who they trust or distrust.");
 %>
 
 <html>
diff --git a/webui/src/main/webapp/Uploads.jsp b/webui/src/main/webapp/Uploads.jsp
index e5c14233..e9040e56 100644
--- a/webui/src/main/webapp/Uploads.jsp
+++ b/webui/src/main/webapp/Uploads.jsp
@@ -12,7 +12,7 @@
 
 <% 
 String pagetitle=Util._t("Uploads");
-String helptext = Util._t("This page shows files which you are currently uploading to other MuWire users."); 
+String helptext = Util._t("This page shows the files you are currently uploading to other MuWire users."); 
 %>
 
 <html>
diff --git a/webui/src/main/webapp/searchbox.jsi b/webui/src/main/webapp/searchbox.jsi
index 33dca372..cbd46fc9 100644
--- a/webui/src/main/webapp/searchbox.jsi
+++ b/webui/src/main/webapp/searchbox.jsi
@@ -10,7 +10,7 @@
                        <input type="submit" value="<%=Util._t("Search")%>" />
                        <div class="tooltip">
                        		<%=Util._t("Help")%>
-                       		<span class="tooltiptext"><%=Util._t("Enter keywords or file hash")%></span>
+                       		<span class="tooltiptext"><%=Util._t("Enter keywords or file hash.")%></span>
                        	</div>
                      </div>
                   </form>

From 91ea2c01845a1a0638deebc6f16b6c6d2b4d9607 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 3 May 2020 12:16:05 -0400
Subject: [PATCH 2/2] Move accordion javascript to its own file Open the
 accordion section for the page you are on

---
 webui/src/main/js/accordion.js              | 29 +++++++++++++++++++++
 webui/src/main/webapp/AboutMe.jsp           |  1 +
 webui/src/main/webapp/AdvancedSharing.jsp   |  4 ++-
 webui/src/main/webapp/ConfigurationPage.jsp |  3 +++
 webui/src/main/webapp/MuStatus.jsp          |  4 ++-
 webui/src/main/webapp/TrustLists.jsp        |  4 ++-
 webui/src/main/webapp/TrustUsers.jsp        |  4 ++-
 webui/src/main/webapp/css.jsi               |  1 +
 webui/src/main/webapp/sidebar.jsi           | 17 ------------
 9 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 webui/src/main/js/accordion.js

diff --git a/webui/src/main/js/accordion.js b/webui/src/main/js/accordion.js
new file mode 100644
index 00000000..f2189fe8
--- /dev/null
+++ b/webui/src/main/js/accordion.js
@@ -0,0 +1,29 @@
+var openAccordion = 0;
+
+function initAccordion() {
+  var acc = document.getElementsByClassName("accordion");
+  var i;
+
+  for (i = 0; i < acc.length; i++) {
+    acc[i].addEventListener("click", function() {
+      this.classList.toggle("active");
+      var panel = this.nextElementSibling;
+      if (panel.style.maxHeight) {
+        panel.style.maxHeight = null;
+      } else {
+        panel.style.maxHeight = panel.scrollHeight + "px";
+      } 
+    });
+  }
+
+  if (openAccordion > 0) {
+      acc[openAccordion - 1].classList.add("active");
+      var panel = acc[openAccordion - 1].nextElementSibling;
+      panel.style.maxHeight = panel.scrollHeight + "px";
+  }
+}
+
+
+document.addEventListener("DOMContentLoaded", function() {
+   initAccordion();
+}, true);
diff --git a/webui/src/main/webapp/AboutMe.jsp b/webui/src/main/webapp/AboutMe.jsp
index 83d21f7d..05ca172b 100644
--- a/webui/src/main/webapp/AboutMe.jsp
+++ b/webui/src/main/webapp/AboutMe.jsp
@@ -25,6 +25,7 @@ function copyFullId() {
 	copyToClipboard("full-id")
 	alert("Full ID copied to clipboard")
 }
+openAccordion = 3;
 </script>
     </head>
     <body onload="initConnectionsCount();">
diff --git a/webui/src/main/webapp/AdvancedSharing.jsp b/webui/src/main/webapp/AdvancedSharing.jsp
index f4a23407..62edaec3 100644
--- a/webui/src/main/webapp/AdvancedSharing.jsp
+++ b/webui/src/main/webapp/AdvancedSharing.jsp
@@ -16,7 +16,9 @@ String helptext = Util._t("Use this page to configure advanced settings for each
 <script src="js/util.js?<%=version%>" type="text/javascript"></script>
 <script src="js/tables.js?<%=version%> type="text/javascript"></script>
 <script src="js/advancedSharing.js?<%=version%>" type="text/javascript"></script>
-
+<script type="text/javascript">
+  openAccordion = 2;
+</script>
 	</head>
 	<body onload="initTranslate(jsTranslations); initConnectionsCount(); initAdvancedSharing();">
 <%@ include file="header.jsi"%>
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index 6bee9c79..1bca0306 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -27,6 +27,9 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 <html>
     <head>
 <%@include file="css.jsi"%>
+<script type="text/javascript">
+  openAccordion = 2;
+</script>
     </head>
     <body onload="initConnectionsCount();">
 <%@include file="header.jsi"%>    	
diff --git a/webui/src/main/webapp/MuStatus.jsp b/webui/src/main/webapp/MuStatus.jsp
index 5a892957..67ed7931 100644
--- a/webui/src/main/webapp/MuStatus.jsp
+++ b/webui/src/main/webapp/MuStatus.jsp
@@ -18,7 +18,9 @@ String buildNumber = (String)application.getAttribute("buildNumber");
 	<head>
 <%@ include file="css.jsi"%>
 <script src="js/status.js?<%=version%>" type="text/javascript"></script>
-
+<script>
+    openAccordion = 3;
+</script>
 	</head>
 	<body onload="initConnectionsCount(); initStatus();">
 <%@ include file="header.jsi"%>
diff --git a/webui/src/main/webapp/TrustLists.jsp b/webui/src/main/webapp/TrustLists.jsp
index 92eb398b..26afdad5 100644
--- a/webui/src/main/webapp/TrustLists.jsp
+++ b/webui/src/main/webapp/TrustLists.jsp
@@ -14,7 +14,9 @@ String helptext = Util._t("This page shows the trust lists of the users you have
 <script src="js/util.js?<%=version%>" type="text/javascript"></script>
 <script src="js/tables.js?<%=version%>" type="text/javascript"></script>
 <script src="js/trustLists.js?<%=version%>" type="text/javascript"></script>
-
+<script type="text/javascript">
+  openAccordion = 1;
+</script>
 	</head>
 	<body onload="initTranslate(jsTranslations); initConnectionsCount(); initTrustLists();">
 <%@ include file="header.jsi"%>
diff --git a/webui/src/main/webapp/TrustUsers.jsp b/webui/src/main/webapp/TrustUsers.jsp
index f90a00a0..0ca41756 100644
--- a/webui/src/main/webapp/TrustUsers.jsp
+++ b/webui/src/main/webapp/TrustUsers.jsp
@@ -15,7 +15,9 @@ String helptext = Util._t("This page shows the users you have marked as Trusted
 <script src="js/util.js?<%=version%>" type="text/javascript"></script>
 <script src="js/tables.js?<%=version%>" type="text/javascript"></script>
 <script src="js/trustUsers.js?<%=version%>" type="text/javascript"></script>
-
+<script type="text/javascript">
+  openAccordion = 1;
+</script>
 	</head>
 	<body onload="initTranslate(jsTranslations); initConnectionsCount(); initTrustUsers();">
 <%@ include file="header.jsi"%>
diff --git a/webui/src/main/webapp/css.jsi b/webui/src/main/webapp/css.jsi
index 5462c5d5..0154f71c 100644
--- a/webui/src/main/webapp/css.jsi
+++ b/webui/src/main/webapp/css.jsi
@@ -4,6 +4,7 @@
 <link rel="icon" type="image/png" href="images/muwire.png" />
 <script src="js/conncount.js?${version}" type="text/javascript"></script>
 <script src="js/translate.js?${version}" type="text/javascript"></script>
+<script src="js/accordion.js?${version}" type="text/javascript"></script>
 <script type="text/javascript">
   var jsTranslations = '<%=Util.getJSTranslations()%>';
 </script>
diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi
index f4129b41..6ecc37f6 100644
--- a/webui/src/main/webapp/sidebar.jsi
+++ b/webui/src/main/webapp/sidebar.jsi
@@ -105,20 +105,3 @@
                 <a class="menuitem" href="about"><%=Util._t("About")%></a>
             </div>
 			-->
-
-<script>
-var acc = document.getElementsByClassName("accordion");
-var i;
-
-for (i = 0; i < acc.length; i++) {
-  acc[i].addEventListener("click", function() {
-    this.classList.toggle("active");
-    var panel = this.nextElementSibling;
-    if (panel.style.maxHeight) {
-      panel.style.maxHeight = null;
-    } else {
-      panel.style.maxHeight = panel.scrollHeight + "px";
-    } 
-  });
-}
-</script>
\ No newline at end of file