location: removed /projects from the path, updated all links

Signed-off-by: Rico Hoppe <rico.hoppe@ipfire.org>

diff --git a/src/templates/base.html b/src/templates/base.html
index 85eafc553f63b32ec62bb6af7a3c067d368136d5..ae4d64b8460ccabdaaf613d9dac8dd19c1373a84 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -26,7 +26,7 @@
                                <div class="navbar-brand">
                                        <a class="navbar-item is-size-4" href="/">
                                                <strong>
-                                                       {% if request.path.startswith("/projects/location") %}
+                                                       {% if request.path.startswith("/location") %}
                                                                {% module IPFireLogo("Location") %}
                                                        {% elif hostname.startswith("fireinfo.") %}
                                                                {% module IPFireLogo("Fireinfo") %}
@@ -90,16 +90,16 @@
                                                                {% end %}
 
                                                                {# Location #}
-                                                               {% if request.path.startswith("/projects/location") %}
+                                                               {% if request.path.startswith("/location") %}
                                                                        <a class="navbar-item is-tab
-                                                                                       {% if request.path == "/projects/location/how-to-use" %}is-active{% end %}"
-                                                                                       href="/projects/location/how-to-use">
+                                                                                       {% if request.path == "/location/how-to-use" %}is-active{% end %}"
+                                                                                       href="/location/how-to-use">
                                                                                {{ _("How To Use") }}
                                                                        </a>
 
                                                                        <a class="navbar-item is-tab
-                                                                                       {% if request.path.startswith("/projects/location/download") %}is-active{% end %}"
-                                                                                       href="/projects/location/download">
+                                                                                       {% if request.path.startswith("/location/download") %}is-active{% end %}"
+                                                                                       href="/location/download">
                                                                                {{ _("Download") }}
                                                                        </a>
 

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..870a5f3bbd8bb357b8bd7c4430a2ae27a4cca3ec 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>
 

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>

diff --git a/src/templates/static/sitemap.html b/src/templates/static/sitemap.html
index a34e1da030c028bbeafda09322f8901df3b195e7..aced32563b0a590068e85ca4aa73ade1b938ab40 100644 (file)
--- a/src/templates/static/sitemap.html
+++ b/src/templates/static/sitemap.html
@@ -13,7 +13,7 @@
                                                <div>
                                                        <p class="heading">Geo Location Database</p>
                                                        <p class="title">
-                                                               <a href="/projects/location">
+                                                               <a href="/location">
                                                                        {{ _("IPFire Location") }}
                                                                </a>
                                                        </p>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 52aab69947cb3c1c32129c61b7aeaafbaecfb55f..f34098fc69bd12c86ee5746c08377c91c7a882d9 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -184,10 +184,10 @@ class Application(tornado.web.Application):
                        (r"/.well-known/change-password", auth.WellKnownChangePasswordHandler),
 
                        # Projects
-                       (r"/projects/location/?", location.IndexHandler),
-                       (r"/projects/location/download", StaticHandler, { "template" : "location/download.html" }),
-                       (r"/projects/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use.html" }),
-                       (r"/projects/location/lookup/(.+)", location.LookupHandler),
+                       (r"/location/?", location.IndexHandler),
+                       (r"/location/download", StaticHandler, { "template" : "location/download.html" }),
+                       (r"/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use.html" }),
+                       (r"/location/lookup/(.+)", location.LookupHandler),
 
                        # Single-Sign-On for Discourse
                        (r"/sso/discourse", auth.SSODiscourse),