detailspage: children, hierarchy link didnt update after new data loaded (#100)

[nominatim-ui.git] / src / components / Header.svelte

diff --git a/src/components/Header.svelte b/src/components/Header.svelte
index 5000cd67cd71e6724a7033b84528835dccabcd44..9fef1f9615690ddd996eac4e7f9a562d2d573581 100644 (file)
--- a/src/components/Header.svelte
+++ b/src/components/Header.svelte
@@ -1,68 +1,95 @@
 <script>
 <script>

-  import LastUpdated from './LastUpdated.svelte';

   import PageLink from './PageLink.svelte';
   import PageLink from './PageLink.svelte';

-</script>
+  import ReverseLink from './ReverseLink.svelte';
+  import LastUpdated from './LastUpdated.svelte';
+  import Error from './Error.svelte';

 
 

-<style>
-  header {
-    width: 100%;
-    padding: 5px 15px;
-    z-index: 5;
-  }
+  import { page } from '../lib/stores.js';

 
 

-  .brand {
-    white-space: nowrap;
-  }
+  $: view = $page.tab;
+  $: page_title = Nominatim_Config.Page_Title;
+</script>

 
 

-  .brand :global(a:hover) {
+<style>
+  .navbar-brand :global(a:hover) {

     text-decoration: none;
   }
 
     text-decoration: none;
   }
 

-  .brand h1 {
+  .navbar-brand h1 {

     display: inline;
     display: inline;

-    font-size: 1.5em;
+    font-size: 1.2em;

     color: #333;
   }
 
     color: #333;
   }
 

-  .brand img {
+  .navbar-brand img {

     display: inline-block;
     margin-right: 5px;
     margin-top: -5px;
   }
 
     display: inline-block;
     margin-right: 5px;
     margin-top: -5px;
   }
 

-  .dropdown-menu {
-    z-index: 1005;
+  .nav-item {
+    white-space: nowrap;
+  }
+
+  .page-title-section {
+    display: none;
+    text-align: center;
+    padding: 1em;
+  }
+  @media (max-width: 600px) {
+    .page-title-section {
+      display: block;
+    }
+  }
+
+  .search-section {
+    padding: 1em 30px;
+    background-color: #f5f5f5;
+    border-top: 2px solid #ddd;
+    border-bottom: 2px solid #ddd;

   }
 </style>
 
 <header class="container-fluid">
   }
 </style>
 
 <header class="container-fluid">

-  <div class="row">
-    <div class="col-4">
-      <div class="brand">
-        <PageLink page="search">
-          <img alt="logo" src="images/osm_logo.120px.png" width="30" height="30"/>
-          <h1>Nominatim</h1>
-        </PageLink>
-      </div>
-    </div>
-    <div class="col-4">
-      <LastUpdated/>
+  <nav class="navbar navbar-expand-sm navbar-light">
+    <!-- Brand -->
+    <div class="navbar-brand">
+      <PageLink page="search">
+        <img alt="logo" id="theme-logo" src="theme/logo.png" />
+        <h1>{page_title}</h1>
+      </PageLink>

     </div>
     </div>

-    <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>
-        <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="#report-issue" data-toggle="modal" data-target="#report-modal">Report problem with results</a>
-        </div>
-      </div>
+    <!-- Toggler (hamburger button) -->
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <!-- Left-aligned links -->
+      <ul class="navbar-nav mr-auto">
+        <li class="nav-item {view === 'search' ? 'active' : ''}">
+          <PageLink page="search" extra_classes="nav-link">Search</PageLink>
+        </li>
+        <li class="nav-item {view === 'reverse' ? 'active' : ''}">
+          <ReverseLink extra_classes="nav-link ">Reverse</ReverseLink>
+        </li>
+        <li class="nav-item {view === 'details' ? 'active' : ''}">
+          <PageLink page="details" extra_classes="nav-link">Search By ID</PageLink>
+        </li>
+      </ul>

     </div>
     </div>

-  </div>
+    <!-- Right aligned links -->
+    <ul class="navbar-nav">
+      <li class="nav-item {view === 'about' ? 'active' : ''}">
+        <PageLink page="about" extra_classes="nav-link">About & Help</PageLink>
+      </li>
+    </ul>
+  </nav>

 </header>
 </header>

+<section class="page-title-section">
+  <h2>{view}</h2>
+</section>
+<section class="search-section">
+  <slot/>
+</section>
+<Error/>
+<LastUpdated/>