From 2126315d4082024380cfc07c888a04f8d6c7b79b Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 28 Sep 2008 23:19:56 +0000
Subject: [PATCH] layout changes for search result page

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5220 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/env/base.css    | 10 ++++++----
 htroot/yacysearch.html | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/htroot/env/base.css b/htroot/env/base.css
index d2a3c2a77..4b27b2191 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -290,7 +290,7 @@ div.bookmark {
 
 div.searchresults {
   padding-top:1em;
-  margin-bottom:1em;
+  width:85%;
 }
 
 div.searchresults.hidden {
@@ -362,7 +362,6 @@ div.searchresults p{
 
 form.search.small p.yacylogo { /* The logo in yacysearch.html */
   display:block;
-  float:left;
   padding:0;
   margin: 0 5px 5px;
 }
@@ -409,7 +408,10 @@ div.sidebar { /* sidebars on the right side */
 
 form.search.small h2 {
   clear:none;
-  margin-left:85px;
+  font-size: 1.2em;
+  margin-left:0px;
+  margin-top:0px;
+  /*border-bottom:1px solid;*/
 }
 
 li.menugroup h3{
@@ -635,8 +637,8 @@ form.PeerControl fieldset { /* on Status.html */
 }
 
 form.search.small fieldset {
-    clear:left;
     margin-left:100px;
+    width:80%;
 }
 
 form.search.small fieldset * {
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 253285d37..8dd7b42ce 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -45,12 +45,12 @@
     </form>
     ::
     <form class="search small" action="yacysearch.html" method="get" accept-charset="UTF-8">
-      <p class="yacylogo"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.smallImage]#" alt="yacy" /></a></p>
       <h2>#[promoteSearchPageGreeting]#</h2>
+      <div class="yacylogo"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.smallImage]#" alt="yacy" align="left"/></a></div>
       <fieldset class="yacys">
               <input id="search" name="query" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
-              <input id="Enter" type="submit" name="Enter" value="Search" /> &nbsp;
-              <a href="index.html?display=#[display]#&amp;input=#[input]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;time=#[time]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
+              <input id="Enter" type="submit" name="Enter" value="Search" />
+              
           <div class="yacysearch">
               <input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
               <label for="text">Text</label>&nbsp;&nbsp;
@@ -62,6 +62,8 @@
               <label for="video">Video</label>&nbsp;&nbsp;
               <input type="radio" id="appl" name="contentdom" value="app"#(contentdomCheckApp)#:: checked="checked"#(/contentdomCheckApp)# />
               <label for="appl">Applications</label>
+               &nbsp;
+              <a href="index.html?display=#[display]#&amp;input=#[input]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;time=#[time]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
            </div>
         <input type="hidden" name="former" value="#[former]#" />
         <input type="hidden" name="maximumRecords" value="#[count]#" />
@@ -82,7 +84,7 @@
 #(searchagain)#
 ::
 <script type="text/javascript">
-document.getElementById("Enter").value = "search again - catch up more links";
+document.getElementById("Enter").value = "search again";
 </script>
 #(/searchagain)#