From 348698c74143b14b80cc29ea9170ad3450cc5b93 Mon Sep 17 00:00:00 2001
From: Urban MacGillivray <umacgillivray@esri.com>
Date: Thu, 1 Mar 2018 14:32:05 -0800
Subject: [PATCH] geoportal-search

---
 .../main/resources/gs/widget/style/style.css  | 186 ++++++++++--------
 .../gs/widget/templates/SearchBox.html        |  14 +-
 .../gs/widget/templates/SearchPane.html       |   1 -
 .../src/main/resources/platform/gsapp.html    |   6 +-
 .../src/main/resources/platform/gspro.html    |   6 +-
 5 files changed, 122 insertions(+), 91 deletions(-)

diff --git a/geoportal-search/src/main/resources/gs/widget/style/style.css b/geoportal-search/src/main/resources/gs/widget/style/style.css
index ce3b0b7ed..a35e50650 100644
--- a/geoportal-search/src/main/resources/gs/widget/style/style.css
+++ b/geoportal-search/src/main/resources/gs/widget/style/style.css
@@ -1,92 +1,97 @@
+
 /* ........................................................................ */
 
-.geoportal-search-pro .geoportal-search.search-pane {
-  width: 310px;
+.geoportal-search-wab {
+	position: relative;
+	width: 100%;
+	height: 100%
 }
-.geoportal-search-pro .dijitPopup {
-  max-width: 98%;
+.geoportal-search-wab .search-sort-options .dijitSelect {
+  height: 24px;
 }
 
 /* ........................................................................ */
 
-.geoportal-search-wab .search-sort-options .dijitSelect {
-  height: 24px;
+.geoportal-search-pro .geoportal-search.search-pane {
+  width: 95%;
+  height: 400px;
 }
-
-.calcite .search-sort-options .dijitButtonContents {
-  padding: 0px;
+.geoportal-search-pro .dijitPopup {
+  max-width: 98%;
 }
 
 /* ........................................................................ */
 
-.geoportal-search.settings a {
-  color: #196fa6;
-  text-decoration: none;
-}
-
-.geoportal-search.settings .gap {
-  margin-left: 10px;
+.geoportal-search-dev  {
+  display: inline-block;
   margin-right: 10px;
+  width: 310px;
+  height: 500px;
 }
 
-.geoportal-search.settings .note {
-  font-style: italic;
-  font-size: 10px;
-}
+/* ........................................................................ */
 
-/*
-.geoportal-search.settings .targets {
-  max-height: 500px;
-  overflow-y: auto;
+.calcite .search-sort-options .dijitButtonContents {
+  padding: 0px;
 }
-*/
 
-.geoportal-search.settings .target-setting {
-  margin: 10px;
-  padding: 10px;
-  border: 1px solid #cccccc;
-  border-radius: 5px;
-}
+/* ........................................................................ */
 
-.geoportal-search.settings .form-group {
-  margin: 5px;
+.geoportal-search.search-pane {
+  display: inline-block;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  min-width: 222px;
+  min-height: 237px;
 }
 
-.geoportal-search.settings .form-group > .control-label {
-  display: inline-block;
-  width: 70px;
-  text-align: right;
+.geoportal-search .main-search-bar {
+  position: absolute;
+  width: 100%;
 }
 
-.geoportal-search.settings .form-group .dijitTextBox {
-  width: 300px;
+.geoportal-search .secondary-search-bar {
+  position: absolute;
+  width: 100%;
+  top: 40px;
 }
 
-/* ........................................................................ */
+.geoportal-search .search-pane-content {
+	position: absolute;
+	width: 100%;
+	left: 0;
+	right: 0;
+	top: 75px;
+	bottom: 44px;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
 
-.geoportal-search.search-pane {
-  width: 310px;
+.geoportal-search .search-pane-footer {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow-x: hidden;
+  overflow-y: hidden;
 }
 
-.geoportal-search .search-results {
-  max-height: 340px;
-  overflow-y: auto;
+.geoportal-search .search-box-container {
+  position: absolute;
+  left: 0;
+  right: 31px;
 }
 
 .geoportal-search .search-box input {
-  width: 85%;
-  padding: 5px 10px;
+  width: 100%;
+  padding: 4px 10px;
 }
 
-.geoportal-search-pro .search-results {
-  max-height: 240px;
-}
-
-.geoportal-search.search-pane {
-  display: inline-block;
-  padding: 6px;
-  border: 1px solid #cccccc;
-  border-radius: 5px;
+.geoportal-search .search-box .btn {
+  position: absolute;
+  right: 0;
 }
 
 .geoportal-search .search-results-pane a {
@@ -169,10 +174,6 @@
   cursor: pointer;
 }
 
-.geoportal-search .secondary-search-bar {
-  margin-top: 4px;
-}
-
 .geoportal-search .secondary-search-bar,
 .geoportal-search .search-target-options .dijitDropDownButton .dijitButtonText,
 .geoportal-search .search-sort-options .dijitSelect .dijitButtonText,
@@ -188,17 +189,12 @@
   vertical-align: middle;
 }
 
-.geoportal-search .search-bbox-option {
-  /*margin-left: 6px;*/
-}
-
 .geoportal-search .search-bbox-option .checkbox-inline,
 .geoportal-search .search-bbox-option .dijitCheckBox input  {
   cursor: pointer;
 }
 
 .geoportal-search .search-livedata-option {
-  /*margin-left: 10px;*/
   margin-left: 4px;
 }
 .geoportal-search .search-livedata-option .checkbox-inline,
@@ -231,11 +227,6 @@
   background-image: url(images/sort-up-arrow.png);
 }
 
-.geoportal-search .search-results-pane {
-  margin-top: 6px;
-  margin-bottom: 8px;
-}
-
 .geoportal-search .search-paging {
   float: right;
 }
@@ -257,14 +248,6 @@
   background: #ffffff;
 }
 
-/*
-.geoportal-search .item-card .thumbnail-div,
-.geoportal-search .item-card .info-div {
-  display: inline-block;
-  vertical-align: top;
-}
-*/
-
 .geoportal-search .item-card .thumbnail-div {
   float: left;
   margin-right: 10px;
@@ -385,3 +368,50 @@
   color: #a9a9a9;
   cursor: not-allowed;
 }
+
+/* ........................................................................ */
+
+.geoportal-search.settings a {
+  color: #196fa6;
+  text-decoration: none;
+}
+
+.geoportal-search.settings .gap {
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.geoportal-search.settings .note {
+  font-style: italic;
+  font-size: 10px;
+}
+
+/*
+.geoportal-search.settings .targets {
+  max-height: 500px;
+  overflow-y: auto;
+}
+*/
+
+.geoportal-search.settings .target-setting {
+  margin: 10px;
+  padding: 10px;
+  border: 1px solid #cccccc;
+  border-radius: 5px;
+}
+
+.geoportal-search.settings .form-group {
+  margin: 5px;
+}
+
+.geoportal-search.settings .form-group > .control-label {
+  display: inline-block;
+  width: 70px;
+  text-align: right;
+}
+
+.geoportal-search.settings .form-group .dijitTextBox {
+  width: 300px;
+}
+
+/* ........................................................................ */
diff --git a/geoportal-search/src/main/resources/gs/widget/templates/SearchBox.html b/geoportal-search/src/main/resources/gs/widget/templates/SearchBox.html
index 1959652fb..45cd4acbc 100644
--- a/geoportal-search/src/main/resources/gs/widget/templates/SearchBox.html
+++ b/geoportal-search/src/main/resources/gs/widget/templates/SearchBox.html
@@ -1,11 +1,13 @@
 <div class="search-box">
-	<input type="text" class="search-textbox"
-		placeholder="${i18n.search.searchBox.placeholder}"
-		data-dojo-attach-point="searchTextBox"
-	><button class="btn btn-confirm" type="button"
+	<div class="search-box-container">
+		<input type="text" class="search-textbox"
+			placeholder="${i18n.search.searchBox.placeholder}"
+			data-dojo-attach-point="searchTextBox"/>
+	</div>
+	<button class="btn btn-confirm" type="button"
 		data-dojo-attach-point="searchButton"
 		data-dojo-attach-event="onClick: searchButtonClicked"
 		title="${i18n.search.searchBox.search}"
-		><span class="esri-icon-search"></span>
-	</button>
+	><span class="esri-icon-search"></span>
+</button>
 </div>
diff --git a/geoportal-search/src/main/resources/gs/widget/templates/SearchPane.html b/geoportal-search/src/main/resources/gs/widget/templates/SearchPane.html
index 7e709f21b..3f19be81c 100644
--- a/geoportal-search/src/main/resources/gs/widget/templates/SearchPane.html
+++ b/geoportal-search/src/main/resources/gs/widget/templates/SearchPane.html
@@ -1,5 +1,4 @@
 <div class="geoportal-search search-pane">
-  <!--<h4 style="margin:0;">Geoportal Search</h4>-->
   <div>
     <div class="search-bar main-search-bar">
       <div data-dojo-attach-point="searchBoxNode"></div>
diff --git a/geoportal-search/src/main/resources/platform/gsapp.html b/geoportal-search/src/main/resources/platform/gsapp.html
index 124d89699..cf857684e 100644
--- a/geoportal-search/src/main/resources/platform/gsapp.html
+++ b/geoportal-search/src/main/resources/platform/gsapp.html
@@ -83,8 +83,10 @@
 </script>
 </head>
 <body class="calcite">
-<div style="top:20px;left:20px;">
-  <div id="idSearch" style="display:inline-block;"></div>
+<div style="top:20px;left:20px">
+  <div class="geoportal-search-dev">
+    <div id="idSearch"></div>
+  </div>
   <div id="idMap" style="display:inline-block;width:800px;height:600px;vertical-align: top;"></div>
 </div>
 <script src="https://js.arcgis.com/3.23/"></script>
diff --git a/geoportal-search/src/main/resources/platform/gspro.html b/geoportal-search/src/main/resources/platform/gspro.html
index 504be1a5f..853c8a59b 100644
--- a/geoportal-search/src/main/resources/platform/gspro.html
+++ b/geoportal-search/src/main/resources/platform/gspro.html
@@ -83,10 +83,8 @@
   };
 </script>
 </head>
-<body class="calcite geoportal-search-pro">
-<div style="top:20px;left:20px;">
-  <div id="idSearch" style="display:inline-block;"></div>
-</div>
+<body class="calcite geoportal-search-pro" style="width:100%; height:100%">
+<div id="idSearch"></div>
 <script src="https://js.arcgis.com/3.23/"></script>
 <!--
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>