X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/53666d8f38225ad4000b92096a1eac7f38323b76..0fda15db882f5e4019fd6ec8ae59b6fefd907104:/dist/details.html?ds=sidebyside

diff --git a/dist/details.html b/dist/details.html
index 8aa00cd..3d0c57e 100644
--- a/dist/details.html
+++ b/dist/details.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,7 +119,7 @@
 <script id="detailspage-template" type="text/x-handlebars-template">
 
 {{#*inline "partial_details_one_row"}}
-  <tr class="{{isaddresses_unused this}}">
+  <tr class="{{#unless this.isaddress}}notused{{/unless}}">
     <td class="name">
       {{#if this.localname}}
         {{this.localname}}
@@ -126,7 +127,7 @@
         <span class="noname">No Name</span>
       {{/if}}
     </td>
-    <td>{{this.class}}:{{this.type}}</td>
+    <td>{{formatPlaceType this}}</td>
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
@@ -156,10 +157,13 @@
 <div class="container">
   <div class="row">
     <div class="col-sm-10">
-      <h1>{{aPlace.localname}} <small>{{detailsPermaLink aPlace 'link to this page'}}</small></h1>
+      <h1>
+        {{aPlace.localname}}
+        <small>{{detailsPermaLink aPlace 'link to this page'}}</small>
+      </h1>
     </div>
     <div class="col-sm-2 text-right">
-      {{formatMapIcon aPlace.icon}}
+      {{formatMapIcon aPlace}}
     </div>
   </div>
   <div class="row">
@@ -169,7 +173,9 @@
           <td>Name</td>
           <td>
             {{#each aPlace.names}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
@@ -204,14 +210,19 @@
         </tr>
         <tr>
           <td>Centre Point (lat,lon)</td>
-          <td>{{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}</td>
+          <td>
+            {{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}
+          </td>
         </tr>
         <tr>
           <td>OSM</td>
           <td>{{osmLink aPlace}}
         </tr>
         <tr>
-          <td>Place Id (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)</td>
+          <td>
+            Place Id
+            (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)
+          </td>
           <td>{{aPlace.place_id}}</td>
         </tr>
         {{#if aPlace.calculated_wikipedia}}
@@ -228,7 +239,9 @@
           <td>Address Tags</td>
           <td>
             {{#each aPlace.addresstags}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
@@ -236,7 +249,9 @@
           <td>Extra Tags</td>
           <td>
             {{#each aPlace.extratags}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
@@ -249,7 +264,7 @@
   <div class="row">
     <div class="col-md-12">
       <h2>Address</h2>
-       <table id="address" class="table table-striped table-responsive">
+       <table id="address" class="table table-striped table-small">
         <thead>
           <tr>
             <th>Local name</th>
@@ -299,7 +314,8 @@
           {{else}}
             <tr>
               <td>
-                <a class="btn btn-default btn-xs" href="{{base_url}}&hierarchy=1">display child places</a>
+                <a class="btn btn-outline-secondary btn-sm"
+                  href="{{base_url}}&hierarchy=1">display child places</a>
               </td>
             </tr>
           {{/if}}
@@ -322,16 +338,27 @@
         <h4>Search by place id</h4>
 
         <form class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern="^[0-9]+$" name="place_id" placeholder="12345" />
-          <input type="submit" class="btn btn-primary btn-sm" value="Show" />
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern="^[0-9]+$"
+                 name="place_id"
+                 placeholder="12345" />
+          <input type="submit"
+                 class="btn btn-primary btn-sm"
+                 value="Show" />
         </form>
       </div>
 
       <div class="search-form">
         <h4>Search by OSM type and OSM id</h4>
 
-        <form id="form-by-type-and-id" class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern="^[NWR][0-9]+$" placeholder="N123 or W123 or R123" />
+        <form id="form-by-type-and-id"
+              class="form-inline"
+              action="details.html">
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern="^[NWR][0-9]+$"
+                 placeholder="N123 or W123 or R123" />
           <input type="hidden" name="osmtype" />
           <input type="hidden" name="osmid" />
           <input type="submit" class="btn btn-primary btn-sm" value="Show" />
@@ -341,8 +368,13 @@
       <div class="search-form">
         <h4>Search by openstreetmap.org URL</h4>
 
-        <form id="form-by-osm-url" class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern=".*openstreetmap.*" placeholder="https://www.openstreetmap.org/relation/123" />
+        <form id="form-by-osm-url"
+              class="form-inline"
+              action="details.html">
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern=".*openstreetmap.*"
+                 placeholder="https://www.openstreetmap.org/relation/123" />
           <input type="hidden" name="osmtype" />
           <input type="hidden" name="osmid" />
           <input type="submit" class="btn btn-primary btn-sm" value="Show" />
