- fixed small bug at home page, button "peer's console"

- fixed <fieldset><dl> for safari on many pages
- added Blog-link to Network page

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3450 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
karlchenofhell 18 years ago
parent 6596167277
commit dcc13abd59

@ -17,7 +17,7 @@
::<p class="error">Unable to access the local file: <span class="error tt">#[msg]#</span></p>
::<p class="error">Deletion of <span class="error tt">htroot/robots.txt</span> failed</p>#(/error)#
<form method="post" action="ConfigRobotsTxt_p.html" enctype="multipart/form-data" accept-charset="UTF-8">
<fieldset><legend>Restrict access for</legend>
<fieldset><legend>Restrict access for</legend><table border="0"><tr><td>
<input type="hidden" name="directories" value="checked" />
<input type="hidden" name="locked" value="checked" />
<dl>
@ -43,7 +43,7 @@
<dd><input type="checkbox" id="fileshare" name="fileshare"#(fileshare.checked)#:: checked="checked"#(/fileshare.checked)# /></dd>
<dt>&nbsp;</dt>
<dd><input type="submit" name="save" value="Set restrictions" /></dd>
</dl>
</dl></td></tr></table>
</fieldset>
</form>
#%env/templates/footer.template%#

@ -12,16 +12,16 @@
#(addedUrls)#::<span class="success">Added #[added]# URLs!</span>#(/addedUrls)#
<form method="post" action="CrawlURLFetchStack_p.html" enctype="multipart/form-data">
<fieldset><legend>Statistics</legend>
<dl>
<table border="0"><tr><td><dl>
<dt>Currently stacked URLs:</dt><dd>#[urlCount]#</dd>
<dt>Totally fetched / added URLs:</dt><dd>#[totalFetched]# / #[totalAdded]#</dd>
#{peers}#
<dt>Fetched from #[peer]#</dt><dd>#[amount]#</dd>#{/peers}#
</dl>
</dl></td></tr></table>
</fieldset>
<fieldset><legend>Settings</legend>
<dl>
<table border="0"><tr><td><dl>
<dt><label for="maxSize">Maximum URLs for each transfer</label>:</dt>
<dd>
<input type="text" name="maxSize" id="maxSize" value="#[maxSize]#" maxlength="3" size="3" />
@ -30,10 +30,11 @@
<span class="success">Set max. size for each transfer to #[value]#</span>::
<span class="error">Setting max. size for each transfer to #[value]# was unsuccessful: may not be negative</span>#(/set)#
</dd>
</dl>
</dl></td></tr></table>
</fieldset>
<fieldset><legend>Add URLs to stack</legend>
<table border="0"><tr><td><dl>
<dt><label for="shiftloc">Shift URLs from Local Crawler</label>:</dt>
<dd>
<input type="text" name="shiftloc" id="shiftloc" value="#[locurlsVal]#" size="5" maxlength="5" style="text-align: right;" />
@ -59,7 +60,7 @@
<span class="success">Added #[added]# and rejected #[failed]# URLs from uploaded file successfully</span>::
<span class="error">An internal error occured processing the uploaded file: #[error]#</span>#(/upload)#
</dd>
</dl>
</dl></td></tr></table>
</fieldset>
</form>
#%env/templates/footer.template%#

@ -15,7 +15,7 @@
The Re-Crawl option isn't used and the sites won't be stored in the Proxy Cache. Text and media types will be indexed.
Since these URLs will be requested explicitely from another peer, they won't be distributed for remote indexing.
</p>
<dl>
<table border="0"><tr><td><dl>
<dt><label for="url">Fetch from URL</label>:</dt>
<dd>
<input type="radio" name="source" value="url" id="url" checked="checked" />
@ -62,7 +62,7 @@
#(freqError)#::&nbsp;<span class="error">Invalid period, fetching only once</span>#(/freqError)#
</dd>
<dt><input type="submit" name="start" value="Fetch URLs" /></dt>
</dl>
</dl></td></tr></table>
</fieldset>
</form>
@ -73,7 +73,7 @@
#(runs)#::
<form method="post" action="CrawlURLFetch_p.html" enctype="multipart/form-data">
<fieldset><legend>Thread to fetch URLs is #(status)#running::stopped::paused#(/status)#</legend>
<dl>
<table border="0"><tr><td><dl>
<dt>Total runs:</dt><dd>#[totalRuns]#</dd>
<dt>Total fetched URLs:</dt><dd>#[totalFetchedURLs]#</dd>
<dt>Total failed URLs:</dt><dd>#[totalFailedURLs]#</dd>
@ -98,7 +98,7 @@
<input type="submit" name="stop" value="Stop Thread" />
<input type="submit" name="restart" value="Restart Thread" />#(/status)#
</dt>
</dl>
</dl></td></tr></table>
</fieldset>
</form>
#(/runs)#

