X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/a1341470605cbb37b0de359db233562250ebc723..f695e7586420364987aaae322cbb95ce0db15ab5:/dist/search.html

diff --git a/dist/search.html b/dist/search.html
index 8decc7a..b3e2b03 100644
--- a/dist/search.html
+++ b/dist/search.html
@@ -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"/>
@@ -31,25 +31,26 @@
           </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/openstreetmap/Nominatim">Nominatim 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>
@@ -59,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>
@@ -72,7 +73,7 @@
             to check how the address was generated before reporting a problem.
           </p>
           <p>
-            Use <a target="_blank" href="https://github.com/openstreetmap/Nominatim/issues">Nominatim issues on github</a>
+            Use <a target="_blank" href="https://github.com/osm-search/Nominatim/issues">Nominatim issues on github</a>
             to report problems.
           </p>
           <p>
@@ -86,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>
@@ -105,7 +106,7 @@
   </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>
@@ -118,39 +119,77 @@
 <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" href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <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>
-  </div>
+<div class="top-bar" id="structured-query-selector">
   <div class="search-type-link">
     <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
   </div>
-</form>
+  <div class="form-check form-check-inline">
+    <input class="form-check-input" type="radio" name="query-selector"
+           id="simple" value="simple" {{#unless hStructured}}checked="checked"{{/unless}}>
+    <label class="form-check-label" for="simple">simple</label>
+  </div>
+  <div class="form-check form-check-inline">
+    <input class="form-check-input" type="radio" name="query-selector"
+            id="structured" value="structured" {{#if hStructured}}checked="checked"{{/if}}>
+    <label class="form-check-label" for="structured">structured</label>
+  </div>
+
+  <form class="form-inline" role="search" accept-charset="UTF-8" action="">
+    <div class="form-group-simple {{#if hStructured}}hidden{{/if}}">
+      <input id="q"
+             name="q"
+             type="text"
+             class="form-control form-control-sm"
+             placeholder="Search"
+             value="{{sQuery}}" />
+    </div>
+    <div class="form-group-structured {{#unless hStructured}}hidden{{/unless}}">
+      <div class="form-inline">
+        <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>
+    </div>
+    <div class="form-group search-button-group">
+            <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
+      {{#if env.Search_AreaPolygons}}
+        <input type="hidden" value="1" name="polygon_geojson" />
+      {{/if}}
+      <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 id="content">
 
@@ -163,7 +202,9 @@
       {{#if aSearchResults}}
         {{#if sMoreURL}}
           <div class="more">
-            <a class="btn btn-primary" href="{{sMoreURL}}">Search for more results</a>
+            <a class="btn btn-primary" href="{{sMoreURL}}">
+              Search for more results
+            </a>
           </div>
         {{/if}}
       {{else}}
@@ -176,13 +217,18 @@
     <div id="intro" class="sidebar">
       <h2>Welcome to Nominatim</h2>
 
-      <p>Nominatim is a search engine for <a href="https://www.openstreetmap.org">OpenStreetMap</a>
-      data. This is the debugging interface. You may search for a name or address(forward search) or
-      look up data by its geographic coordinate(reverse search). Each result comes with a
-      link to a details page where you can inspect what data about the object is saved in 
-      the database and investigate how the address of the object has been computed.</p>
-
-      For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.
+      <p>
+        Nominatim is a search engine for
+        <a href="https://www.openstreetmap.org">OpenStreetMap</a> data. This
+        is the debugging interface. You may search for a name or address
+        (forward search) or look up data by its geographic coordinate (reverse
+        search). Each result comes with a link to a details page where you
+        can inspect what data about the object is saved in the database and
+        investigate how the address of the object has been computed.
+      </p>
+
+      For more information visit the
+      <a href="https://nominatim.org">Nominatim home page</a>.
     </div>
 
   {{/if}}
