- removed alternative search page in main menue in favor of rich clie…

…nt search page

- added necessary option to search request of yacy-ui to get snippets

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5165 6c8d7289-2bf4-0310-a012-ef5d649a1542

build.properties

@@ -3,7 +3,7 @@ javacSource=1.5
 javacTarget=1.5
 
 # Release Configuration
-releaseVersion=0.598
+releaseVersion=0.599
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz

htroot/env/templates/header.template

@@ -5,9 +5,9 @@
   <li class="menugroup" id="menugroupGlobalIndex">
     <h3>Search&nbsp;&amp;&nbsp;Browse</h3>
     <ul class="menu">
-      <li><a href="/index.html?display=1" accesskey="s" class="MenuItemLink">Search Page (standard)</a></li>
-      <li><a href="/yacy/user/ysearch.html?display=1" accesskey="s" class="MenuItemLink">Search Page (alternative)</a></li>
-      <li><a href="/yacy/ui/" accesskey="s" class="MenuItemLink">Search Page (Rich Client)</a></li>
+      <li><a href="/index.html?display=1" accesskey="s" class="MenuItemLink">Search Page</a></li>
+      <li><a href="/yacy/ui/" accesskey="s" class="MenuItemLink">Rich Client Search</a></li>
+      <!--<li><a href="/yacy/user/ysearch.html?display=1" accesskey="s" class="MenuItemLink">Search Page (alternative)</a></li>-->
       <li><a href="/compare_yacy.html?display=1" class="MenuItemLink">Compare Search</a></li>
       <li><a href="/Ranking_p.html" class="MenuItemLink lock">Ranking Config</a></li>
       <li><a href="/Surftips.html?display=1" class="MenuItemLink">Surftips</a></li>

htroot/index.html

@@ -26,8 +26,9 @@ <h2 class="yacy">
         <input type="hidden" name="display" value="#[display]#" />
         <input name="query" id="search" type="text" size="52" maxlength="80" value="#[former]#" />
         <input type="submit" name="Enter" value="Search" />
-        <input type="hidden" name="former" value="#[former]#" /><br />
-        <input type="hidden" name="verify" value="true" /><br />
+        <input type="hidden" name="former" value="#[former]#" />
+        <input type="hidden" name="verify" value="true" />
+        <br />
         <input type="radio" id="text" name="contentdom" value="text" #(contentdomCheckText)#::checked="checked"#(/contentdomCheckText)# /><label for="text">Text</label>&nbsp;&nbsp;
         <input type="radio" id="image" name="contentdom" value="image" #(contentdomCheckImage)#::checked="checked"#(/contentdomCheckImage)# /><label for="image">Images</label>&nbsp;&nbsp;
         <input type="radio" id="audio" name="contentdom" value="audio" #(contentdomCheckAudio)#::checked="checked"#(/contentdomCheckAudio)# /><label for="audio">Audio</label>&nbsp;&nbsp;

htroot/yacy/ui/sidebar/sidebar_1.html

@@ -70,10 +70,10 @@ <h3>YaCy P2P Websearch</h3><!-- 0 -->
 		<label for="resource">Resource/Network:</label>
 		<br />		
 		<select name="resource" class="selector">
-			<option value="/yacysearch.rss?resource=global" selected="selected">freeworld</option>
-			<option value="/yacysearch.rss?resource=local" >local peer</option>
+			<option value="/yacysearch.rss?resource=global&verify=true" selected="selected">freeworld</option>
+			<option value="/yacysearch.rss?resource=local&verify=true" >local peer</option>
 			<option value="ymarks" >bookmarks</option>
-			<option value="/xml/util/ynetSearch.xml?login=&url=http://sciencenet.fzk.de:8080/yacysearch.rss?resource=global" >sciencenet</option>
+			<option value="/xml/util/ynetSearch.xml?login=&url=http://sciencenet.fzk.de:8080/yacysearch.rss?resource=global&verify=true" >sciencenet</option>
 		</select>
 		<br />
 		<input  id="searchbutton" type="submit" name="Enter" value="Search" />