From 6a5d72a59dc1703ae780d0ec195e78329672eb8c Mon Sep 17 00:00:00 2001
From: Svetlana Rastegina <rasteginas@yandex.ru>
Date: Fri, 5 Feb 2021 23:09:30 +0100
Subject: [PATCH] Modified search block structure.

---
 webapp/src/main/webapp/themes/iph/css/iph.css | 66 +++++++++++++++++--
 .../themes/iph/css/query-builder-theme.css    |  1 +
 .../webapp/themes/iph/css/query-builder.css   | 14 ++--
 .../themes/iph/templates/queryBuilder.ftl     | 41 +++++++-----
 4 files changed, 95 insertions(+), 27 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css
index 9961a612..dedce56b 100644
--- a/webapp/src/main/webapp/themes/iph/css/iph.css
+++ b/webapp/src/main/webapp/themes/iph/css/iph.css
@@ -522,7 +522,7 @@ ul#header-nav a.log-out {
 .search-form-container {
 	display: flex;
 	flex-direction: row;
-	flex-wrap: no-wrap;
+	flex-wrap: nowrap;
 	justify-content: center;
 	width: 100%;
   /*float: left;*/
@@ -546,7 +546,7 @@ ul#header-nav a.log-out {
 	width: 50%;
 	display: flex;
 	flex-direction: row;
-	flex-wrap: no-wrap;
+	flex-wrap: nowrap;
 	justify-content: center;
 }
 
@@ -622,6 +622,62 @@ input.search-vivo {
 #search-form-modifier {
     display: none;
 }
+
+.btn-group-bottom {
+	/*background-color: #F1F1F1;*/
+	/*padding: 5px 5px 5px 5px;*/
+	/*border-left: 1px solid #8B4513;
+	border-right: 1px solid #8B4513;
+	border-bottom: 1px solid #8B4513;*/
+	width: 100%;
+	margin: 0 10px 0 10px;
+}
+
+#settingsButtons {
+	color: #000000;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	width: 100%;
+	/*margin-top: 1%;
+	margin-bottom: 0;
+	margin-left: 2%;
+	margin-right: 2%;*/
+	
+}
+
+#wrapperButtons {
+	width: 70%;
+	margin-right: 10%;
+	display: flex;
+	justify-content: space-around;
+	background-color: #ffffff;
+}
+
+#OuterWrapperButtons {
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	background-color: #F1F1F1;
+	padding: 10px;
+	border-left: 1px solid #8B4513;
+	border-right: 1px solid #8B4513;
+	border-bottom: 1px solid #8B4513;
+}
+
+#btn-search-expand {
+	width: 10%;
+}
+
+#btn-reset-button {
+	
+}
+
+#btn-get-standard-searchform {
+	margin-bottom: 10px;
+}
+
 /* MAIN NAVIGATION------>  */
 ul#main-nav {
     display: flex;
@@ -976,9 +1032,9 @@ input.search-home-vivo {
 /* SEARCH HOME EXPANDED------>  */
 
 #querybuilder-container {
-	width: 80%;
+	width: 60%;
 	display: flex;
-	flex-direction: column;
+	flex-direction: row;
 	flex-wrap: wrap;
 	justify-content: center;
 }
@@ -1280,7 +1336,7 @@ div#adjImgHeight {
 #footerWrapper {
 	display: flex;
 	flex-direction: row;
-	flex-wrap: no-wrap;
+	flex-wrap: nowrap;
 	justify-content: center;
 }
 
diff --git a/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css b/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
index bfce73b8..d4211ad5 100644
--- a/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
+++ b/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
@@ -16,6 +16,7 @@ icons: {
 
 .query-builder {
 	font-family: sans-serif;
+	width: 100%;
 }
 
 .query-builder .hide {
diff --git a/webapp/src/main/webapp/themes/iph/css/query-builder.css b/webapp/src/main/webapp/themes/iph/css/query-builder.css
index 135d919a..12510e8d 100644
--- a/webapp/src/main/webapp/themes/iph/css/query-builder.css
+++ b/webapp/src/main/webapp/themes/iph/css/query-builder.css
@@ -6,10 +6,12 @@
 .query-builder .rules-group-container, .query-builder .rule-container,
 	.query-builder .rule-placeholder {
 	position: relative;
-	margin: 10px 0;
+	margin: 10px 10px 0 10px;
 	/*border-radius: 5px;*/
 	padding: 5px;
-	border: 1px dashed #000000;
+	/*border-top: 1px dashed #000000;
+	border-left: 1px dashed #000000;
+	border-right: 1px dashed #000000;*/
 	background: rgba(255, 255, 255, 0.9);
 }
 
@@ -28,9 +30,11 @@
 }
 
 .query-builder .rules-group-container {
-	padding: 10px;
-	padding-bottom: 6px;
-	border: 1px solid #8B4513;
+	padding: 20px;
+	border-right: 1px solid #8B4513;
+	border-left: 1px solid #8B4513;
+	border-top: 1px solid #8B4513;
+	border-bottom: 1px solid #8B4513;
 	background: #F1F1F1;
 }
 
diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
index 861230a4..f511e5a6 100644
--- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
@@ -1,23 +1,30 @@
 <div id="querybuilder-container" style="display:none;">
   <div id="builder"></div>
-    <div class="btn-group">
-    <button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
-    <button id="btn-reset" class="btn btn-warning reset" data-target="basic">Очистить</button>
-    <button id="btn-set" class="btn btn-success set-json" data-target="basic">Пример</button>
-    <button id="btn-search" class="btn btn-warning reset" data-target="basic">Поиск</button>
-  <!-- <button id="btn-get" class="btn btn-primary parse-json" data-target="basic">Get rules</button> -->
-    <div>
-    <label style="display:inline;" for="hitsPerPage">Результатов на страницу</label>
-    <select name="hitsPerPage" id="hitsPerPageSelect">
-      <option value="20" selected="selected">20</option>
-      <option value="40">40</option>
-      <option value="60">60</option>
-      <option value="80">80</option>
-      <option value="100">100</option>
-    </select>
-    </div>
-  </div>
+    <div class="btn-group-bottom">
+	 <div id="settingsButtons">
+		<div id="OuterWrapperButtons">
+		 <div id="wrapperButtons">
+	       <button id="btn-set" class="btn btn-success set-json" data-target="basic">Пример заполнения</button>
+	       <button id="btn-reset-button" class="btn btn-warning reset" data-target="basic">Очистить</button>
+           <!-- <button id="btn-get" class="btn btn-primary parse-json" data-target="basic">Get rules</button> -->
+             <div id="SelectResults">
+                <label style="display:inline;" for="hitsPerPage">Результатов на страницу</label>
+              <select name="hitsPerPage" id="hitsPerPageSelect">
+                  <option value="20" selected="selected">20</option>
+                  <option value="40">40</option>
+                  <option value="60">60</option>
+                  <option value="80">80</option>
+                  <option value="100">100</option>
+             </select>
+	       </div>
+		</div>
+		 <button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button>
+	</div>
+		 <button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
+		</div>
+   </div>
 </div>
+
 <script src="themes/iph/js/query-builder.standalone.min.js"></script>
 <script src="themes/iph/js/query-builder.ru.js"></script>
 <script>