From 5f1b1491d2493cc94820ad60e6a3aa9689c1e50d Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Thu, 29 Oct 2015 18:41:58 +0800
Subject: [PATCH 1/3] removed totalResults in json to prevent message
 'Duplicate key "totalResults"' when parsing the json in JSONObject (json
 reference implementation)

---
 htroot/yacysearch.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htroot/yacysearch.json b/htroot/yacysearch.json
index 52653f01a..a11bcbee0 100644
--- a/htroot/yacysearch.json
+++ b/htroot/yacysearch.json
@@ -9,7 +9,6 @@
       "title": "Search for #[rss_query]#",
       "link": "#[searchBaseURL]#?query=#[rss_queryenc]#&amp;resource=#[resource]#&amp;contentdom=#[contentdom]#"
     },
-    "totalResults": "#[num-results_totalcount]#",
     "startIndex": "#[num-results_offset]#",
     "itemsPerPage": "#[num-results_itemsPerPage]#",
     "searchTerms": "#[rss_queryenc]#",

From a7b41bd206063f535df69c28e88bc56358b0cd8f Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Mon, 28 Dec 2015 22:57:31 +0100
Subject: [PATCH 2/3] use curl downloads in download script with silent mode

---
 htroot/js/yacyinteractive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htroot/js/yacyinteractive.js b/htroot/js/yacyinteractive.js
index 188780e94..896f44899 100644
--- a/htroot/js/yacyinteractive.js
+++ b/htroot/js/yacyinteractive.js
@@ -215,7 +215,7 @@ function resultLine(type, item, linenumber) {
   }
   
   // update download script
-  if (item.link.indexOf("smb://") >= 0) script += "smbget -n -a -r \"" + item.link + "\"\n"; else script += "curl -OL \"" + item.link + "\"\n";
+  if (item.link.indexOf("smb://") >= 0) script += "smbget -n -a -r \"" + item.link + "\"\n"; else script += "curl -sOL \"" + item.link + "\"\n";
   
   // make table row
   var html = "";

From fe308f47d561695d53662050e44e0545b8ae0835 Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Mon, 28 Dec 2015 23:20:37 +0100
Subject: [PATCH 3/3] added greeting line to interactive search and harmonized
 display position with 'Administration' line in all administration pages

---
 htroot/env/templates/header.template       | 4 ++--
 htroot/env/templates/simpleheader.template | 2 +-
 htroot/yacyinteractive.html                | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 023ab3355..0c2dd3138 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -9,8 +9,8 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" id="navbar-brand" href="/" style="position:absolute;top:-6px;display:inline;white-space:nowrap;">
-        <img id="greeting-icon" class="yacylogo" src="/env/grafics/yacy.png" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle">
-        <span style="position:absolute;top:30px;left:80px;display:inline;white-space:nowrap;">Administration</span>
+        <img id="greeting-icon" class="yacylogo" src="/env/grafics/yacy.png" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle;float:left;">
+        <span style="position:absolute;top:50%;float:left;">&nbsp;Administration</span>
       </a>
       <form class="navbar-form" method="get" accept-charset="UTF-8" action="/yacysearch.html" style="padding-left:200px;max-width:400px;">
         <input name="query" placeholder="Search..." class="form-control" type="text" size="36" maxlength="200" value=""/>
diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template
index 6b0620592..670a1667e 100644
--- a/htroot/env/templates/simpleheader.template
+++ b/htroot/env/templates/simpleheader.template
@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" id="navbar-brand" href="#[promoteSearchPageGreeting.homepage]#" style="position:absolute;top:-6px;display:inline;white-space:nowrap;">
-        <img id="greeting-icon" class="yacylogo" src="#[promoteSearchPageGreeting.smallImage]#" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle">&nbsp;<span id="greeting"></span>
+        <img id="greeting-icon" class="yacylogo" src="#[promoteSearchPageGreeting.smallImage]#" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle;float:left;">&nbsp;<span id="greeting" style="position:absolute; top:50%;float:left;"></span>
       </a>
     </div>
     <div class="navbar-collapse collapse">
diff --git a/htroot/yacyinteractive.html b/htroot/yacyinteractive.html
index 24e15a2e4..8925b79fe 100644
--- a/htroot/yacyinteractive.html
+++ b/htroot/yacyinteractive.html
@@ -13,6 +13,7 @@
 #%env/templates/simpleheader.template%#
 <script type="text/javascript">
   document.getElementById("header_filesearch").className += " active";
+  document.getElementById("greeting").innerHTML = "&nbsp;#[promoteSearchPageGreeting]#";
 </script>
 #(/topmenu)#