diff --git a/plug/templates/plugin.config.template b/plug/templates/plugin.config.template index f494eef0..dc6e3c9f 100644 --- a/plug/templates/plugin.config.template +++ b/plug/templates/plugin.config.template @@ -10,6 +10,6 @@ min-i2p-version=${i2pVersion} min-java-version=11 consoleLinkName=MuWire consoleLinkTooltip=Anonymous File Sharing -consoleLinkURL=/MuWire/index.jsp +consoleLinkURL=/MuWire/ console-icon=images/muwire.png <% println "date="+System.currentTimeMillis() %> diff --git a/webui/src/main/java/com/muwire/webui/DownloadServlet.java b/webui/src/main/java/com/muwire/webui/DownloadServlet.java index 9bd660d1..9d3b6b67 100644 --- a/webui/src/main/java/com/muwire/webui/DownloadServlet.java +++ b/webui/src/main/java/com/muwire/webui/DownloadServlet.java @@ -128,6 +128,6 @@ public class DownloadServlet extends HttpServlet { downloadManager.cancel(infoHash); } // P-R-G - resp.sendRedirect("/MuWire/Downloads.jsp"); + resp.sendRedirect("/MuWire/Downloads"); } } diff --git a/webui/src/main/java/com/muwire/webui/FilesServlet.java b/webui/src/main/java/com/muwire/webui/FilesServlet.java index 3c90f059..d61e76cf 100644 --- a/webui/src/main/java/com/muwire/webui/FilesServlet.java +++ b/webui/src/main/java/com/muwire/webui/FilesServlet.java @@ -129,7 +129,7 @@ public class FilesServlet extends HttpServlet { return; } fileManager.share(file); - resp.sendRedirect("/MuWire/SharedFiles.jsp"); + resp.sendRedirect("/MuWire/SharedFiles"); } else if (action.equals("unshare")) { String pathElements = req.getParameter("path"); if (pathElements == null) { diff --git a/webui/src/main/java/com/muwire/webui/MuWireServlet.java b/webui/src/main/java/com/muwire/webui/MuWireServlet.java index c74ae79e..efb4da88 100644 --- a/webui/src/main/java/com/muwire/webui/MuWireServlet.java +++ b/webui/src/main/java/com/muwire/webui/MuWireServlet.java @@ -48,7 +48,7 @@ public class MuWireServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { if (client.needsMWInit()) { - resp.sendRedirect("/MuWire/MuWire.jsp"); + resp.sendRedirect("/MuWire/MuWire"); } else { if (client.getCore() == null) { resp.setContentType("text/html"); @@ -71,7 +71,7 @@ public class MuWireServlet extends HttpServlet { ""); resp.setIntHeader("Refresh", 5); } else - resp.sendRedirect("/MuWire/Home.jsp"); + resp.sendRedirect("/MuWire/Home"); } } diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java index 77255551..f0f79467 100644 --- a/webui/src/main/java/com/muwire/webui/SearchServlet.java +++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java @@ -32,7 +32,7 @@ public class SearchServlet extends HttpServlet { } String search = req.getParameter("search"); searchManager.newSearch(search); - resp.sendRedirect("/MuWire/Home.jsp"); + resp.sendRedirect("/MuWire/Home"); } diff --git a/webui/src/main/webapp/Home.jsp b/webui/src/main/webapp/Home.jsp index 1114bbc9..9094c4f6 100644 --- a/webui/src/main/webapp/Home.jsp +++ b/webui/src/main/webapp/Home.jsp @@ -32,10 +32,10 @@
<% if (groupBy.equals("sender")) { %>

<%=Util._t("Active Searches By Sender")%>

- <%=Util._t("Group By File")%> + <%=Util._t("Group By File")%> <% } else { %>

<%=Util._t("Active Searches By File")%>

- <%=Util._t("Group By Sender")%> + <%=Util._t("Group By Sender")%> <% } %>
diff --git a/webui/src/main/webapp/MuWire.jsp b/webui/src/main/webapp/MuWire.jsp index 0416e8d3..36d25140 100644 --- a/webui/src/main/webapp/MuWire.jsp +++ b/webui/src/main/webapp/MuWire.jsp @@ -18,7 +18,7 @@ %>

<%=Util._t("Welcome to MuWire! Please select a nickname and download locations")%>

-
+ <%=Util._t("Nickname")%>:
<%=Util._t("Directory for saving downloaded files")%>: diff --git a/webui/src/main/webapp/SharedFiles.jsp b/webui/src/main/webapp/SharedFiles.jsp index f70e8b29..aaa58381 100644 --- a/webui/src/main/webapp/SharedFiles.jsp +++ b/webui/src/main/webapp/SharedFiles.jsp @@ -35,9 +35,9 @@ if (viewAs == null) ">
<% if (viewAs.equals("tree")) { %> - <%=Util._t("View As Table")%> + <%=Util._t("View As Table")%> <% } else { %> - <%=Util._t("View As Tree")%> + <%=Util._t("View As Tree")%> <% } %>
diff --git a/webui/src/main/webapp/header.jsi b/webui/src/main/webapp/header.jsi index ba2ee3a6..865d8908 100644 --- a/webui/src/main/webapp/header.jsi +++ b/webui/src/main/webapp/header.jsi @@ -1,6 +1,6 @@
- +
<%=Util._t("Welcome to MuWire")%>
diff --git a/webui/src/main/webapp/init.jsp b/webui/src/main/webapp/init.jsp index 6f6d6980..03124bce 100644 --- a/webui/src/main/webapp/init.jsp +++ b/webui/src/main/webapp/init.jsp @@ -19,6 +19,6 @@ client.initMWProps(nickname, new File(downloadLocation), new File(incompleteLocation)); client.start(); %> - + diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi index e3903b3a..05f86659 100644 --- a/webui/src/main/webapp/sidebar.jsi +++ b/webui/src/main/webapp/sidebar.jsi @@ -7,15 +7,15 @@

<%=Util._t("Pages")%>

- <%=Util._t("Downloads")%> - <%=Util._t("Search")%> - <%=Util._t("Shared Files")%> - Util._t("Browse") + <%=Util._t("Downloads")%> + <%=Util._t("Search")%> + <%=Util._t("Shared Files")%> + <%=Util._t("Browse")%>

<%=Util._t("Configuration")%>

- +
<%=Util._t("Settings")%>
 @@ -23,7 +23,7 @@

<%=Util._t("Help")%>

- <%=Util._t("User Guide")%> - <%=Util._t("FAQ")%> - <%=Util._t("About")%> + <%=Util._t("User Guide")%> + <%=Util._t("FAQ")%> + <%=Util._t("About")%>
diff --git a/webui/templates/web.xml.template b/webui/templates/web.xml.template index df99f7d8..2415a2f0 100644 --- a/webui/templates/web.xml.template +++ b/webui/templates/web.xml.template @@ -63,4 +63,49 @@ __JASPER__ + + + + com.muwire.webui.MuWireServlet + + + + + + com.muwire.webui.MuWireServlet + /index + + + + com.muwire.webui.BrowseHost_jsp + /BrowseHost + + + + com.muwire.webui.Downloads_jsp + /Downloads + + + + com.muwire.webui.Home_jsp + /Home + + + + com.muwire.webui.MuWire_jsp + /MuWire + + + + com.muwire.webui.SharedFiles_jsp + /SharedFiles + + + + com.muwire.webui.init_jsp + /init + +