From dcc13abd59f03158bb853904d2c24ff83c5245c3 Mon Sep 17 00:00:00 2001 From: karlchenofhell Date: Thu, 8 Mar 2007 13:39:09 +0000 Subject: [PATCH] - fixed small bug at home page, button "peer's console" - fixed
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 --- htroot/ConfigRobotsTxt_p.html | 4 +- htroot/CrawlURLFetchStack_p.html | 11 +++--- htroot/CrawlURLFetch_p.html | 8 ++-- htroot/DetailedSearch.html | 32 ++++++---------- htroot/LogStatistics_p.html | 25 ++++++------ htroot/LogStatistics_p.java | 8 +++- htroot/Messages_p.html | 40 ++++---------------- htroot/Network.html | 1 + htroot/User_p.html | 8 ++-- htroot/ViewFile.html | 4 +- htroot/ViewLog_p.html | 1 + htroot/ViewLog_p.java | 6 ++- htroot/env/templates/submenuViewLog.template | 7 ++++ htroot/www/welcome.html | 2 +- 14 files changed, 73 insertions(+), 84 deletions(-) create mode 100644 htroot/env/templates/submenuViewLog.template diff --git a/htroot/ConfigRobotsTxt_p.html b/htroot/ConfigRobotsTxt_p.html index 472e85d1a..91f2b5045 100644 --- a/htroot/ConfigRobotsTxt_p.html +++ b/htroot/ConfigRobotsTxt_p.html @@ -17,7 +17,7 @@ ::

Unable to access the local file: #[msg]#

::

Deletion of htroot/robots.txt failed

#(/error)#
-
Restrict access for +
Restrict access for
@@ -43,7 +43,7 @@
 
-
+
#%env/templates/footer.template%# diff --git a/htroot/CrawlURLFetchStack_p.html b/htroot/CrawlURLFetchStack_p.html index bfe1a9801..28c1f2cf0 100644 --- a/htroot/CrawlURLFetchStack_p.html +++ b/htroot/CrawlURLFetchStack_p.html @@ -12,16 +12,16 @@ #(addedUrls)#::Added #[added]# URLs!#(/addedUrls)#
Statistics -
+
Currently stacked URLs:
#[urlCount]#
Totally fetched / added URLs:
#[totalFetched]# / #[totalAdded]#
#{peers}#
Fetched from #[peer]#
#[amount]#
#{/peers}# -
+
Settings -
+
:
@@ -30,10 +30,11 @@ Set max. size for each transfer to #[value]#:: Setting max. size for each transfer to #[value]# was unsuccessful: may not be negative#(/set)#
-
+
Add URLs to stack +
:
@@ -59,7 +60,7 @@ Added #[added]# and rejected #[failed]# URLs from uploaded file successfully:: An internal error occured processing the uploaded file: #[error]##(/upload)#
-
+
#%env/templates/footer.template%# diff --git a/htroot/CrawlURLFetch_p.html b/htroot/CrawlURLFetch_p.html index 251d4ea9f..60f15f004 100644 --- a/htroot/CrawlURLFetch_p.html +++ b/htroot/CrawlURLFetch_p.html @@ -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.

-
+
:
@@ -62,7 +62,7 @@ #(freqError)#:: Invalid period, fetching only once#(/freqError)#
-
+
@@ -73,7 +73,7 @@ #(runs)#::
Thread to fetch URLs is #(status)#running::stopped::paused#(/status)# -
+
Total runs:
#[totalRuns]#
Total fetched URLs:
#[totalFetchedURLs]#
Total failed URLs:
#[totalFailedURLs]#
@@ -98,7 +98,7 @@ #(/status)# -
+
#(/runs)# diff --git a/htroot/DetailedSearch.html b/htroot/DetailedSearch.html index fcb9ad706..b0b47e44b 100644 --- a/htroot/DetailedSearch.html +++ b/htroot/DetailedSearch.html @@ -18,7 +18,7 @@
Query Attributes -
+
@@ -29,35 +29,27 @@
-
+
Pre-Ranking -
#{attrPre}# - +
#{attrPre}#
:
-
#{select}# - - #{/select}# - +
#{select}# + #{/select}# #[value]# -
#{/attrPre}# - -
+ #{/attrPre}# +
Post-Ranking -
#{attrPost}# - +
#{attrPost}#
-
#{select}# - - #{/select}# - +
#{select}# + #{/select}# #[value]# -
#{/attrPost}# - -
+ #{/attrPost}# +
diff --git a/htroot/LogStatistics_p.html b/htroot/LogStatistics_p.html index 509af4310..130fef3c5 100644 --- a/htroot/LogStatistics_p.html +++ b/htroot/LogStatistics_p.html @@ -6,6 +6,7 @@ #%env/templates/header.template%# + #(submenu)#::#%env/templates/submenuViewLog.template%##(/submenu)#

Log Statistics