@ -18,7 +18,7 @@
</fieldset>
<fieldset>
<legend>Query Attributes</legend>
<dl>
<table border="0"><tr><td><dl>
<dt><label for="global">Global:</label></dt>
<dd><input type="checkbox" name="global" id="global"#(globalChecked)#:: checked="checked"#(/globalChecked)# /></dd>
<dt><label for="postsort">Post-Sort:</label></dt>
@ -29,35 +29,27 @@
<dd><input type="text" name="localTime" id="localTime" value="#[localTime]#" size="4" maxlength="3" /></dd>
<dt><label for="localWDist">Max. word distance:</label></dt>
<dd><input type="text" name="localWDist" id="localWDist" value="#[localWDist]#" size="4" maxlength="4" /></dd>
</dl>
</dl></td></tr></table>
</fieldset>
<fieldset>
<legend>Pre-Ranking</legend>
<dl>#{attrPre}#
<table border="0"><tr><td><dl>#{attrPre}#
<dt><label for="#[nameorg]#">#[name]#</label>:</dt>
<dd id="#[nameorg]#">#{select}#
<input type="radio" name="#[nameorg]#" value="#[value]#"#(checked)#:: checked="checked"#(/checked)# />#{/select}#
<dd id="#[nameorg]#">#{select}#
<input type="radio" name="#[nameorg]#" value="#[value]#"#(checked)#:: checked="checked"#(/checked)# />#{/select}#
#[value]#
</dd>#{/attrPre}#
</dl>
</dd>#{/attrPre}#
</dl></td></tr></table>
</fieldset>
<fieldset>
<legend>Post-Ranking</legend>
<dl>#{attrPost}#
<table border="0"><tr><td><dl>#{attrPost}#
<dt><label for="#[nameorg]#">#[name]#</label></dt>
<dd id="#[nameorg]#">#{select}#
<input type="radio" name="#[nameorg]#" value="#[value]#"#(checked)#:: checked="checked"#(/checked)# />#{/select}#
<dd id="#[nameorg]#">#{select}#
<input type="radio" name="#[nameorg]#" value="#[value]#"#(checked)#:: checked="checked"#(/checked)# />#{/select}#
#[value]#
</dd>#{/attrPost}#
</dl>
</dd>#{/attrPost}#
</dl></td></tr></table>
</fieldset>
<fieldset>
<input type="submit" name="EnterRanking" value="Set as Default Ranking" />

@ -6,6 +6,7 @@
</head>
<body id="ViewProfile">
#%env/templates/header.template%#
#(submenu)#::#%env/templates/submenuViewLog.template%##(/submenu)#
<h2>Log Statistics</h2>
#(results)#::
@ -14,7 +15,7 @@
<form method="get" action="LogStatistics_p.html">
<fieldset><legend>DHT</legend>
<fieldset>
<legend>URLs</legend>
<legend>URLs</legend><table border="0"><tr><td>
<dl style="margin-top: .3em;">
<dt>URLs Received:</dt><dd>#[urlSum]#</dd>
<dt>URLs Requested:</dt><dd>#[urlReqSum]#</dd>
@ -22,10 +23,10 @@
<dt>Total time:</dt><dd>#[urlTimeSum]# #[urlTimeSumUnit]#</dd>
<dt>URLs Sent:</dt><dd>#[DHTSendURLs]#</dd>
</dl>
</fieldset>
</td></tr></table></fieldset>
<fieldset>
<legend>RWIs / Words</legend>
<legend>RWIs / Words</legend><table border="0"><tr><td>
<dl style="margin-top: .3em;">
<dt>Words received:</dt><dd>#[wordsSum]#</dd>
<dt>RWIs reveived:</dt><dd>#[rwiSum]#</dd>
@ -33,11 +34,11 @@
<dt>Total time:</dt><dd>#[rwiTimeSum]# #[rwiTimeSumUnit]#</dd>
<dt>RWIs selected:</dt><dd>#[DHTSelectionWordsCount]#</dd>
<dt>Selection time:</dt><dd>#[DHTSelectionWordsTimeCount]#</dd>
</dl>
</dl></td></tr></table>
</fieldset>
<fieldset>
<legend>Chunks / Protocol</legend>
<legend>Chunks / Protocol</legend><table border="0"><tr><td>
<dl style="margin-top: .3em;">
<dt>Sent traffic:</dt><dd>#[DHTSendTraffic]# #[DHTSendTrafficUnit]#</dd>
<dt>Total peers selected:</dt><dd>#[DHTSelectionTargetCount]#</dd>
@ -64,19 +65,19 @@
</ul>
</div>#(/useDHTPeers)#
</dd>
</dl>
</dl></td></tr></table>
</fieldset>
</fieldset>
<fieldset><legend>Ranking Distribution</legend>
<fieldset><legend>Ranking Distribution</legend><table border="0"><tr><td>
<dl>
<dt>Submitted ranking files:</dt><dd>#[rankingDistributionCount]#</dd>
<dt>Total time submitting ranking files:</dt><dd>#[rankingDistributionTime]#</dd>
<dt>Failed ranking distributions:</dt><dd>#[rankingDistributionFailCount]#</dd>
</dl>
</dl></td></tr></table>
</fieldset>
<fieldset><legend>Indexing</legend>
<fieldset><legend>Indexing</legend><table border="0"><tr><td>
<dl>
<dt>Indexed sites:</dt><dd>#[indexedSites]#</dd>
<dt>Size of indexed sites:</dt><dd>#[indexedSiteSizeSum]# #[indexedSiteSizeSumUnit]#</dd>
@ -86,15 +87,15 @@
<dt>Total parsing time:</dt><dd>#[indexedParsingTime]# #[indexedParsingTimeUnit]#</dd>
<dt>Total indexing time:</dt><dd>#[indexedIndexingTime]# #[indexedIndexingTimeUnit]#</dd>
<dt>Total storage time:</dt><dd>#[indexedStorageTime]# #[indexedStorageTimeUnit]#</dd>
</dl>
</dl></td></tr></table>
</fieldset>
<fieldset><legend>Errors</legend>
<fieldset><legend>Errors</legend><table border="0"><tr><td>
<dl>
<dt><span class="tt">Tried to create left child node twice</span></dt><dd>#[leftChildTwiceCount]#</dd>
<dt><span class="tt">Tried to create right child node twice</span></dt><dd>#[rightChildTwiceCount]#</dd>
<dt><span class="tt">Malformed URL Exception</span></dt><dd>#[malformedURLCount]#</dd>
</dl>
</dl></td></tr></table>
</fieldset>
</form>
#(/results)#

