diff options
| author | mikeworks <mikeworks@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2010-10-17 16:51:29 +0000 |
|---|---|---|
| committer | mikeworks <mikeworks@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2010-10-17 16:51:29 +0000 |
| commit | 61e87c0b145458fd6a3da3842d9ae7ffb8fb29af (patch) | |
| tree | 5a4d6ff0f58a45d473a3153361c4144090e86981 /htroot | |
| parent | a79728b97d20c21ffbb4577f87aac6add93da48e (diff) | |
IndexControlRWIs_p.html, IndexControlURLs_p.html, ViewFile.html/.java: changes to HTML output and in case of empty values for XHTML strict / transitional validation
de.lng: Added missing translation for Show Content and changed existing line
--> Index Administration should now correctly validate XHTML 1.0 Strict / Trans
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7255 6c8d7289-2bf4-0310-a012-ef5d649a1542
Diffstat (limited to 'htroot')
| -rw-r--r-- | htroot/IndexControlRWIs_p.html | 5 | ||||
| -rw-r--r-- | htroot/IndexControlURLs_p.html | 23 | ||||
| -rw-r--r-- | htroot/ViewFile.html | 33 | ||||
| -rw-r--r-- | htroot/ViewFile.java | 8 |
4 files changed, 36 insertions, 33 deletions
diff --git a/htroot/IndexControlRWIs_p.html b/htroot/IndexControlRWIs_p.html index 353b43166..8266db425 100644 --- a/htroot/IndexControlRWIs_p.html +++ b/htroot/IndexControlRWIs_p.html @@ -152,11 +152,12 @@ </form>
#(/searchresult)#
- #(keyhashsimilar)#::Sequential List of Word-Hashes:<br />
+ #(keyhashsimilar)#::<p>Sequential List of Word-Hashes:<br />
#{rows}#
#{cols}#
<a href="/IndexControlRWIs_p.html?keyhash=#[wordHash]#&keyhashsearch=1" class="tt">#[wordHash]#</a>#{/cols}#<br />
- #{/rows}#
+ #{/rows}#
+ </p>
#(/keyhashsimilar)#
#(genUrlList)#
diff --git a/htroot/IndexControlURLs_p.html b/htroot/IndexControlURLs_p.html index 6f5b41cae..b830af29e 100644 --- a/htroot/IndexControlURLs_p.html +++ b/htroot/IndexControlURLs_p.html @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<!-- This page is only XHTML 1.0 Transitional because target is being used in a links -->
<html xmlns="http://www.w3.org/1999/xhtml">
#(reload)#::<meta http-equiv="REFRESH" content="5; url=/IndexControlURLs_p.html">#(/reload)#
<head>
@@ -7,7 +8,7 @@ <script type="text/javascript">
//<![CDATA[
function xmlhttpPost() {
- var searchform = document.forms['searchform'];
+ var searchform = document.getElementById('searchform');
search(searchform.urlstring.value);
}
@@ -46,12 +47,12 @@ function updatepage(str) { var item;
html += "<table class=\"networkTable\" border=\"0\" cellpadding=\"2\" cellspacing=\"1\" width=\"99%\">";
html += "<tr class=\"TableHeader\" valign=\"bottom\">";
- html += "<td>URL from index (total results = " + totalResults + ")</td>";
+ html += "<td>URL from index (total results = " + totalResults + ")<\/td>";
for (var i = 0; i < firstChannel.items.length; i++) {
item = firstChannel.items[i];
- html += "<tr class=\"TableCellLight\"><td align=\"left\"><a href=\"IndexControlURLs_p.html?urlstringsearch=&urlstring=" + item.link + "\">" + item.link + "</a></td>";
+ html += "<tr class=\"TableCellLight\"><td align=\"left\"><a href=\"IndexControlURLs_p.html?urlstringsearch=&urlstring=" + item.link + "\">" + item.link + "<\/a><\/td>";
}
- html += "</table>";
+ html += "<\/table>";
}
document.getElementById("searchresults").innerHTML = html;
}
@@ -63,7 +64,7 @@ function updatepage(str) { #%env/templates/submenuIndexControl.template%#
<h2>Index Administration</h2>
<p>The local index currently contains #[ucount]# URL references</p>
- <form action="IndexControlURLs_p.html" name="searchform" method="post" enctype="multipart/form-data" onkeyup="xmlhttpPost(); return false;">
+ <form action="IndexControlURLs_p.html" id="searchform" method="post" enctype="multipart/form-data" onkeyup="xmlhttpPost(); return false;">
<fieldset><legend>URL Retrieval</legend>
<dl>
<dt class="TableCellDark">Select Segment:</dt>
@@ -96,7 +97,7 @@ function updatepage(str) { <form action="IndexControlURLs_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend>Statistics about top-domains in URL Database</legend>
<dl>
- <dt class="TableCellLight"></dt>
+ <dt class="TableCellLight"> </dt>
<dd>Show top <input type="text" name="lines" value="#[lines]#" size="6" maxlength="6" /> domains from all URLs.
<input type="submit" name="statistics" value="Generate Statistics" />
</dd>
@@ -106,7 +107,7 @@ function updatepage(str) { #(/statistics)#
#(statisticslines)#::
- <p><em>Statistics about the top-#[domains]# domains in the database:</em>
+ <p><em>Statistics about the top-#[domains]# domains in the database:</em></p>
<table cellpadding="2" cellspacing="1" >
<tr class="TableHeader">
<td align="center"></td>
@@ -124,11 +125,11 @@ function updatepage(str) { </div>
</form>
</td>
- <td><a href="http://#[domain]#/" target="_">#[domain]#</a></td>
+ <td><a href="http://#[domain]#/" target="_blank">#[domain]#</a></td>
<td>#[count]#</td>
</tr>
#{/domains}#
- </table></p>
+ </table>
#(/statisticslines)#
#(lurlexport)#::
@@ -151,7 +152,7 @@ function updatepage(str) { <input type="radio" name="format" value="url-rss" />XML (RSS)
<br />
</dd>
- <dt class="TableCellLight"></dt>
+ <dt class="TableCellLight"> </dt>
<dd><input type="submit" name="lurlexport" value="Export URLs" />
</dd>
</dl>
diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html index 152d43a81..13d45ffe8 100644 --- a/htroot/ViewFile.html +++ b/htroot/ViewFile.html @@ -1,4 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<!-- This page is only XHTML 1.0 Transitional and not Strict because iframes are in use -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>YaCy '#[clientname]#': View URL Content</title>
@@ -19,7 +20,7 @@ <fieldset><legend>Get URL Viewer</legend>
<dl>
<dt>URL:</dt><dd><input type="text" size="60" name="url" value="#[url]#" /> <input type="submit" name="show" value="Show" /></dd>
- </dd>
+ <dd> </dd>
</dl>
<input type="hidden" name="display" value="#[display]#" />
</fieldset>
@@ -71,7 +72,6 @@ <span class="error">Unsupported protocol.</span>
#(/error)#
-<p>
#(viewMode)#
:: <!-- 1 -->
<fieldset><legend>Original Content from Web</legend>
@@ -80,9 +80,9 @@ </p>
</fieldset>
:: <!-- 2 -->
- <fieldset><legend>Parsed Content</legend>
- <form>
- <dl>
+<form action="">
+ <fieldset><legend>Parsed Content</legend>
+ <dl>
<dt>dc:title</dt><dd>#[title]#</dd>
<dt>dc:creator</dt><dd>#[creator]#</dd>
<dt>dc:subject</dt><dd>#[subject]#</dd>
@@ -92,9 +92,9 @@ <dt>dc:identifier</dt><dd>#[identifier]#</dd>
<dt>dc:source</dt><dd>#[source]#</dd>
</dl>
- </form>
<p class="tt">#[parsedText]#</p>
- </fieldset>
+ </fieldset>
+ </form>
:: <!-- 3 -->
<fieldset><legend>Parsed Sentences</legend>
<ol>#{sentences}#
@@ -110,25 +110,26 @@ <iframe src="/CacheResource_p.html?url=#[url]#" width="800" height="400" />
</fieldset>
:: <!-- 6 -->
- <h3>Link List</h3><br>
+ <fieldset><legend>Link List</legend>
<table border="0" cellpadding="2" cellspacing="1">
#{links}#
<tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#">
<td>#[nr]#</td>
- <td class="tt">#[type]#</tt></td>
- <td class="tt">#[text]#</tt></td>
- <td class="tt"><a href="#[url]#">#[link]#</a></tt></td>
- <td class="tt">#[attr]#</tt></td>
+ <td class="tt"><tt>#[type]#</tt></td>
+ <td class="tt"><tt>#[text]#</tt></td>
+ <td class="tt"><tt><a href="#[url]#">#[link]#</a></tt></td>
+ <td class="tt"><tt>#[attr]#</tt></td>
</tr>#{/links}#
- </table>
+ </table>
+ </fieldset>
:: <!-- 7 -->
<fieldset><legend>Parsed Tokens</legend>
<ol>#{words}#
- <li class="tt">#[word]#</li>#{/words}#
+ <li class="tt"><tt>#[word]#</tt></li>#{/words}#
</ol>
</fieldset>
#(/viewMode)#
-</p>
+
#%env/templates/footer.template%#
</body>
diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index 61d028b3a..df999f1bc 100644 --- a/htroot/ViewFile.java +++ b/htroot/ViewFile.java @@ -308,7 +308,7 @@ public class ViewFile { prop.put("viewMode_links_" + i + "_nr", i);
prop.put("viewMode_links_" + i + "_dark", dark ? "1" : "0");
prop.put("viewMode_links_" + i + "_type", "image");
- prop.put("viewMode_links_" + i + "_text", markup(wordArray, entry.alt()));
+ prop.put("viewMode_links_" + i + "_text", (entry.alt().isEmpty()) ? " " : markup(wordArray, entry.alt()));
prop.put("viewMode_links_" + i + "_url", entry.url().toNormalform(false, true));
prop.put("viewMode_links_" + i + "_link", markup(wordArray, entry.url().toNormalform(false, true)));
if (entry.width() > 0 && entry.height() > 0)
@@ -329,7 +329,7 @@ public class ViewFile { prop.put("error_url", url.toNormalform(false, true));
prop.put("error_hash", urlHash);
prop.put("error_wordCount", wordCount);
- prop.putHTML("error_desc", descr);
+ prop.putHTML("error_desc", (descr.isEmpty()) ? " " : descr);
prop.putNum("error_size", size);
prop.put("error_mimeTypeAvailable", (response.getMimeType() == null) ? "0" : "1");
prop.put("error_mimeTypeAvailable_mimeType", response.getMimeType());
@@ -376,10 +376,10 @@ public class ViewFile { prop.put("viewMode_links_" + c + "_nr", c);
prop.put("viewMode_links_" + c + "_dark", ((dark) ? 1 : 0));
prop.putHTML("viewMode_links_" + c + "_type", name);
- prop.put("viewMode_links_" + c + "_text", markup(wordArray, entry.getValue()));
+ prop.put("viewMode_links_" + c + "_text", ((entry.getValue().isEmpty()) ? " " : markup(wordArray, entry.getValue()) ));
prop.put("viewMode_links_" + c + "_link", markup(wordArray, entry.getKey().toNormalform(true, false)));
prop.put("viewMode_links_" + c + "_url", entry.getKey().toNormalform(true, false));
- prop.putHTML("viewMode_links_" + c + "_attr", "");
+ prop.put("viewMode_links_" + c + "_attr", " ");
dark = !dark;
c++;
i++;
|