]> git.openstreetmap.org Git - nominatim-ui.git/blobdiff - dist/search.html
forward search: use tabs to switch between simple and structured
[nominatim-ui.git] / dist / search.html
index f0282d05f5324218d18bf836c3de2d499a7683a9..e8aa46ac2d7aebe50d83b1ec912753ddcacff6d2 100644 (file)
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+  <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
   <title>OpenStreetMap Nominatim</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -9,7 +10,6 @@
 
   <link href="assets/css/leaflet.css" rel="stylesheet" />
   <link href="assets/css/Control.MiniMap.min.css" rel="stylesheet" />
-  <link href="assets/css/bootstrap-theme.min.css" rel="stylesheet" />
   <link href="assets/css/bootstrap.min.css" rel="stylesheet" />
   <link href="assets/css/common.css" rel="stylesheet" />
   <link href="assets/css/search.css" rel="stylesheet" type="text/css" />
@@ -23,7 +23,7 @@
 
   <header class="container-fluid">
     <div class="row">
-      <div class="col-xs-4">
+      <div class="col-4">
         <div class="brand">
           <a href="/">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-xs-4 text-center">
+      <div id="last-updated" class="col-4 text-center">
         Data from <a id="api-request-link" href="">API request</a>
         <br>
         Data last updated:
         <span id="data-date"></span>
       </div>
-      <div class="col-xs-4 text-right">
-        <div class="btn-group">
-          <button class="dropdown-toggle btn btn-sm btn-default" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-            About &amp; Help <span class="caret"></span>
+      <div class="col-4 text-right">
+        <div class="dropdown">
+          <button class="dropdown-toggle btn btn-sm btn-outline-secondary" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+            About &amp; Help
           </button>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="https://nominatim.org/release-docs/develop/api/Overview/" target="_blank">API Reference</a></li>
-            <li><a href="https://nominatim.org/release-docs/develop/api/Faq/" target="_blank">FAQ</a></li>
-            <li><a href="https://help.openstreetmap.org/tags/nominatim/">OpenStreetMap Help</a></li>
-            <li><a href="https://github.com/osm-search/Nominatim">Nominatim on Github</a></li>
-            <li><a href="https://github.com/osm-search/nominatim-ui">This frontend on Github</a></li>
-            <li role="separator" class="divider"></li>
-            <li><a href="#" class="" data-toggle="modal" data-target="#report-modal">Report problem with results</a></li>
-          </ul>
+          <div class="dropdown-menu dropdown-menu-right">
+            <a class="dropdown-item" href="https://nominatim.org/release-docs/develop/api/Overview/" target="_blank">API Reference</a>
+            <a class="dropdown-item" href="https://nominatim.org/release-docs/develop/api/Faq/" target="_blank">FAQ</a>
+            <a class="dropdown-item" href="https://help.openstreetmap.org/tags/nominatim/">OpenStreetMap Help</a>
+            <a class="dropdown-item" href="https://github.com/osm-search/Nominatim">Nominatim on Github</a>
+            <a class="dropdown-item" href="https://github.com/osm-search/nominatim-ui">This frontend on Github</a>
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#report-modal">Report problem with results</a>
+          </div>
         </div>
       </div>
     </div>
@@ -60,8 +60,8 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
           <h4 class="modal-title">Report a problem</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         </div>
         <div class="modal-body">
           <p>
@@ -87,7 +87,7 @@
           </p>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">OK</button>
         </div>
       </div>
     </div>
   </footer>
 
   <script src="assets/js/jquery.min.js"></script>