@ -63,18 +63,24 @@ public class LogStatistics_p {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
final serverObjects prop = new serverObjects();
Logger logger = Logger.getLogger("");
Handler[] handlers = logger.getHandlers();
Hashtable r = null;
boolean displaySubmenu = false;
for (int i=0; i<handlers.length; i++) {
if (handlers[i] instanceof LogalizerHandler) {
displaySubmenu = true;
LogalizerHandler h = ((LogalizerHandler)handlers[i]);
r = h.getParserResults(h.getParser(0));
break;
}
}
prop.put("submenu", (displaySubmenu) ? 1 : 0);
if (r == null) {
prop.put("results", 0);
return prop;

@ -11,7 +11,7 @@
#(peersKnown)#::
<form enctype="multipart/form-data" action="MessageSend_p.html" method="get">
<fieldset><legend>Compose Message</legend>
<dl>
<table border="0"><tr><td><dl>
<dt><label for="peers">Send message to peer</label>:</dt>
<dd>
<select id="peers" name="hash">#{peers}#
@ -19,7 +19,7 @@
</select>
<input type="submit" name="submit" value="Compose" />
</dd>
</dl>
</dl></td></tr></table>
</fieldset></form>
#(/peersKnown)#
#(mode)#
@ -52,39 +52,15 @@
::
<!-- View -->
<dl class="pairs">
<dt>
From:
</dt>
<dd>
<a href="ViewProfile.html?hash=#[hash]#&amp;display=1" title="View profile of peer #[from]#">#[from]#</a>
</dd>
<dt>
To:
</dt>
<dd>
#[to]#
</dd>
<dt>
Date:
</dt>
<dd>
#[date]#
</dd>
<dt>
Subject:
</dt>
<dd>
#[subject]#
</dd>
<dt>
Message:
</dt>
<dt>From:</dt><dd><a href="ViewProfile.html?hash=#[hash]#&amp;display=1" title="View profile of peer #[from]#">#[from]#</a></dd>
<dt>To:</dt><dd>#[to]#</dd>
<dt>Date:</dt><dd>#[date]#</dd>
<dt>Subject:</dt><dd>#[subject]#</dd>
<dt>Message:</dt>
<dd>
#[message]#
</dd>
<dt>
Action:
</dt>
<dt>Action:</dt>
<dd>
<a href="Messages_p.html">inbox</a>
&nbsp;/&nbsp;

@ -71,6 +71,7 @@
<a href="MessageSend_p.html?hash=#[hash]#" title="Send message to peer #[fullname]#">m</a>&nbsp;
<a href="ViewProfile.html?hash=#[hash]#&amp;display=1" title="View profile of peer #[fullname]#">p</a>&nbsp;
<a href="http://#[fullname]#.yacy/Wiki.html" title="Read and edit wiki on peer #[fullname]#">w</a>&nbsp;
<a href="http://#[fullname]#.yacy/Blog.html" title="Browse blog of peer #[fullname]#">b</a>&nbsp;
#(updatedProfile)#::<a href="ViewProfile.html?hash=#[hash]#&amp;display=1"><img src="/env/grafics/profile.gif" alt="Profile updated" /></a>#(/updatedProfile)#
#(updatedWiki)#::<a href="http://#[address]#/Wiki.html?page=#[page]#" title="#[page]#"><img src="/env/grafics/wiki.gif" alt="Wiki updated" /></a>#(/updatedWiki)#
#(updatedBlog)#::<a href="http://#[address]#/Blog.html?page=#[page]#" title="#[subject]#"><img src="/env/grafics/blog.gif" alt="Blog updated" /></a>#(/updatedBlog)#

@ -20,7 +20,7 @@
#(/error)#
<form action="User_p.html">
<fieldset><legend>Select user</legend>
<fieldset><legend>Select user</legend><table border="0"><tr><td>
<dl>
<dt><label for="user">Select user</label>:</dt>
<dd>
@ -34,12 +34,12 @@
<input type="submit" name="change_user" value="Edit User" />
<input type="submit" name="delete_user" value="Delete User" />
</dd>
</dl>
</dl></td></tr></table>
</fieldset>
</form>
<form action="User_p.html" method="post">
<fieldset><legend>Edit current user: #[username]#</legend>
<fieldset><legend>Edit current user: #[username]#</legend><table border="0"><tr><td>
<!-- Hidden(text for debugging): <input type="text" name="current_user" value="#[current_user]#" readonly> -->
<input type="hidden" name="current_user" value="#[current_user]#" />
<dl>
@ -71,6 +71,6 @@
<dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd>
<dt>&nbsp;</dt>
<dd><input type="submit" name="change" value="Save User" /></dd>
</dl>
</dl></td></tr></table>
</fieldset>
</form>

@ -10,7 +10,7 @@
#(error)#
<form method="get" action="ViewFile.html" accept-charset="ascii">
<fieldset><legend>View URL Content</legend>
<fieldset><legend>View URL Content</legend><table border="0"><tr><td>
<dl>
<dt>URL:</dt> <dd><a href="#[url]#">#[url]#</a></dd>
<dt>Hash:</dt> <dd>#[hash]#</dd>
@ -29,7 +29,7 @@
</select>
<input type="submit" name="show" value="Show" />
</dd>
</dl>
</dl></td></tr></table>
<input type="hidden" name="words" value="#[words]#" />
<input type="hidden" name="urlHash" value="#[hash]#" />
</fieldset>

@ -6,6 +6,7 @@
</head>
<body id="ViewLog">
#%env/templates/header.template%#
#(submenu)#::#%env/templates/submenuViewLog.template%##(/submenu)#
<h2>Log</h2>
<form action="ViewLog_p.html" method="get" >

@ -56,6 +56,7 @@ import de.anomic.http.httpHeader;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
import de.anomic.server.logging.GuiHandler;
import de.anomic.server.logging.LogalizerHandler;
public class ViewLog_p {
@ -81,13 +82,16 @@ public class ViewLog_p {
Logger logger = Logger.getLogger("");
Handler[] handlers = logger.getHandlers();
boolean displaySubmenu = false;
for (int i=0; i<handlers.length; i++) {
if (handlers[i] instanceof GuiHandler) {
log = ((GuiHandler)handlers[i]).getLogLines(reversed,lines);
break;
} else if (handlers[i] instanceof LogalizerHandler) {
displaySubmenu = true;
}
}
prop.put("submenu", (displaySubmenu) ? 1 : 0);
prop.put("reverseChecked", reversed ? 1 : 0);
prop.put("lines", lines);
prop.put("filter", filter);

@ -0,0 +1,7 @@
<div class="SubMenu">
<h3>Server Log Menu</h3>
<ul class="SubMenu">
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
<li><a href="/LogStatistics_p.html" class="MenuItemLink lock">Log Statistics</a></li>
</ul>
</div>

@ -25,7 +25,7 @@
<div class="Headline">Individual&nbsp;Web&nbsp;Page</div>
</td>
<td width="240" align="right">
<form action="http://#[peerdomain]#.yacy" method="get">
<form action="http://#[peerdomain]#.yacy" method="post">
<input type="submit" value="#[peername]#'s Console" class="small">
</form>
</td>

Loading…
Cancel
Save