From 4cef4fd8107653656e83662f71c4cdaeb94708ab Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Sun, 12 Jul 2020 17:42:38 +0200
Subject: [PATCH] fix URL links when serving app from a subdirectory

---
 dist/assets/js/nominatim-ui.js | 4 +++-
 dist/deletable.html            | 4 ++--
 dist/details.html              | 4 ++--
 dist/polygons.html             | 4 ++--
 dist/reverse.html              | 4 ++--
 dist/search.html               | 4 ++--
 src/assets/js/controller.js    | 4 +++-
 src/layout.html                | 2 +-
 src/templates/reversepage.hbs  | 2 +-
 9 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index c3ffd1b..43f71c2 100644
--- 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 11a824d..e323dcc 100644
--- 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 11a824d..e323dcc 100644
--- 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 11a824d..e323dcc 100644
--- 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 11a824d..e323dcc 100644
--- 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 11a824d..e323dcc 100644
--- 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 2babae4..4196151 100644
--- 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 836eddc..81c613a 100644
--- 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 ba80e74..e5a9d68 100644
--- 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>
-- 
2.39.5