From 437e535e5ca465b7182448a0994a150271c6c63b Mon Sep 17 00:00:00 2001
From: luccioman <luccioman@users.noreply.github.com>
Date: Wed, 14 Dec 2016 12:49:41 +0100
Subject: [PATCH] Fixed admin navbar rendering at various screen sizes.

Fix mantis 443 (http://mantis.tokeek.de/view.php?id=443).

Tested on :
 - Debian jessie : Firefox ESR 45.5.1
 - MS Windows 10 : Firefox 50.1.0, Chrome 55 and Edge
 - Emulated devices/adaptative views embedded in the previously
mentionned browsers
---
 htroot/env/base.css                  | 30 ++++++++++++++++++++++++++-
 htroot/env/templates/header.template | 31 +++++++++++++++++++---------
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/htroot/env/base.css b/htroot/env/base.css
index 070f7d0f8..924de111a 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -1106,4 +1106,32 @@ div#tagcloud {
 	width: 33.333% !important;
 }
 
-/******* yacysearchtrailer.html end ***********/
\ No newline at end of file
+/******* yacysearchtrailer.html end ***********/
+
+/************* header.template ****************/
+/* Specific styles for the header template */
+
+/* Header search form bootstrap styles overrides for extra smal screen sizes*/
+#header-search-form {
+	max-width: 80%;
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+    margin-right: 0 !important;
+    margin-left: 0 !important;
+    border: 0 !important;
+    -webkit-box-shadow: unset !important;
+    box-shadow: unset !important;
+}
+
+/* Header greeting icon */
+#header-greeting-icon {
+	height:auto; 
+	width:auto; 
+	max-width:200px; 
+	max-height:32px;
+	vertical-align:middle;
+	margin-top: -6px;
+}
+
+
+/************* header.template end ************/
\ No newline at end of file
diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 6d8a534ee..6c19068d8 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -1,19 +1,21 @@
 <!-- top navigation -->
 <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
   <div class="container-fluid">
+    <div class="collapse navbar-collapse navbar-header">
+      <a class="navbar-brand" id="navbar-brand" href="./">
+        <span><img id="header-greeting-icon" class="yacylogo" src="env/grafics/yacy.png" alt="YaCy"></span>
+        <span>&nbsp;Administration</span>
+      </a>
+    </div>
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <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" alt="YaCy" 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=""/>
+      <form id="header-search-form" class="navbar-form" method="get" accept-charset="UTF-8" action="yacysearch.html">
+        <input name="query" placeholder="Search..." class="form-control" type="text" size="30" maxlength="200" value=""/>
         <input type="hidden" name="resource" value="global" />
         <input type="hidden" name="urlmaskfilter" value=".*" />
         <input type="hidden" name="prefermaskfilter" value="" />
@@ -25,14 +27,20 @@
         <li id="header_restart">
           <form action="Steering.html" method="get">
             <input type="hidden" name="restart" value="" />
-            <button accesskey="s" type="submit" class="btn btn-inverse navbar-btn label-warning" onclick="return confirm('Confirm Re-Start')"><span class="glyphicon glyphicon-fire"></span> Re-Start</button>
+            <button accesskey="s" type="submit" class="btn btn-inverse navbar-btn label-warning" onclick="return confirm('Confirm Re-Start')" title="Restart">
+            	<span class="glyphicon glyphicon-fire"></span>
+            	<span class="hidden-sm"> Re-Start</span>
+            </button>
           </form>
         </li>
         <li>&nbsp;</li>
         <li id="header_shutdown">
           <form action="Steering.html" method="get">
             <input type="hidden" name="shutdown" value="" />
-            <button accesskey="s" type="submit" class="btn btn-inverse navbar-btn label-danger" onclick="return confirm('Confirm Shutdown')"><span class="glyphicon glyphicon-off"></span> Shutdown</button>
+            <button accesskey="s" type="submit" class="btn btn-inverse navbar-btn label-danger" onclick="return confirm('Confirm Shutdown')" title="Shutdown">
+            	<span class="glyphicon glyphicon-off"></span>
+            	<span class="hidden-sm"> Shutdown</span>
+            </button>
           </form>
         </li>
         <li id="header_help" class="dropdown">
@@ -51,7 +59,10 @@
         </li>
         <li id="header_administration">
           <form action="index.html" method="get">
-            <button accesskey="s" type="submit" class="btn btn-inverse navbar-btn label-primary"><span class="glyphicon glyphicon-search"></span> Search Interface &raquo;</button>
+            <button accesskey="s" type="submit" class="btn btn-inverse navbar-btn label-primary" title="Search Interface">
+            	<span class="glyphicon glyphicon-search"></span>
+            	<span class="hidden-sm hidden-md"> Search Interface &raquo;</span>
+            </button>
           </form>
         </li>
       </ul>