From 98f36a801a2e1cadec05df30b3d6c9adcd5ceae5 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 6 Mar 2009 10:16:14 +0000
Subject: [PATCH] - small update to search result layout - some more mime types

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5669 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/env/base.css     | 19 +++++++++----------
 htroot/js/yacysearch.js |  1 +
 htroot/yacysearch.html  | 36 ++++++++++++++++++------------------
 httpd.mime              |  4 ++++
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/htroot/env/base.css b/htroot/env/base.css
index e015635cd..7686b72b4 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -169,8 +169,6 @@ tt, *.tt {
   margin-bottom:10px;
 }
 
-
-
 .PostSubject {
   padding:5px;
   margin:0;
@@ -293,14 +291,6 @@ div.bookmark {
   padding-bottom:1em;
 }
 
-div.searchresults {
-  padding-top:1em;
-  width:85%;
-}
-
-div.searchresults.hidden {
-  display:none;
-}
 
 div.SubMenugroup{
   float:left;
@@ -321,6 +311,15 @@ div.yacysearch {
   display:block;
 }
 
+div.searchresults {
+  padding-top:1em;
+  width:100%;
+}
+
+div.searchresults.hidden {
+  display:none;
+}
+
 div.urlactions {
   float:left;
   clear:left;
diff --git a/htroot/js/yacysearch.js b/htroot/js/yacysearch.js
index febcc936a..67eeabc3e 100644
--- a/htroot/js/yacysearch.js
+++ b/htroot/js/yacysearch.js
@@ -74,6 +74,7 @@ function statistics(offset, itemscount, totalcount, localResourceSize, remoteRes
   document.getElementById("resultsOffset").firstChild.nodeValue = offset;
   document.getElementById("itemscount").firstChild.nodeValue = itemscount;
   document.getElementById("totalcount").firstChild.nodeValue = totalcount;
+  if (document.getElementById("localResourceSize") == null) return;
   document.getElementById("localResourceSize").firstChild.nodeValue = localResourceSize;
   document.getElementById("remoteResourceSize").firstChild.nodeValue = remoteResourceSize;
   document.getElementById("remoteIndexCount").firstChild.nodeValue = remoteIndexCount;
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 33ab560b2..d41c19c9c 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -61,23 +61,22 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
       <h2>#[promoteSearchPageGreeting]#</h2>
       <div class="yacylogo"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.smallImage]#" alt="yacysearch" /></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" />
-              
-          <div class="yacysearch">
-              <input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
-              <label for="text">Text</label>&nbsp;&nbsp;
-              <input type="radio" id="images" name="contentdom" value="image"#(contentdomCheckImage)#:: checked="checked"#(/contentdomCheckImage)# />
-              <label for="images">Images</label>&nbsp;&nbsp;
-              <input type="radio" id="audio" name="contentdom" value="audio"#(contentdomCheckAudio)#:: checked="checked"#(/contentdomCheckAudio)# />
-              <label for="audio">Audio</label>&nbsp;&nbsp;
-              <input type="radio" id="video" name="contentdom" value="video"#(contentdomCheckVideo)#:: checked="checked"#(/contentdomCheckVideo)# />
-              <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;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
-           </div>
+        <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" />
+        <div class="yacysearch">
+          <input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
+          <label for="text">Text</label>&nbsp;&nbsp;
+          <input type="radio" id="images" name="contentdom" value="image"#(contentdomCheckImage)#:: checked="checked"#(/contentdomCheckImage)# />
+          <label for="images">Images</label>&nbsp;&nbsp;
+          <input type="radio" id="audio" name="contentdom" value="audio"#(contentdomCheckAudio)#:: checked="checked"#(/contentdomCheckAudio)# />
+          <label for="audio">Audio</label>&nbsp;&nbsp;
+          <input type="radio" id="video" name="contentdom" value="video"#(contentdomCheckVideo)#:: checked="checked"#(/contentdomCheckVideo)# />
+          <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;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]#" />
         <input type="hidden" name="startRecord" value="#[offset]#" />
@@ -115,7 +114,7 @@ document.getElementById("Enter").value = "search again";
 	<p>No Results. (length of search words must be at least 3 characters)</p>
 	::
 	<div id="results"></div>
-	<span id="resCounter" style="display: inline;"><strong id="resultsOffset">#[offset]#</strong>-<strong id="itemscount">#[itemscount]#</strong> results from a total number of <strong id="totalcount">#[totalcount]#</strong> known#(globalresults)#.:: (<strong id="localResourceSize">#[localResourceSize]#</strong> local, <strong id="remoteResourceSize">#[remoteResourceSize]#</strong> remote), <strong id="remoteIndexCount">#[remoteIndexCount]#</strong> links from <strong id="remotePeerCount">#[remotePeerCount]#</strong> other YaCy peers.#(/globalresults)#</span>
+	<span id="resCounter" style="display: inline;"><strong id="resultsOffset">#[offset]#</strong>-<strong id="itemscount">#[itemscount]#</strong> of <strong id="totalcount">#[totalcount]#</strong> #(globalresults)#::; (<strong id="localResourceSize">#[localResourceSize]#</strong> local, <strong id="remoteResourceSize">#[remoteResourceSize]#</strong> remote), <strong id="remoteIndexCount">#[remoteIndexCount]#</strong> from <strong id="remotePeerCount">#[remotePeerCount]#</strong> remote YaCy peers.#(/globalresults)#</span>
 	<span id="resNav" style="display: inline;">#[resnav]#</span>
 	::
 	<p>Searching the web with this peer is disabled for unauthorized users. Please <a href="Status.html?login=">log in</a> as administrator to use the search function</p>
@@ -136,5 +135,6 @@ var progressbar = new Progressbar(#[results]#, document.getElementById("results"
 <!-- attach the bottomline -->
 <!--#include virtual="yacysearchtrailer.html?eventID=#[eventID]#&display=#[display]#" -->
 </div>
+
 </body>
 </html>
diff --git a/httpd.mime b/httpd.mime
index 91e0f7a42..418397409 100644
--- a/httpd.mime
+++ b/httpd.mime
@@ -15,9 +15,11 @@ class   = application/octet-stream
 c       = text/plain
 com     = application/octet-stream
 css     = text/css
+csv     = text/csv
 db      = application/octet-stream
 dll     = application/octet-stream
 doc     = application/msword
+docx    = application/msword
 dot     = application/msword
 dvi     = application/x-dvi
 eps     = application/postscript
@@ -67,6 +69,7 @@ png     = image/png
 pot     = application/mspowerpoint
 pps     = application/mspowerpoint
 ppt     = application/mspowerpoint
+pptx    = application/mspowerpoint
 ppz     = application/mspowerpoint
 ps      = application/postscript
 qt      = video/quicktime
@@ -101,6 +104,7 @@ wmv 	= video/x-ms-wmv
 xhtml   = text/xhtml+xml
 xla     = application/msexcel
 xls     = application/msexcel
+xlsx    = application/msexcel
 xpi		= application/x-xpinstall 
 xsl		= text/xml
 xml     = text/xml