From 981046b67d73772a3bd2185aefaf73a3247c78bb Mon Sep 17 00:00:00 2001 From: Rico Hoppe Date: Sun, 3 Mar 2024 10:48:29 +0000 Subject: [PATCH] location: removed /projects from the path, updated all links Signed-off-by: Rico Hoppe --- src/templates/base.html | 12 ++++++------ src/templates/location/base.html | 2 +- src/templates/location/download.html | 7 +------ src/templates/location/how-to-use.html | 7 +------ src/templates/location/index.html | 9 ++------- src/templates/location/lookup.html | 7 +------ src/templates/static/sitemap.html | 2 +- src/web/__init__.py | 8 ++++---- 8 files changed, 17 insertions(+), 37 deletions(-) diff --git a/src/templates/base.html b/src/templates/base.html index 85eafc55..ae4d64b8 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -26,7 +26,7 @@
- {% 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") %} + {% if request.path == "/location/how-to-use" %}is-active{% end %}" + href="/location/how-to-use"> {{ _("How To Use") }} + {% if request.path.startswith("/location/download") %}is-active{% end %}" + href="/location/download"> {{ _("Download") }} diff --git a/src/templates/location/base.html b/src/templates/location/base.html index 030954f3..28aacebf 100644 --- a/src/templates/location/base.html +++ b/src/templates/location/base.html @@ -2,7 +2,7 @@ {% block content %}

- {{ address }} + {{ address }}

diff --git a/src/templates/location/download.html b/src/templates/location/download.html index f826d25a..14f2f3af 100644 --- a/src/templates/location/download.html +++ b/src/templates/location/download.html @@ -14,12 +14,7 @@
  • - - {{ _("Projects") }} - -
    • -
  • - + {{ _("Location") }}
    • diff --git a/src/templates/location/how-to-use.html b/src/templates/location/how-to-use.html index ddc75bee..72d74411 100644 --- a/src/templates/location/how-to-use.html +++ b/src/templates/location/how-to-use.html @@ -14,12 +14,7 @@
  • - - {{ _("Projects") }} - -
    • -
  • - + {{ _("Location") }}
    • diff --git a/src/templates/location/index.html b/src/templates/location/index.html index 6b62671f..870a5f3b 100644 --- a/src/templates/location/index.html +++ b/src/templates/location/index.html @@ -17,11 +17,6 @@ {{ _("Home") }} -
  • - - {{ _("Projects") }} - -
  • {{ _("Location") }}
    • @@ -41,7 +36,7 @@

    {{ _("We have detected you visiting us from %s.") % format_country_name(address.country_code) }} - {{ _("Learn More") }} + {{ _("Learn More") }}

    @@ -75,7 +70,7 @@
    - + {{ _("How To Use") }} diff --git a/src/templates/location/lookup.html b/src/templates/location/lookup.html index 27d64b94..41830a53 100644 --- a/src/templates/location/lookup.html +++ b/src/templates/location/lookup.html @@ -14,12 +14,7 @@
  • - - {{ _("Projects") }} - -
    • -
  • - + {{ _("Location") }}
    • diff --git a/src/templates/static/sitemap.html b/src/templates/static/sitemap.html index a34e1da0..aced3256 100644 --- a/src/templates/static/sitemap.html +++ b/src/templates/static/sitemap.html @@ -13,7 +13,7 @@

    Geo Location Database

    - + {{ _("IPFire Location") }}

    diff --git a/src/web/__init__.py b/src/web/__init__.py index 52aab699..f34098fc 100644 --- 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), -- 2.47.2