summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.properties2
-rw-r--r--htroot/IndexCreateIndexingQueue_p.html2
-rw-r--r--htroot/IndexCreateLoaderQueue_p.html2
-rw-r--r--htroot/IndexCreateWWWGlobalQueue_p.html2
-rw-r--r--htroot/IndexCreateWWWLocalQueue_p.html2
-rw-r--r--htroot/IndexCreateWWWRemoteQueue_p.html2
-rw-r--r--htroot/env/templates/submenuCrawler.template39
-rw-r--r--htroot/env/templates/submenuIndexCreate.template27
8 files changed, 40 insertions, 38 deletions
diff --git a/build.properties b/build.properties
index d70bbb001..9e9862410 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,7 @@ javacSource=1.4
javacTarget=1.4
# Release Configuration
-releaseVersion=0.522
+releaseVersion=0.523
releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
#releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}
diff --git a/htroot/IndexCreateIndexingQueue_p.html b/htroot/IndexCreateIndexingQueue_p.html
index b17cad808..c7abbc6fe 100644
--- a/htroot/IndexCreateIndexingQueue_p.html
+++ b/htroot/IndexCreateIndexingQueue_p.html
@@ -6,7 +6,7 @@
</head>
<body id="IndexCreateIndexingQueue">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuCrawler.template%#
<h2>Index Creation: Indexing Queue</h2>
diff --git a/htroot/IndexCreateLoaderQueue_p.html b/htroot/IndexCreateLoaderQueue_p.html
index 3341389c5..aa67850b3 100644
--- a/htroot/IndexCreateLoaderQueue_p.html
+++ b/htroot/IndexCreateLoaderQueue_p.html
@@ -6,7 +6,7 @@
</head>
<body id="IndexCreateLoaderQueue">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuCrawler.template%#
<h2>Index Creation: Loader Queue</h2>
<p>
diff --git a/htroot/IndexCreateWWWGlobalQueue_p.html b/htroot/IndexCreateWWWGlobalQueue_p.html
index 40bd53f67..df7624dc1 100644
--- a/htroot/IndexCreateWWWGlobalQueue_p.html
+++ b/htroot/IndexCreateWWWGlobalQueue_p.html
@@ -6,7 +6,7 @@
</head>
<body id="IndexCreateWWWGlobalQueue">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuCrawler.template%#
<h2>Index Creation: WWW Global Crawl Queue</h2>
<p>
This queue stores the urls that shall be sent to other peers to perform a remote crawl.
diff --git a/htroot/IndexCreateWWWLocalQueue_p.html b/htroot/IndexCreateWWWLocalQueue_p.html
index 53f7f28d9..be7bb9d21 100644
--- a/htroot/IndexCreateWWWLocalQueue_p.html
+++ b/htroot/IndexCreateWWWLocalQueue_p.html
@@ -6,7 +6,7 @@
</head>
<body id="IndexCreateWWwLocalQueue">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuCrawler.template%#
<h2>Index Creation: WWW Local Crawl Queue</h2>
<p>
This queue stores the urls that shall be crawled localy by this peer.
diff --git a/htroot/IndexCreateWWWRemoteQueue_p.html b/htroot/IndexCreateWWWRemoteQueue_p.html
index 1d296d2af..94c1eaf31 100644
--- a/htroot/IndexCreateWWWRemoteQueue_p.html
+++ b/htroot/IndexCreateWWWRemoteQueue_p.html
@@ -6,7 +6,7 @@
</head>
<body id="IndexCreateWWWGlobalQueue">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuCrawler.template%#
<h2>Index Creation: WWW Remote Crawl Queue</h2>
<p>
This queue stores the urls that other peers sent to you in order to perform a remote crawl for them.
diff --git a/htroot/env/templates/submenuCrawler.template b/htroot/env/templates/submenuCrawler.template
index 63467593c..f39d27462 100644
--- a/htroot/env/templates/submenuCrawler.template
+++ b/htroot/env/templates/submenuCrawler.template
@@ -1,7 +1,36 @@
<div class="SubMenu">
-<h3>Crawler Monitor Menu</h3>
-<ul class="SubMenu">
-<li><a href="/WatchCrawler_p.html" class="MenuItemLink lock">Crawler Queues</a></li>
-<li><a href="/WatchWebStructure_p.html" class="MenuItemLink lock">Web Structure</a></li>
-</ul>
+ <h3>Crawler Monitor</h3>
+
+ <div class="SubMenugroup">
+ <h3>Activity Visualization</h3>
+ <ul class="SubMenu">
+ <li><a href="/WatchCrawler_p.html" class="MenuItemLink lock">Crawler Queues</a></li>
+ <li><a href="/WatchWebStructure_p.html" class="MenuItemLink lock">Web Structure</a></li>
+ </ul>
+ </div>
+
+ <div class="SubMenugroup">
+ <h3>Control Queues</h3>
+ <ul class="SubMenu">
+ <li><a href="/IndexCreateIndexingQueue_p.html" class="MenuItemLink lock">Indexing</a></li>
+ <li><a href="/IndexCreateLoaderQueue_p.html" class="MenuItemLink lock">Loader</a></li>
+ </ul>
+ </div>
+ <div class="SubMenugroup">
+ <h3>WWW Crawl Queues</h3>
+ <ul class="SubMenu">
+ <li><a href="/IndexCreateWWWLocalQueue_p.html" class="MenuItemLink lock">Local</a></li>
+ <li><a href="/IndexCreateWWWGlobalQueue_p.html" class="MenuItemLink lock">Global</a></li>
+ <li><a href="/IndexCreateWWWRemoteQueue_p.html" class="MenuItemLink lock">Remote</a></li>
+ <li><!--<a href="/IndexCreateWWWOverhangQueue_p.html" class="MenuItemLink">--><em class="lock">Overhang</em><!--</a>--></li>
+ </ul>
+ </div>
+ <div class="SubMenugroup">
+ <h3>Media Crawl Queues</h3>
+ <ul class="SubMenu">
+ <li><!--<a href="/IndexCreateImageQueue_p.html" class="MenuItemLink">--><em class="lock">Images</em><!--</a>--></li>
+ <li><!--<a href="/IndexCreateMovieQueue_p.html" class="MenuItemLink">--><em class="lock">Movies</em><!--</a>--></li>
+ <li><!--<a href="/IndexCreateMusicQueue_p.html" class="MenuItemLink">--><em class="lock">Music</em><!--</a>--></li>
+ </ul>
+ </div>
</div> \ No newline at end of file
diff --git a/htroot/env/templates/submenuIndexCreate.template b/htroot/env/templates/submenuIndexCreate.template
index 2ab337c64..9e5141e5a 100644
--- a/htroot/env/templates/submenuIndexCreate.template
+++ b/htroot/env/templates/submenuIndexCreate.template
@@ -1,34 +1,7 @@
<div class="SubMenu">
<h3>Index Creation Menu</h3>
- <div class="SubMenugroup">
- <h3>Administration</h3>
<ul class="SubMenu">
<li><a href="/IndexCreate_p.html" class="MenuItemLink lock">Crawl Start</a></li>
<li><a href="/CrawlProfileEditor_p.html" class="MenuItemLink lock">Crawl Profile Editor</a></li>
</ul>
- </div>
- <div class="SubMenugroup">
- <h3>Control Queues</h3>
- <ul class="SubMenu">
- <li><a href="/IndexCreateIndexingQueue_p.html" class="MenuItemLink lock">Indexing</a></li>
- <li><a href="/IndexCreateLoaderQueue_p.html" class="MenuItemLink lock">Loader</a></li>
- </ul>
- </div>
- <div class="SubMenugroup">
- <h3>WWW Crawl Queues</h3>
- <ul class="SubMenu">
- <li><a href="/IndexCreateWWWLocalQueue_p.html" class="MenuItemLink lock">Local</a></li>
- <li><a href="/IndexCreateWWWGlobalQueue_p.html" class="MenuItemLink lock">Global</a></li>
- <li><a href="/IndexCreateWWWRemoteQueue_p.html" class="MenuItemLink lock">Remote</a></li>
- <li><!--<a href="/IndexCreateWWWOverhangQueue_p.html" class="MenuItemLink">--><em class="lock">Overhang</em><!--</a>--></li>
- </ul>
- </div>
- <div class="SubMenugroup">
- <h3>Media Crawl Queues</h3>
- <ul class="SubMenu">
- <li><!--<a href="/IndexCreateImageQueue_p.html" class="MenuItemLink">--><em class="lock">Images</em><!--</a>--></li>
- <li><!--<a href="/IndexCreateMovieQueue_p.html" class="MenuItemLink">--><em class="lock">Movies</em><!--</a>--></li>
- <li><!--<a href="/IndexCreateMusicQueue_p.html" class="MenuItemLink">--><em class="lock">Music</em><!--</a>--></li>
- </ul>
- </div>
</div> \ No newline at end of file