fix URL links when serving app from a subdirectory

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index c3ffd1bed2b9c2114763d2f39de2471097839ce1..43f71c217da193df43c431144017d466bf5ed1af 100644 (file)
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -757,7 +757,9 @@ jQuery(document).ready(function () {
 
   function parse_url_and_load_page() {
     // 'search', 'reverse', 'details'
-    var pagename = window.location.pathname.replace('.html', '').replace(/^\//, '');
+    var pagename = window.location.pathname.replace('.html', '').replace(/.+\//, '');
+
+    if (pagename === '') pagename = 'search'
 
     $('body').attr('id', pagename + '-page');
 

diff --git a/dist/deletable.html b/dist/deletable.html
index 11a824dd35ed88285e467d387d6ef5a53dd7cd9e..e323dcc10ec647e794612b338610034d006090d3 100644 (file)
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -23,7 +23,7 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
-          <a href="/">
+          <a href="search.html">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
@@ -289,7 +289,7 @@
       </button>
     </div>
     <div class="search-type-link">
-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>
     </div>
   </form>
 </div>

diff --git a/dist/details.html b/dist/details.html
index 11a824dd35ed88285e467d387d6ef5a53dd7cd9e..e323dcc10ec647e794612b338610034d006090d3 100644 (file)
--- a/dist/details.html
+++ b/dist/details.html
@@ -23,7 +23,7 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
-          <a href="/">
+          <a href="search.html">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
@@ -289,7 +289,7 @@
       </button>
     </div>
     <div class="search-type-link">
-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>
     </div>
   </form>
 </div>

diff --git a/dist/polygons.html b/dist/polygons.html
index 11a824dd35ed88285e467d387d6ef5a53dd7cd9e..e323dcc10ec647e794612b338610034d006090d3 100644 (file)
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -23,7 +23,7 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
-          <a href="/">
+          <a href="search.html">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
@@ -289,7 +289,7 @@
       </button>
     </div>
     <div class="search-type-link">
-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>
     </div>
   </form>
 </div>

diff --git a/dist/reverse.html b/dist/reverse.html
index 11a824dd35ed88285e467d387d6ef5a53dd7cd9e..e323dcc10ec647e794612b338610034d006090d3 100644 (file)
--- a/dist/reverse.html
+++ b/dist/reverse.html
@@ -23,7 +23,7 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
-          <a href="/">
+          <a href="search.html">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
@@ -289,7 +289,7 @@
       </button>
     </div>
     <div class="search-type-link">
-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>
     </div>
   </form>
 </div>

diff --git a/dist/search.html b/dist/search.html
index 11a824dd35ed88285e467d387d6ef5a53dd7cd9e..e323dcc10ec647e794612b338610034d006090d3 100644 (file)
--- a/dist/search.html
+++ b/dist/search.html
@@ -23,7 +23,7 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
-          <a href="/">
+          <a href="search.html">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
@@ -289,7 +289,7 @@
       </button>
     </div>
     <div class="search-type-link">
-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>
     </div>
   </form>
 </div>

diff --git a/src/assets/js/controller.js b/src/assets/js/controller.js
index 2babae46fbd6f533e2b33475d58e5869e914c785..4196151180f0d196b0bfceaca1daf6864558b92e 100644 (file)
--- a/src/assets/js/controller.js
+++ b/src/assets/js/controller.js
@@ -3,7 +3,9 @@ jQuery(document).ready(function () {
 
   function parse_url_and_load_page() {
     // 'search', 'reverse', 'details'
-    var pagename = window.location.pathname.replace('.html', '').replace(/^\//, '');
+    var pagename = window.location.pathname.replace('.html', '').replace(/.+\//, '');
+
+    if (pagename === '') pagename = 'search'
 
     $('body').attr('id', pagename + '-page');
 

diff --git a/src/layout.html b/src/layout.html
index 836eddc608ea6689f77f2aeabb1e72f5cfbd3ade..81c613a35de6b9bda48d65b0006720d9e4dce522 100644 (file)
--- a/src/layout.html
+++ b/src/layout.html
@@ -23,7 +23,7 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
-          <a href="/">
+          <a href="search.html">
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>

diff --git a/src/templates/reversepage.hbs b/src/templates/reversepage.hbs
index ba80e7445c7dcf104af05e6a9c812fd8a0a39a7a..e5a9d683a5391aff494631d6168de02a4d22ee8c 100644 (file)
--- a/src/templates/reversepage.hbs
+++ b/src/templates/reversepage.hbs
@@ -38,7 +38,7 @@
       </button>
     </div>
     <div class="search-type-link">
-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>
     </div>
   </form>
 </div>