From a17fcfcd8e28c6103bbe2a157aa8d0531aca5956 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 May 2021 21:54:47 +0200
Subject: [PATCH] do not collapse search form

---
 views/bootstrap4/class.Bootstrap4.php | 46 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 4918dc103..5627d5d6b 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -272,6 +272,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	function contentStart() { /* {{{ */
+/*
+		echo "<div class=\"container-fluid\">\n";
+		echo "<div class=\"row\">\n";
+		echo "<nav class=\"_col-md-2 d-none d-md-block bg-light sidebar\">\n";
+		echo "<div class=\"sidebar-sticky\">\n";
+		echo "lsajdlf";
+		echo "</div>\n";
+		echo "</nav>\n";
+		echo "<main role=\"main\" class=\"_col-md-10 _ml-sm-auto pb-3 px-4\">\n";
+*/
 		echo "<main role=\"main\" class=\"container-fluid mt-3 pb-3\">\n";
 		echo " <div class=\"row-fluid\">\n";
 	} /* }}} */
@@ -279,6 +289,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function contentEnd() { /* {{{ */
 		echo " </div>\n";
 		echo "</main>\n";
+/*
+		echo "</div>\n";
+		echo "</div>\n";
+*/
 	} /* }}} */
 
 	function globalBanner() { /* {{{ */
@@ -291,7 +305,19 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$dms = $this->params['dms'];
 		$accessobject = $this->params['accessobject'];
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark border-bottom fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><img src=\"../views/bootstrap/images/seeddms-logo.svg\"> ".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
+		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><img src=\"../views/bootstrap/images/seeddms-logo.svg\"> <span class=\"d-none d-md-inline-block\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+			/* search form {{{ */
+			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline mr-auto\" autocomplete=\"off\">";
+			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
+				echo "      <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
+			}
+			echo "      <input type=\"hidden\" name=\"navBar\" value=\"1\" />";
+			echo "      <input name=\"query\" class=\"form-control mr-sm-2 search-query\" ".($this->params['defaultsearchmethod'] == 'fulltext_' ? "id=\"searchfield\"" : "id=\"searchfield\"")." data-provide=\"typeahead\" type=\"search\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\" aria-label=\"".getMLText("search")."\"/>";
+			if($this->params['defaultsearchmethod'] == 'fulltext')
+				echo "      <input type=\"hidden\" name=\"fullsearch\" value=\"1\" />";
+			echo "</form>\n";
+			/* }}} End of search form */
+
 		echo " <button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarMain\" aria-controls=\"navbarMain\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">\n";
 		echo "  <span class=\"navbar-toggler-icon\"></span>\n";
 		echo " </button>\n";
@@ -326,26 +352,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 			echo "   </ul>\n";
 
-			/* search form {{{ */
-			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline ml-auto\" autocomplete=\"off\">";
-			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
-				echo "      <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
-			}
-			echo "      <input type=\"hidden\" name=\"navBar\" value=\"1\" />";
-			echo "      <input name=\"query\" class=\"form-control mr-sm-2 search-query\" ".($this->params['defaultsearchmethod'] == 'fulltext_' ? "id=\"searchfield\"" : "id=\"searchfield\"")." data-provide=\"typeahead\" type=\"search\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\" aria-label=\"".getMLText("search")."\"/>";
-			if($this->params['defaultsearchmethod'] == 'fulltext')
-				echo "      <input type=\"hidden\" name=\"fullsearch\" value=\"1\" />";
-//			if($this->params['enablefullsearch']) {
-//				echo "      <label class=\"checkbox\" style=\"color: #999999;\"><input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch')."</label>";
-//			}
-	//		echo "      <input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\" class=\"btn\"/>";
-			echo "</form>\n";
-			/* }}} End of search form */
-
 			/* menu tasks {{{ */
 			if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) {
 				if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {
-					echo "   <div id=\"menu-tasks\">";
+					echo "   <div id=\"menu-tasks\" class=\"ml-auto\">";
 					echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
 	//				echo "   <ul id=\"main-menu-tasks\" class=\"navbar-nav ml-auto\">\n";
 	//				echo "    <li class=\"nav-item dropdown\">\n";