From a5fb824f711a33ce8af1b7618bf4efd0d22de8cd Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Thu, 19 Mar 2020 22:38:51 +0000 Subject: [PATCH] link 'browsing' links to specific matching table entries --- webui/src/main/js/browse.js | 2 +- webui/src/main/js/search.js | 4 ++-- webui/src/main/webapp/BrowseHost.jsp | 17 ++++++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/webui/src/main/js/browse.js b/webui/src/main/js/browse.js index 12c03b99..ca83cc04 100644 --- a/webui/src/main/js/browse.js +++ b/webui/src/main/js/browse.js @@ -176,7 +176,7 @@ function refreshActive() { if (currentBrowse != null) { var newBrowse = browsesByHost.get(currentHost) - if (currentBrowse.revision < newBrowse.revision) + if (newBrowse == null || currentBrowse.revision < newBrowse.revision) showResults(currentHost, currentBrowse.key, currentBrowse.descending) } else { document.getElementById("resultsTable").innerHTML = "" diff --git a/webui/src/main/js/search.js b/webui/src/main/js/search.js index decc7a14..c5aaea74 100644 --- a/webui/src/main/js/search.js +++ b/webui/src/main/js/search.js @@ -88,7 +88,7 @@ class Sender { if (this.browse == "false") return "" if (this.browsing == "true") - return "" + _t("Browsing") + "" + return "" + _t("Browsing") + "" var link = "" + _t("Browse") + "" var block = "" + link + "" return block @@ -632,7 +632,7 @@ function browse(host) { xmlhttp.onreadystatechange = function() { if (this.readyState == 4 && this.status == 200) { var linkSpan = document.getElementById("browse-link-"+host) - linkSpan.innerHTML = "" + _t("Browsing") + "" + linkSpan.innerHTML = "" + _t("Browsing") + "" } } xmlhttp.open("POST", "/MuWire/Browse", true) diff --git a/webui/src/main/webapp/BrowseHost.jsp b/webui/src/main/webapp/BrowseHost.jsp index acf3c722..30ec3a9a 100644 --- a/webui/src/main/webapp/BrowseHost.jsp +++ b/webui/src/main/webapp/BrowseHost.jsp @@ -1,11 +1,20 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="com.muwire.webui.*" %> +<%@ page import="com.muwire.core.*" %> +<%@ page import="java.io.*" %> +<%@ page import="net.i2p.data.Base64" %> <%@include file="initcode.jsi"%> <% -String pagetitle=Util._t("Browse Host"); +String pagetitle=Util._t("Browse Host"); + +String currentBrowse = null; +if (request.getParameter("currentHost") != null) { + Persona host = new Persona(new ByteArrayInputStream(Base64.decode(request.getParameter("currentHost")))); + currentBrowse = host.getHumanReadableName(); +} %> @@ -17,6 +26,12 @@ String pagetitle=Util._t("Browse Host"); +<% if (currentBrowse != null) { %> + +<% } %> + <%@ include file="header.jsi"%>