- fixed the handover of the searchterm and -type on index.html when the user clicks on "more options..."

- some small changes to make index.html and the menu valid XHTML 1.0 strict
- changed the inconsistent eol - characters in index.html to unix-ones


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3940 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
michitux 2007-06-29 19:23:42 +00:00
parent 08d5db6bb4
commit 110a1a2b16
3 changed files with 151 additions and 145 deletions

View File

@ -25,7 +25,7 @@
<h3>Monitoring</h3>
<ul class="menu">
<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>
<li><a href="/WatchWebStructure_p.html?host=auto&depth=2&time=1000" class="MenuItemLink lock">Crawl Activity</a></li>
<li><a href="/WatchWebStructure_p.html?host=auto&amp;depth=2&amp;time=1000" class="MenuItemLink lock">Crawl Activity</a></li>
<li><a href="/CrawlResults.html" class="MenuItemLink">Crawl Results</a></li>
<li><a href="/AccessTracker_p.html" class="MenuItemLink lock">Access Tracker</a></li>
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>

View File

@ -4,22 +4,23 @@
<title>YaCy '#[clientname]#': Search Page</title>
#%env/templates/metas.template%#
<link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="yacysearch.rss?search=#[former]#" />
<link rel="search" type="application/opensearchdescription+xml" title="YaCy Search on '#[clientname]#'" href="opensearchdescription.xml" />
<link rel="search" type="application/opensearchdescription+xml" title="YaCy Search on '#[clientname]#'" href="opensearchdescription.xml" />
<script type="text/javascript" src="js/html.js"></script>
</head>
<body id="index" onload="document.getElementById('search').focus()">
#(display)#
#%env/templates/simpleheader.template%#
::
#%env/templates/header.template%#
::
#%env/templates/embeddedheader.template%#
::
#%env/templates/embeddedheader.template%#
#(/display)#
<h2 class="yacy">
#[promoteSearchPageGreeting]#
</h2>
<form class="search" action="yacysearch.html" method="get" name="searchform" accept-charset="UTF-8">
<form class="search" action="yacysearch.html" method="get" id="searchform" accept-charset="UTF-8">
<fieldset class="maininput">
<input type="hidden" name="display" value="#[display]#" />
<input name="search" id="search" type="text" size="52" maxlength="80" value="#[former]#" />
@ -38,7 +39,7 @@
<input type="hidden" name="prefermaskfilter" value="" />
<input type="hidden" name="indexof" value="off" />-->
</fieldset>
<p><a href="/index.html?searchoptions=1&amp;display=#[display]#" onclick="this.href='/index.html?searchoptions=1&amp;display=#[display]#&amp;handover='+document.searchform.search.value">more options...</a></p>
<p><a href="/index.html?searchoptions=1&amp;display=#[display]#" onclick="this.href='/index.html?searchoptions=1&amp;display=#[display]#&amp;former='+document.getElementById('searchform').search.value+'&amp;contentdom='+radioValue(document.getElementById('searchform').contentdom)">more options...</a></p>
::
</fieldset>
@ -118,28 +119,28 @@
<p>This peer holds #[links]# URLs</p>
</form>
#(searchoptions)#::
<p>
<form action="index.html" method="get" class="search">
#(publicSearchpage)#
<button type="submit" name="publicPage" value="0">
<img src="/env/grafics/lock.gif" alt="authentication required" />
<p>
#(publicSearchpage)#
<button type="submit" name="publicPage" value="0">
<img src="/env/grafics/lock.gif" alt="authentication required" />
Disable search function for users without autorization
</button>
::
<button type="submit" name="publicPage" value="1">
<img src="/env/grafics/lock.gif" alt="authentication required" />
</button>
::
<button type="submit" name="publicPage" value="1">
<img src="/env/grafics/lock.gif" alt="authentication required" />
Enable web search to everyone
</button>
#(/publicSearchpage)#
</button>
#(/publicSearchpage)#
</p>
</form>
</p>
#(/searchoptions)#
#(display)#
#%env/templates/simplefooter.template%#
::
#%env/templates/footer.template%#
::
#%env/templates/embeddedfooter.template%#
::
#%env/templates/embeddedfooter.template%#
#(/display)#
</body>
</html>

View File

@ -34,3 +34,8 @@ function createLinkCol(url, linktext){
col.appendChild(link);
return col;
}
function radioValue(inputs) {
for (var i=0; i<inputs.length; i++) if (inputs[i].checked) return inputs[i].value;
return false;
}