From cc796ce5ccebe3325f7d83c92ce676d21a8cf8bb Mon Sep 17 00:00:00 2001
From: Svetlana Rastegina <rasteginas@yandex.ru>
Date: Thu, 11 Feb 2021 00:07:57 +0100
Subject: [PATCH] Changed search block structure.

---
 webapp/src/main/webapp/themes/iph/css/iph.css | 26 ++++++++----
 .../themes/iph/css/query-builder-theme.css    |  2 +-
 .../webapp/themes/iph/css/query-builder.css   | 24 ++++++++---
 .../themes/iph/templates/queryBuilder.ftl     | 42 ++++++++++---------
 4 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css
index 15576824..ea68292e 100644
--- a/webapp/src/main/webapp/themes/iph/css/iph.css
+++ b/webapp/src/main/webapp/themes/iph/css/iph.css
@@ -642,8 +642,8 @@ input.search-vivo {
 	/*border-left: 1px solid #8B4513;
 	border-right: 1px solid #8B4513;
 	border-bottom: 1px solid #8B4513;*/
-	width: 100%;
-	margin: 0 10px 0 10px;
+	/*width: 100%;*/
+	/*margin: 0 10px 0 10px;*/
 }
 
 #settingsButtons {
@@ -653,6 +653,7 @@ input.search-vivo {
 	flex-wrap: wrap;
 	justify-content: space-between;
 	width: 100%;
+	background-color: #F1F1F1;
 	/*margin-top: 1%;
 	margin-bottom: 0;
 	margin-left: 2%;
@@ -660,9 +661,15 @@ input.search-vivo {
 	
 }
 
+#CounterSearchWrapper {
+	border: 1px solid #8B4513;
+	box-shadow: 0px 4px 4px #aeaeae;
+	
+}
+
 #wrapperButtons {
-	width: 70%;
-	margin-left: 4%;
+	/*width: 70%;
+	margin-left: 4%;*/
 	display: flex;
 	justify-content: space-around;
 	background-color: #ffffff;
@@ -673,12 +680,13 @@ input.search-vivo {
 #OuterWrapperButtons {
 	display: flex;
 	justify-content: space-between;
-	width: 100%;
+	width: 70%;
+	margin-left: 2%;
 	background-color: #F1F1F1;
 	padding: 10px 10px 15px 10px;
-	border-left: 1px solid #8B4513;
+	/*border-left: 1px solid #8B4513;
 	border-right: 1px solid #8B4513;
-	border-bottom: 1px solid #8B4513;
+	border-bottom: 1px solid #8B4513;*/
 }
 
 #SelectResults {
@@ -1083,10 +1091,10 @@ input.search-home-vivo {
 
 #querybuilder-container {
 	width: 60%;
-	display: flex;
+	/*display: flex;
 	flex-direction: row;
 	flex-wrap: wrap;
-	justify-content: center;
+	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 0c735a65..5f39c6c7 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
@@ -69,7 +69,7 @@ icons: {
 
 .btn-group.pull-right.group-actions {
 	box-shadow: 0px 4px 2px #aeaeae;
-	margin-right: 10px;
+	/*margin-right: 10px;*/
 }
 
 .query-builder .btn-primary {
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 12510e8d..181f7fcc 100644
--- a/webapp/src/main/webapp/themes/iph/css/query-builder.css
+++ b/webapp/src/main/webapp/themes/iph/css/query-builder.css
@@ -6,7 +6,7 @@
 .query-builder .rules-group-container, .query-builder .rule-container,
 	.query-builder .rule-placeholder {
 	position: relative;
-	margin: 10px 10px 0 10px;
+	/*margin: 10px 10px 0 10px;*/
 	/*border-radius: 5px;*/
 	padding: 5px;
 	/*border-top: 1px dashed #000000;
@@ -30,12 +30,24 @@
 }
 
 .query-builder .rules-group-container {
-	padding: 20px;
-	border-right: 1px solid #8B4513;
+	padding: 20px 20px 15px 20px;
+	/*border-right: 1px solid #8B4513;
 	border-left: 1px solid #8B4513;
 	border-top: 1px solid #8B4513;
-	border-bottom: 1px solid #8B4513;
-	background: #F1F1F1;
+	border-bottom: 1px solid #8B4513;*/
+	background-color: #efe9d9;
+}
+
+#builder_group_0 {
+	background-color: #F1F1F1;
+}
+
+#builder_rule_1 {
+	margin-bottom: 10px;
+}
+
+#builder_group_1 {
+	margin-top: 10px;
 }
 
 .query-builder .rules-group-header {
@@ -62,7 +74,7 @@
 
 .query-builder .rules-list {
 	list-style: none;
-	padding: 0 0 0 15px;
+	padding: 0 0 0 10px;
 	margin: 0;
 	box-shadow: 0px 0px #aeaeae;
 }
diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
index 144bbe91..a88f52d7 100644
--- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
@@ -1,30 +1,32 @@
 <div id="querybuilder-container" style="display:none;">
-  <div id="builder"></div>
+<div id="CounterSearchWrapper"> 
+ <div id="builder"></div>
     <div class="btn-group-bottom">
-	 <div id="settingsButtons">
+	  <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 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>		
+       </div>
+		 <button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button>	
 		</div>
-		 <button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button>
 	</div>
+</div>
 		<div id="backgroundForm">
-		 <button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
+		 	<button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
 		</div>
-		</div>
-   </div>
 </div>
 
 <script src="themes/iph/js/query-builder.standalone.min.js"></script>