Merge pull request #8 from mtmail/bootstrap-v4

[nominatim-ui.git] / dist / search.html

diff --git a/dist/search.html b/dist/search.html
index b84e93c914ffb134005f84eb4d7b2caaa9ca836f..f79b63befb23f59cd9b62bb2c1c2c19e8141cf95 100644 (file)
--- a/dist/search.html
+++ b/dist/search.html
@@ -9,7 +9,6 @@
 
   <link href="assets/css/leaflet.css" rel="stylesheet" />
   <link href="assets/css/Control.MiniMap.min.css" rel="stylesheet" />
 
   <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" />
   <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 +22,7 @@
 
   <header class="container-fluid">
     <div class="row">
 
   <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"/>
         <div class="brand">
           <a href="/">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>


@@ -31,26 +30,26 @@
           </a>
         </div>
       </div>
           </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>
         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>
           </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>
         </div>
       </div>
     </div>


@@ -60,8 +59,8 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
     <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>
           <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>
         </div>
         <div class="modal-body">
           <p>


@@ -87,7 +86,7 @@
           </p>
         </div>
         <div class="modal-footer">
           </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>
         </div>
       </div>
     </div>


@@ -106,7 +105,7 @@
   </footer>
 
   <script src="assets/js/jquery.min.js"></script>
   </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 src="assets/js/leaflet.js"></script>
   <script src="assets/js/Control.MiniMap.min.js"></script>
   <script src="assets/js/handlebars.min.js"></script>


@@ -128,7 +127,7 @@
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
     <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}}
        href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}


@@ -137,52 +136,58 @@
   <div class="search-type-link">
     <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
   </div>
   <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"
 
   <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">
              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}}" />
                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}}" />
                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}}" />
                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}}" />
                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}}" />
                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">
                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>
+            <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}}" />
       {{#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"
+      <div class="form-check form-check-inline">
+        <input type="checkbox" class="form-check-input"

                id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
                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>
       </div>
     </div>
   </form>