diff --git a/webui/src/main/webapp/AboutMe.jsp b/webui/src/main/webapp/AboutMe.jsp index 007def7d..0ccbfe07 100644 --- a/webui/src/main/webapp/AboutMe.jsp +++ b/webui/src/main/webapp/AboutMe.jsp @@ -10,6 +10,8 @@ <% String pagetitle=Util._t("About Me"); +String helptext = Util._t("This page shows information about your MuWire identity"); + Core core = (Core) application.getAttribute("core"); %> diff --git a/webui/src/main/webapp/AdvancedSharing.jsp b/webui/src/main/webapp/AdvancedSharing.jsp index cbf114b2..1b6be874 100644 --- a/webui/src/main/webapp/AdvancedSharing.jsp +++ b/webui/src/main/webapp/AdvancedSharing.jsp @@ -6,6 +6,7 @@ <% String pagetitle=Util._t("Advanced Sharing"); +String helptext = Util._t("On this page you can configure advanced settings for each shared directory."); %> diff --git a/webui/src/main/webapp/BrowseHost.jsp b/webui/src/main/webapp/BrowseHost.jsp index 601da486..c150bee2 100644 --- a/webui/src/main/webapp/BrowseHost.jsp +++ b/webui/src/main/webapp/BrowseHost.jsp @@ -9,6 +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 currentBrowse = null; if (request.getParameter("currentHost") != null) { diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp index 4ee39709..f24060b6 100644 --- a/webui/src/main/webapp/ConfigurationPage.jsp +++ b/webui/src/main/webapp/ConfigurationPage.jsp @@ -12,6 +12,8 @@ <% String pagetitle=Util._t("Configuration"); +String helptext = Util._t("On this page you can change various MuWire options"); + Core core = (Core) application.getAttribute("core"); String inboundLength = core.getI2pOptions().getProperty("inbound.length"); diff --git a/webui/src/main/webapp/Downloads.jsp b/webui/src/main/webapp/Downloads.jsp index 4f4ae4ce..85601203 100644 --- a/webui/src/main/webapp/Downloads.jsp +++ b/webui/src/main/webapp/Downloads.jsp @@ -10,7 +10,10 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@include file="initcode.jsi"%> -<% String pagetitle=Util._t("Downloads"); %> +<% +String pagetitle=Util._t("Downloads"); +String helptext = Util._t("This page shows files which you are currently downloading from other MuWire users."); +%> diff --git a/webui/src/main/webapp/Feeds.jsp b/webui/src/main/webapp/Feeds.jsp index 7547539c..1cb9d5ed 100644 --- a/webui/src/main/webapp/Feeds.jsp +++ b/webui/src/main/webapp/Feeds.jsp @@ -6,6 +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 += "
" + 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."); %> diff --git a/webui/src/main/webapp/FileDetails.jsp b/webui/src/main/webapp/FileDetails.jsp index 469c4a20..1bfa8961 100644 --- a/webui/src/main/webapp/FileDetails.jsp +++ b/webui/src/main/webapp/FileDetails.jsp @@ -7,6 +7,7 @@ <% String pagetitle=Util._t("File Details"); +String helptext = Util._t("Details about the selected shared file."); 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 f349af4d..b34d8fad 100644 --- a/webui/src/main/webapp/Home.jsp +++ b/webui/src/main/webapp/Home.jsp @@ -9,6 +9,10 @@ <%@include file="initcode.jsi"%> <% String pagetitle=Util._t("Home"); + + String helptext = Util._t("On this page you can search for files shared by other MuWire users"); + helptext += "
" + 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 52e7c61a..e8cf2168 100644 --- a/webui/src/main/webapp/MuStatus.jsp +++ b/webui/src/main/webapp/MuStatus.jsp @@ -6,7 +6,9 @@ <% -String pagetitle=Util._t("MuWire Status"); +String pagetitle=Util._t("MuWire Status"); +String helptext = Util._t("This page shows various 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 06c42fe5..da8a7c5a 100644 --- a/webui/src/main/webapp/MuWire.jsp +++ b/webui/src/main/webapp/MuWire.jsp @@ -7,6 +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"); %> diff --git a/webui/src/main/webapp/SharedFiles.jsp b/webui/src/main/webapp/SharedFiles.jsp index 467c8b9c..f5478395 100644 --- a/webui/src/main/webapp/SharedFiles.jsp +++ b/webui/src/main/webapp/SharedFiles.jsp @@ -5,6 +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 += "
" + Util._t("To share a file, enter it's path in the box to the left."); +helptext += "
" + Util._t("You can view your shared files as a tree or as a table."); +helptext += "
" + Util._t("The \"Actions\" menu lets you perform various actions on the shared file."); String viewAs = request.getParameter("viewAs"); if (viewAs == null) diff --git a/webui/src/main/webapp/TrustLists.jsp b/webui/src/main/webapp/TrustLists.jsp index 208da28d..19fbca8b 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."); %> diff --git a/webui/src/main/webapp/TrustUsers.jsp b/webui/src/main/webapp/TrustUsers.jsp index a1aafa17..3e71f4a0 100644 --- a/webui/src/main/webapp/TrustUsers.jsp +++ b/webui/src/main/webapp/TrustUsers.jsp @@ -5,7 +5,8 @@ <% String pagetitle=Util._t("Users"); - +String helptext = Util._t("This page shows the users you have marked as Trusted or Distrusted."); +helptext += "
" + Util._t("You can subscribe to the trust lists of the users you trust and see who they trust or distrust in turn."); %> diff --git a/webui/src/main/webapp/Uploads.jsp b/webui/src/main/webapp/Uploads.jsp index e43d15f4..e5c14233 100644 --- a/webui/src/main/webapp/Uploads.jsp +++ b/webui/src/main/webapp/Uploads.jsp @@ -10,7 +10,10 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@include file="initcode.jsi"%> -<% String pagetitle=Util._t("Uploads"); %> +<% +String pagetitle=Util._t("Uploads"); +String helptext = Util._t("This page shows files which you are currently uploading to other MuWire users."); +%> diff --git a/webui/src/main/webapp/header.jsi b/webui/src/main/webapp/header.jsi index a22438e8..49314224 100644 --- a/webui/src/main/webapp/header.jsi +++ b/webui/src/main/webapp/header.jsi @@ -9,12 +9,12 @@
-
+ <%=pagetitle%> -
+
<%=Util._t("Help")%> - Help text goes here + <%=helptext%>