From c82c8351dd61323da26ba716f1e2769e6677ac00 Mon Sep 17 00:00:00 2001 From: luccioman Date: Tue, 24 Jan 2017 09:40:43 +0100 Subject: [PATCH] Fixed Index Browser page HTML validation errors and switched to HTML5. Also removed deprecated HTML attributes uses. Validation performed with Nu Html Checker 17.1.0. Cross browser tested with : - Debian Jessie : Firefox ESR 45.6.0 - MS Windows 10 : Firefox 50.1.0, Chrome 55.0.2883.87, MS Edge --- htroot/HostBrowser.html | 73 +++++++++++++++++----------------- htroot/HostBrowser.java | 4 +- htroot/HostBrowserAdmin_p.html | 6 +-- 3 files changed, 39 insertions(+), 44 deletions(-) diff --git a/htroot/HostBrowser.html b/htroot/HostBrowser.html index 489f4dfb7..221f215d9 100644 --- a/htroot/HostBrowser.html +++ b/htroot/HostBrowser.html @@ -1,6 +1,5 @@ - - - + + YaCy '#[clientname]#': Index Browser #%env/templates/metas.template%# @@ -42,7 +41,7 @@ function updatepage(str) { if (totalResults > 0 && firstChannel.items.length > 0) { var item; - html += ""; + html += "
"; html += ""; html += "
URL from index (total results = " + totalResults + ")<\/td>"; for (var i = 0; i < firstChannel.items.length; i++) { @@ -101,7 +100,7 @@ function updatepage(str) {
Host List #{list}#
- +
#[count]##(crawler)#::/#[pending]##(/crawler)##(errors)#::/#[exclcount]#/#[failcount]##(/errors)# URLs
#{/list}# @@ -153,15 +152,15 @@ var solr= $.getJSON("solr/collection1/select?q=*:*&defType=edismax&start=0&rows= #(hostanalysis)#::
Host Analysis #{facets}# - +
- - + + #{facet}# - - + + #{/facet}#
#[facetname]###[facetname]##
#[key]##[count]##[key]##[count]#
   @@ -173,50 +172,50 @@ var solr= $.getJSON("solr/collection1/select?q=*:*&defType=edismax&start=0&rows=
Browser for #[path]#

documents stored for host: #[hostsize]#; documents stored for subpath: #[subpathloadsize]#; unloaded documents detected in subpath: #[subpathdetectedsize]#

- +
- - - - - - - + + + + + + + #(root)# - - - + + + :: #(/root)# #{list}# #(type)# - - + + #(stored)# - #(load)#:::: - :: - :: - + #(load)#:::: + :: + :: + #(/stored)# :: - - - - - - - + + + + + + + #(/type)# #{/list}#
PathstoredlinkedpendingexcludedfailedPathstoredlinkedpendingexcludedfailed
....
Show Metadata
#[url]#
Show Metadata
#[url]#link, detected from contextload & index#(/load)#indexed#[comment]#loading#[error]#link, detected from contextload & index#(/load)#indexed#[comment]#loading#[error]#
#[url]##[stored]##[linked]##[pending]##[excluded]##[failed]#Directory#[url]##[stored]##[linked]##[pending]##[excluded]##[failed]#
- #(linkgraph)#
:: + #(linkgraph)#
::
@@ -230,7 +229,7 @@ var solr= $.getJSON("solr/collection1/select?q=*:*&defType=edismax&start=0&rows=
Outbound Links, outgoing from #[host]# - Host List #{list}#
- +
#[count]# URLs
#{/list}# @@ -246,7 +245,7 @@ var solr= $.getJSON("solr/collection1/select?q=*:*&defType=edismax&start=0&rows=
Inbound Links, incoming to #[host]# - Host List #{list}#
- +
#[count]# URLs
#{/list}# diff --git a/htroot/HostBrowser.java b/htroot/HostBrowser.java index e51d61571..e99d73a5a 100644 --- a/htroot/HostBrowser.java +++ b/htroot/HostBrowser.java @@ -747,7 +747,7 @@ public class HostBrowser { c++; if (c % 80 == 0) sbi.append("
"); } - if (sbi.length() > 0) sbi.insert(0, "
internal referrer:
"); + if (sbi.length() > 0) sbi.insert(0, "
internal referrer:"); StringBuilder sbe = new StringBuilder(); c = 0; for (String s: references_external_urls) { @@ -755,7 +755,7 @@ public class HostBrowser { c++; if (c % 80 == 0) sbe.append("
"); } - if (sbe.length() > 0) sbe.insert(0, "
external referrer:
"); + if (sbe.length() > 0) sbe.insert(0, "
external referrer:"); return (this.crawldepth == 998 ? "unknown crawldepth" : this.crawldepth >= 0 ? "crawldepth: " + this.crawldepth : "") + (this.cr_c != null ? ", cr=" + (Math.round(this.cr_c * 1000.0d) / 1000.0d) : "") + diff --git a/htroot/HostBrowserAdmin_p.html b/htroot/HostBrowserAdmin_p.html index ef59f9289..069480dbd 100644 --- a/htroot/HostBrowserAdmin_p.html +++ b/htroot/HostBrowserAdmin_p.html @@ -2,11 +2,7 @@ #(hosts)#::
Administration Options -
-
-
Delete all Load Errors from index
-
-
+
Delete all Load Errors from index
#(/hosts)#