#(results)#:: @@ -14,7 +15,7 @@
DHT
- URLs + URLs
URLs Received:
#[urlSum]#
URLs Requested:
#[urlReqSum]#
@@ -22,10 +23,10 @@
Total time:
#[urlTimeSum]# #[urlTimeSumUnit]#
URLs Sent:
#[DHTSendURLs]#
- +
- RWIs / Words + RWIs / Words
Words received:
#[wordsSum]#
RWIs reveived:
#[rwiSum]#
@@ -33,11 +34,11 @@
Total time:
#[rwiTimeSum]# #[rwiTimeSumUnit]#
RWIs selected:
#[DHTSelectionWordsCount]#
Selection time:
#[DHTSelectionWordsTimeCount]#
-
+
- Chunks / Protocol + Chunks / Protocol
Sent traffic:
#[DHTSendTraffic]# #[DHTSendTrafficUnit]#
Total peers selected:
#[DHTSelectionTargetCount]#
@@ -64,19 +65,19 @@ #(/useDHTPeers)# -
+
-
Ranking Distribution +
Ranking Distribution
Submitted ranking files:
#[rankingDistributionCount]#
Total time submitting ranking files:
#[rankingDistributionTime]#
Failed ranking distributions:
#[rankingDistributionFailCount]#
-
+
-
Indexing +
Indexing
Indexed sites:
#[indexedSites]#
Size of indexed sites:
#[indexedSiteSizeSum]# #[indexedSiteSizeSumUnit]#
@@ -86,15 +87,15 @@
Total parsing time:
#[indexedParsingTime]# #[indexedParsingTimeUnit]#
Total indexing time:
#[indexedIndexingTime]# #[indexedIndexingTimeUnit]#
Total storage time:
#[indexedStorageTime]# #[indexedStorageTimeUnit]#
-
+
-
Errors +
Errors
Tried to create left child node twice
#[leftChildTwiceCount]#
Tried to create right child node twice
#[rightChildTwiceCount]#
Malformed URL Exception
#[malformedURLCount]#
-
+
#(/results)# diff --git a/htroot/LogStatistics_p.java b/htroot/LogStatistics_p.java index de6ab56a6..534db7b66 100644 --- a/htroot/LogStatistics_p.java +++ b/htroot/LogStatistics_p.java @@ -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
Compose Message -
+
:
-
+
#(/peersKnown)# #(mode)# @@ -52,39 +52,15 @@ ::
-
- From: -
-
- #[from]# -
-
- To: -
-
- #[to]# -
-
- Date: -
-
- #[date]# -
-
- Subject: -
-
- #[subject]# -
-
- Message: -
+
From:
#[from]#
+
To:
#[to]#
+
Date:
#[date]#
+
Subject:
#[subject]#
+
Message:
#[message]#
-
- Action: -
+
Action:
inbox  /  diff --git a/htroot/Network.html b/htroot/Network.html index 8a67892ce..260b782e8 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -71,6 +71,7 @@ m  p  w  + b  #(updatedProfile)#::Profile updated#(/updatedProfile)# #(updatedWiki)#::Wiki updated#(/updatedWiki)# #(updatedBlog)#::Blog updated#(/updatedBlog)# diff --git a/htroot/User_p.html b/htroot/User_p.html index 5a49bc587..a31f5cf40 100644 --- a/htroot/User_p.html +++ b/htroot/User_p.html @@ -20,7 +20,7 @@ #(/error)#
-
Select user +
Select user
:
@@ -34,12 +34,12 @@
-
+
-
Edit current user: #[username]# +
Edit current user: #[username]#
@@ -71,6 +71,6 @@
 
-
+
diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html index 6db33bec0..8a2f10343 100644 --- a/htroot/ViewFile.html +++ b/htroot/ViewFile.html @@ -10,7 +10,7 @@ #(error)#
-
View URL Content +
View URL Content
URL:
#[url]#
Hash:
#[hash]#
@@ -29,7 +29,7 @@ -
+
diff --git a/htroot/ViewLog_p.html b/htroot/ViewLog_p.html index 0cc33c260..3025671c4 100644 --- a/htroot/ViewLog_p.html +++ b/htroot/ViewLog_p.html @@ -6,6 +6,7 @@ #%env/templates/header.template%# + #(submenu)#::#%env/templates/submenuViewLog.template%##(/submenu)#

Log

diff --git a/htroot/ViewLog_p.java b/htroot/ViewLog_p.java index 45a495e6c..a45e3c129 100644 --- a/htroot/ViewLog_p.java +++ b/htroot/ViewLog_p.java @@ -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 +

Server Log Menu

+ + \ No newline at end of file diff --git a/htroot/www/welcome.html b/htroot/www/welcome.html index 18ed4d87d..0eb68737d 100644 --- a/htroot/www/welcome.html +++ b/htroot/www/welcome.html @@ -25,7 +25,7 @@
Individual Web Page
- +