-  <script src="assets/js/bootstrap.min.js"></script>
+  <script src="assets/js/bootstrap.bundle.min.js"></script>
   <script src="assets/js/leaflet.js"></script>
   <script src="assets/js/Control.MiniMap.min.js"></script>
   <script src="assets/js/handlebars.min.js"></script>
 <script id="searchpage-template" type="text/x-handlebars-template">
 {{#*inline "partial_one_result"}}
   <div class="result" data-position="{{iResNum}}">
-    {{#if aResult.icon}}
-      {{!-- <img src="{{env.Images_Base_Url}}{{aResult.icon}}" /> --}}
-      {{formatMapIcon aResult.icon}}
-    {{/if}}
+    {{formatMapIcon aResult}}
 
     <span class="name">{{aResult.display_name}}</span>
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
-    <a class="btn btn-default btn-xs details"
+    <a class="details btn btn-outline-secondary btn-sm"
        href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}
 
-
-<form class="form-inline" role="search" accept-charset="UTF-8" action="">
-  <div class="form-group">
-    <input id="q"
-           name="q"
-           type="text"
-           class="form-control input-sm"
-           placeholder="Search"
-           value="{{sQuery}}" />
-  </div>
-  <div class="form-group search-button-group">
-    <button type="submit" class="btn btn-primary btn-sm">Search</button>
-    {{#if env.Search_AreaPolygons}}
-      <input type="hidden" value="1" name="polygon_geojson" />
-    {{/if}}
-    <input type="hidden" name="viewbox" value="{{sViewBox}}" />
-    <div class="checkbox-inline">
-      <input type="checkbox"
-             id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
-      <label for="use_viewbox">apply viewbox</label>
+<div class="top-bar">
+  <ul class="nav nav-tabs">
+    <li class="nav-item">
+      <a class="nav-link {{#unless hStructured}}active{{/unless}}" data-toggle="tab" href="#simple">simple</a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {{#if hStructured}}active{{/if}}" data-toggle="tab" href="#structured">structured</a>
+    </li>
+    <div class="search-type-link">
+      <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
     </div>
-  </div>
-  <div class="search-type-link">
-    <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
-  </div>
-</form>
+  </ul>
+  <div class="tab-content p-2">
+    <div class="tab-pane {{#unless hStructured}}active{{/unless}}" id="simple" role="tabpanel">
+      <form class="form-inline" role="search" accept-charset="UTF-8" action="">
+        <input id="q"
+               name="q"
+               type="text"
+               class="form-control form-control-sm"
+               placeholder="Search"
+               value="{{sQuery}}" />
+
+        <div class="form-group search-button-group">
+          <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
+          <input type="hidden" name="viewbox" value="{{sViewBox}}" />
+          <div class="form-check form-check-inline">
+            <input type="checkbox" class="form-check-input"
+                   id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
+            <label class="form-check-label" for="use_viewbox">apply viewbox</label>
+          </div>
+        </div>
+      </form>
+    </div>
+    <div class="tab-pane {{#if hStructured}}active{{/if}}" id="structured" role="tabpanel">
+      <form class="form-inline" role="search" accept-charset="UTF-8" action="">
+        <input name="street" type="text" class="form-control form-control-sm mr-1"
+               placeholder="House number/Street"
+               value="{{hStructured.street}}" />
+        <input name="city" type="text" class="form-control form-control-sm mr-1"
+               placeholder="City"
+               value="{{hStructured.city}}" />
+        <input id="county" name="county" type="text" class="form-control form-control-sm mr-1"
+               placeholder="County"
+               value="{{hStructured.county}}" />
+        <input name="state" type="text" class="form-control form-control-sm mr-1"
+               placeholder="State"
+               value="{{hStructured.state}}" />
+        <input name="country" type="text" class="form-control form-control-sm mr-1"
+               placeholder="Country"
+               value="{{hStructured.country}}" />
+        <input name="postalcode" type="text" class="form-control form-control-sm mr-1"
+               placeholder="Postal Code"
+               value="{{hStructured.postalcode}}" />
+
+        <div class="form-group search-button-group">
+          <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
+          <input type="hidden" name="viewbox" value="{{sViewBox}}" />
+          <div class="form-check form-check-inline">
+            <input type="checkbox" class="form-check-input"
+                   id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
+            <label class="form-check-label" for="use_viewbox">apply viewbox</label>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div> <!-- /tab-content -->
+</div> <!-- /top-bar -->
 
 <div id="content">