X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/68fd6dfad262e322f44815c835fdcf63b77ab639..93117a14df2d0aee9109d51edd7d6dad834d8ec4:/dist/searchpage.hbs

diff --git a/dist/searchpage.hbs b/dist/searchpage.hbs
index d1d70ae..7451398 100644
--- a/dist/searchpage.hbs
+++ b/dist/searchpage.hbs
@@ -1,15 +1,12 @@
 {{#*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}}
@@ -18,52 +15,55 @@
   <div class="search-type-link">
     <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
   </div>
-  <div class="radio-inline"><input type="radio" name="query-selector" id="simple" value="simple" {{#unless hStructured}}checked="checked"{{/unless}}>
-  <label for="simple">simple</label></div>
-  <div class="radio-inline"><input type="radio" name="query-selector" id="structured" value="structured" {{#if hStructured}}checked="checked"{{/if}}>
-  <label for="structured">structured</label></div>
+  <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 input-sm"
+             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 input-sm"
+        <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 input-sm"
+        <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 input-sm"
+        <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 input-sm"
+        <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 input-sm"
+        <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 input-sm"
+        <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">Search</button>
-      {{#if env.Search_AreaPolygons}}
-        <input type="hidden" value="1" name="polygon_geojson" />
-      {{/if}}
+            <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
-      <div class="checkbox-inline">
-        <input type="checkbox"
+      <div class="form-check form-check-inline">
+        <input type="checkbox" class="form-check-input"
                id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
-        <label for="use_viewbox">apply viewbox</label>
+        <label class="form-check-label" for="use_viewbox">apply viewbox</label>
       </div>
     </div>
   </form>