update to search display options for kaskelix embedding

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

htroot/env/xhtml-style.css

@@ -1,5 +1,5 @@
 body {
-background-color:#F8F8FF;
+background-color:#FFFFFF;
 margin:0;
 }
 * {

htroot/yacysearch.html

@@ -22,6 +22,28 @@
 
 #(input)#
 	::
+    <form class="search small" action="yacysearch.html" method="get" accept-charset="UTF-8">
+      <div>
+      <fieldset class="yacys">
+        <input id="search" name="search" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
+        <input id="Enter" type="submit" name="Enter" value="Search" />
+        <input type="hidden" name="contentdom" value="#[contentdom]#" />
+        <input type="hidden" name="former" value="#[former]#" />
+        <input type="hidden" name="count" value="#[count]#" />
+        <input type="hidden" name="resource" value="#[resource]#" />
+        <input type="hidden" name="time" value="#[time]#" />
+        <input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" />
+        <input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
+        <input type="hidden" name="depth" value="#[depth]#" />
+        <input type="hidden" name="cat" value="#[cat]#" />
+        <input type="hidden" name="type" value="#[type]#" />
+        <input type="hidden" name="display" value="#[display]#" />
+        <input type="hidden" name="input" value="#[input]#" />
+        <input type="hidden" name="constraint" value="#[constraint]#" />
+      </fieldset>
+      </div>
+    </form>
+    ::
     <form class="search small" action="yacysearch.html" method="get" accept-charset="UTF-8">
       <p class="yacylogo"><a href="http://yacy.net/yacy/" class="yacylogo"><img src="/env/grafics/yacy.png" alt="yacy" /></a></p>
       <h2>#[promoteSearchPageGreeting]#</h2>
@@ -52,15 +74,19 @@
         <input type="hidden" name="cat" value="#[cat]#" />
         <input type="hidden" name="type" value="#[type]#" />
         <input type="hidden" name="display" value="#[display]#" />
+        <input type="hidden" name="input" value="#[input]#" />
         <input type="hidden" name="constraint" value="#[constraint]#" />
       </fieldset>
       </div>
     </form>
 #(/input)#
 
+#(searchagain)#
+::
 <script type="text/javascript">
 document.getElementById("Enter").value = "search again - catch up more links";
 </script>
+#(/searchagain)#
 
 <!-- show information about search key handling -->
 #(excluded)#

htroot/yacysearch.java

@@ -93,7 +93,7 @@ public class yacysearch {
         boolean authenticated = sb.adminAuthenticated(header) >= 2;
         int display = (post == null) ? 0 : post.getInt("display", 0);
         if ((display == 1) && (!authenticated)) display = 0;
-        int input = (post == null) ? 0 : post.getInt("input", 1);
+        int input = (post == null) ? 2 : post.getInt("input", 2);
         String promoteSearchPageGreeting = env.getConfig("promoteSearchPageGreeting", "");
         if (promoteSearchPageGreeting.length() == 0) promoteSearchPageGreeting = "P2P WEB SEARCH";
 
@@ -120,6 +120,7 @@ public class yacysearch {
 
             // we create empty entries for template strings
             final serverObjects prop = new serverObjects();
+            prop.put("searchagain", 0);
             prop.put("input", input);
             prop.put("display", display);
             prop.put("input_input", input);
@@ -489,6 +490,7 @@ public class yacysearch {
         for (int i=0; i<linkcount; i++)
             prop.put("type_results_" + i + "_authorized", (authenticated) ? 1 : 0);
 
+        prop.put("searchagain", (global) ? 1 : 0);
         prop.put("input", input);
         prop.put("display", display);
         prop.put("input_input", input);