Merge branch 'master' of https://github.com/yacy/yacy_search_server

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">
+        <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:30px;left:80px;display:inline;white-space:nowrap;">Administration</span>
+        <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=""/>

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">

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 = "";

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)#