summaryrefslogtreecommitdiff
path: root/htroot
diff options
context:
space:
mode:
authororbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>2011-09-14 09:59:30 +0000
committerorbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>2011-09-14 09:59:30 +0000
commitffd848c7a93b4f5d7c89d8346b26a2233b76aae0 (patch)
tree8cc65b64bdb07cc58a049edf25f873977e1302c1 /htroot
parentef72fdac795dca8e73885e81f7b7f254f93df72c (diff)
moved the log, memory, processes and the messages into a new computation monitor main menu item
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7951 6c8d7289-2bf4-0310-a012-ef5d649a1542
Diffstat (limited to 'htroot')
-rw-r--r--htroot/News.html11
-rw-r--r--htroot/PerformanceConcurrency_p.html4
-rw-r--r--htroot/PerformanceMemory_p.html2
-rw-r--r--htroot/PerformanceSearch_p.html2
-rw-r--r--htroot/Settings_p.html4
-rw-r--r--htroot/ViewLog_p.html2
-rw-r--r--htroot/env/base.css3
-rw-r--r--htroot/env/templates/header.template4
-rw-r--r--htroot/env/templates/submenuAccessTracker.template13
-rw-r--r--htroot/env/templates/submenuComputation.template24
10 files changed, 34 insertions, 35 deletions
diff --git a/htroot/News.html b/htroot/News.html
index 4e44f50bd..c6a439faa 100644
--- a/htroot/News.html
+++ b/htroot/News.html
@@ -14,16 +14,7 @@
</head>
<body id="News">
#%env/templates/header.template%#
- <div class="SubMenu">
- <h3>News Monitor</h3>
- <ul class="SubMenu">
- <li><a href="/News.html" class="MenuItemLink">Overview</a></li>
- <li><a href="/News.html?page=1" class="MenuItemLink">Incoming&nbsp;News</a></li>
- <li><a href="/News.html?page=2" class="MenuItemLink">Processed&nbsp;News</a></li>
- <li><a href="/News.html?page=3" class="MenuItemLink">Outgoing&nbsp;News</a></li>
- <li><a href="/News.html?page=4" class="MenuItemLink">Published&nbsp;News</a></li>
- </ul>
- </div>
+ #%env/templates/submenuComputation.template%#
#(page)#
<h2>Overview</h2>
::
diff --git a/htroot/PerformanceConcurrency_p.html b/htroot/PerformanceConcurrency_p.html
index fca788d1c..f405b732d 100644
--- a/htroot/PerformanceConcurrency_p.html
+++ b/htroot/PerformanceConcurrency_p.html
@@ -4,11 +4,11 @@
<title>YaCy '#[clientname]#': Performance of Concurrent Processes</title>
#%env/templates/metas.template%#
<script type="text/javascript" src="js/html.js"></script>
- <meta http-equiv="REFRESH" content="1; url=/PerformanceConcurrency_p.html" />
+ <meta http-equiv="REFRESH" content="3; url=/PerformanceConcurrency_p.html" />
</head>
<body id="PerformanceConcurrency">
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuComputation.template%#
<h2>Performance of Concurrent Processes</h2>
<fieldset><legend>serverProcessor Objects</legend>
diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html
index 0cb1161a8..66d6ce879 100644
--- a/htroot/PerformanceMemory_p.html
+++ b/htroot/PerformanceMemory_p.html
@@ -15,7 +15,7 @@
window.setInterval("reloadGraph()", 1000);
//--></script>
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuComputation.template%#
<h2>Performance Settings for Memory</h2>
<p><img src="PerformanceGraph.png" id="graph" alt="PerformanceGraph"/></p>
diff --git a/htroot/PerformanceSearch_p.html b/htroot/PerformanceSearch_p.html
index bcf879c61..9dbb19b1c 100644
--- a/htroot/PerformanceSearch_p.html
+++ b/htroot/PerformanceSearch_p.html
@@ -6,7 +6,7 @@
</head>
<body id="PerformanceSearch">
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuComputation.template%#
<h2>Search Sequence Timing</h2>
<p>
diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html
index 6b29782f4..c93c748c5 100644
--- a/htroot/Settings_p.html
+++ b/htroot/Settings_p.html
@@ -14,13 +14,9 @@
</p>
<ul class="settingsMenu">
<li><a href="PerformanceQueues_p.html">Performance Settings of Busy Queues</a></li>
- <li><a href="PerformanceConcurrency_p.html">Performance of Concurrent Processes</a></li>
- <li><a href="PerformanceMemory_p.html">Performance Settings for Memory</a></li>
- <li><a href="PerformanceSearch_p.html">Performance Settings of Search Sequence</a></li>
</ul>
<ul class="settingsMenu">
<li><a href="Tables_p.html">Viewer and administration for database tables</a></li>
- <li><a href="News.html">Viewer for Peer-News</a></li>
<li><a href="CookieMonitorIncoming_p.html">Viewer for Cookies in Proxy</a></li>
</ul>
<ul class="settingsMenu">
diff --git a/htroot/ViewLog_p.html b/htroot/ViewLog_p.html
index c4760b023..8b6763367 100644
--- a/htroot/ViewLog_p.html
+++ b/htroot/ViewLog_p.html
@@ -6,7 +6,7 @@
</head>
<body id="ViewLog">
#%env/templates/header.template%#
- #(submenu)#::#%env/templates/submenuAccessTracker.template%##(/submenu)#
+ #(submenu)#::#%env/templates/submenuComputation.template%##(/submenu)#
<h2>Server Log</h2>
<form action="ViewLog_p.html" method="get" accept-charset="UTF-8">
diff --git a/htroot/env/base.css b/htroot/env/base.css
index df450f3b9..54d6f5d17 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -319,7 +319,8 @@ div.bookmark {
div.SubMenugroup{
float:left;
margin-right:1px;
- margin-top:0;
+ margin-top:0px;
+ margin-bottom:2px;
}
div.content {
diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 452d85f21..5fa6c14b2 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -74,7 +74,8 @@
<ul class="menu">
<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>
<li><a href="/WatchWebStructure_p.html?host=auto&amp;depth=2&amp;time=1000" class="MenuItemLink lock">Web Visualization</a></li>
- <li><a href="/AccessGrid_p.html" class="MenuItemLink lock">Access Tracker</a></li>
+ <li><a href="/AccessGrid_p.html" class="MenuItemLink lock">Network Access</a></li>
+ <li><a href="/ViewLog_p.html" class="MenuItemLink lock">Computation</a></li>
<li><a href="/terminal_p.html" accesskey="t" class="MenuItemLink lock">Terminal</a></li>
</ul>
</li>
@@ -83,7 +84,6 @@
<ul class="menu">
<li><a href="/Status.html?noforward=" class="MenuItemLink">Admin Console</a></li>
<li><a href="/Table_API_p.html" class="MenuItemLink lock">API Action Steering</a></li>
- <li><a href="/Messages_p.html" class="MenuItemLink lock">Messages<img src="/notifier.gif" alt="New Messages" /></a></li>
<li><a href="/Steering.html?restart=" class="MenuItemLink lock" onclick="return confirm('Confirm Restart')">Re-Start</a></li>
<li><a href="/Steering.html?shutdown=" class="MenuItemLink lock" onclick="return confirm('Confirm Shutdown')">Shutdown</a></li>
</ul>
diff --git a/htroot/env/templates/submenuAccessTracker.template b/htroot/env/templates/submenuAccessTracker.template
index 05ca1cc4e..22ee45396 100644
--- a/htroot/env/templates/submenuAccessTracker.template
+++ b/htroot/env/templates/submenuAccessTracker.template
@@ -17,17 +17,4 @@
<li><a href="/AccessTracker_p.html?page=3" class="MenuItemLink lock">Host Tracker</a></li>
</ul>
</div>
- <div class="SubMenugroup">
- <h3>Remote&nbsp;Search</h3>
- <ul class="SubMenu">
- <li><a href="/AccessTracker_p.html?page=4" class="MenuItemLink lock">Log</a></li>
- <li><a href="/AccessTracker_p.html?page=5" class="MenuItemLink lock">Host Tracker</a></li>
- </ul>
- </div>
- <div class="SubMenugroup">
- <h3>Log</h3>
- <ul class="SubMenu">
- <li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
- </ul>
- </div>
</div> \ No newline at end of file
diff --git a/htroot/env/templates/submenuComputation.template b/htroot/env/templates/submenuComputation.template
new file mode 100644
index 000000000..827c4256c
--- /dev/null
+++ b/htroot/env/templates/submenuComputation.template
@@ -0,0 +1,24 @@
+<div class="SubMenu">
+ <h3>Computation Monitor</h3>
+</div>
+<div class="SubMenu">
+ <div class="SubMenugroup">
+ <h3>Processes</h3>
+ <ul class="SubMenu">
+ <li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
+ <li><a href="/PerformanceConcurrency_p.html" class="MenuItemLink">Concurrent Indexing</a></li>
+ <li><a href="/PerformanceMemory_p.html" class="MenuItemLink">Memory Usage</a></li>
+ <li><a href="/PerformanceSearch_p.html" class="MenuItemLink">Search Sequence</a></li>
+ </ul>
+ </div>
+ <div class="SubMenugroup">
+ <h3>Messages</h3>
+ <ul class="SubMenu">
+ <li><a href="/News.html" class="MenuItemLink">Overview</a></li>
+ <li><a href="/News.html?page=1" class="MenuItemLink">Incoming&nbsp;News</a></li>
+ <li><a href="/News.html?page=2" class="MenuItemLink">Processed&nbsp;News</a></li>
+ <li><a href="/News.html?page=3" class="MenuItemLink">Outgoing&nbsp;News</a></li>
+ <li><a href="/News.html?page=4" class="MenuItemLink">Published&nbsp;News</a></li>
+ </ul>
+ </div>
+</div>
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-08 10:30:29 +0000