location: Fix links

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/location/base.html b/src/templates/location/base.html
index 030954f31aec556d70cee8536bdcd894ce364a7e..28aacebfe77f784704a5198e3aeb65f108928bda 100644 (file)
--- a/src/templates/location/base.html
+++ b/src/templates/location/base.html
@@ -2,7 +2,7 @@
 
 {% block content %}
        <h1 class="text-center my-5">
-               <a class="text-white" href="/projects/location/lookup/{{ address }}">{{ address }}</a>
+               <a class="text-white" href="/location/lookup/{{ address }}">{{ address }}</a>
        </h1>
 
        <section>

diff --git a/src/templates/location/download.html b/src/templates/location/download.html
index f826d25add5071303a1a414fb921e31fde2c7946..14f2f3af9c1fc31c169ea0a5dabfac0c65733098 100644 (file)
--- a/src/templates/location/download.html
+++ b/src/templates/location/download.html
@@ -14,12 +14,7 @@
                                                        </a>
                                                </li>
                                                <li>
-                                                       <a href="#">
-                                                               {{ _("Projects") }}
-                                                       </a>
-                                               </li>
-                                               <li>
-                                                       <a href="/projects/location">
+                                                       <a href="/location">
                                                                {{ _("Location") }}
                                                        </a>
                                                </li>

diff --git a/src/templates/location/how-to-use.html b/src/templates/location/how-to-use.html
index ddc75beeb9791338ccc20dbfc64a47435694c340..72d7441135e6ec9e8e8f09755b9921fca44b3c14 100644 (file)
--- a/src/templates/location/how-to-use.html
+++ b/src/templates/location/how-to-use.html
@@ -14,12 +14,7 @@
                                                        </a>
                                                </li>
                                                <li>
-                                                       <a href="#">
-                                                               {{ _("Projects") }}
-                                                       </a>
-                                               </li>
-                                               <li>
-                                                       <a href="/projects/location">
+                                                       <a href="/location">
                                                                {{ _("Location") }}
                                                        </a>
                                                </li>

diff --git a/src/templates/location/index.html b/src/templates/location/index.html
index 6b62671f8d6773e7a244d081dfe60c6d6add0dc6..e154c8f405fe03f07153079fa035611d6e534412 100644 (file)
--- a/src/templates/location/index.html
+++ b/src/templates/location/index.html
@@ -17,11 +17,6 @@
                                                                {{ _("Home") }}
                                                        </a>
                                                </li>
-                                               <li>
-                                                       <a href="#">
-                                                               {{ _("Projects") }}
-                                                       </a>
-                                               </li>
                                                <li class="is-active">
                                                        <a href="#" aria-current="page">{{ _("Location") }}</a>
                                                </li>
@@ -41,7 +36,7 @@
                        <div class="container">
                                <p class="has-text-centered px-2 py-1">
                                        {{ _("We have detected you visiting us from %s.") % format_country_name(address.country_code) }}
-                                       <a href="/projects/location/lookup/{{ address }}">{{ _("Learn More") }}</a>
+                                       <a href="/location/lookup/{{ address }}">{{ _("Learn More") }}</a>
                                </p>
                        </div>
                </section>
@@ -75,7 +70,7 @@
                        </div>
 
                        <div class="buttons">
-                               <a class="button is-light" href="/projects/location/how-to-use">
+                               <a class="button is-light" href="/location/how-to-use">
                                        {{ _("How To Use") }}
                                </a>
 
@@ -168,7 +163,7 @@
 
                                <div class="level">
                                        <div class="level-item">
-                                               <a href="https://www.ipfire.org/" rel="noopener">
+                                               <a href="/" rel="noopener">
                                                        <figure class="image is-128x128">
                                                                <img src="{{ static_url("img/ipfire-tux.png") }}" alt="{{ _("IPFire") }}">
                                                        </figure>

diff --git a/src/templates/location/lookup.html b/src/templates/location/lookup.html
index 27d64b9463f6703f9c233ac3a6e4973b3ac3fed2..41830a530d4b40ad53c82c01874bf4a599001390 100644 (file)
--- a/src/templates/location/lookup.html
+++ b/src/templates/location/lookup.html
@@ -14,12 +14,7 @@
                                                        </a>
                                                </li>
                                                <li>
-                                                       <a href="#">
-                                                               {{ _("Projects") }}
-                                                       </a>
-                                               </li>
-                                               <li>
-                                                       <a href="/projects/location">
+                                                       <a href="/location">
                                                                {{ _("Location") }}
                                                        </a>
                                                </li>