From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 31 Mar 2024 19:27:49 +0000 (+0000)
Subject: location: Move "How To Use?" page into a subdirectory
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78eb671f2bfd782d23b9f12ed72b55a68350bf75;p=ipfire.org.git

location: Move "How To Use?" page into a subdirectory

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

diff --git a/Makefile.am b/Makefile.am
index 920b3efb..cde0a0b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -262,13 +262,17 @@ templates_fireinfo_modules_DATA = \
 templates_fireinfo_modulesdir = $(templates_fireinfodir)/modules
 
 templates_location_DATA = \
-	src/templates/location/how-to-use.html \
 	src/templates/location/index.html \
 	src/templates/location/install.html \
 	src/templates/location/lookup.html
 
 templates_locationdir = $(templatesdir)/location
 
+templates_location_how_to_use_DATA = \
+	src/templates/location/how-to-use/index.html
+
+templates_location_how_to_usedir = $(templates_locationdir)/how-to-use
+
 templates_lists_DATA = \
 	src/templates/lists/index.html
 
diff --git a/src/templates/base.html b/src/templates/base.html
index d8628f1f..7b829a1b 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -92,7 +92,7 @@
 								{# Location #}
 								{% if request.path.startswith("/location") %}
 									<a class="navbar-item is-tab
-											{% if request.path == "/location/how-to-use" %}is-active{% end %}"
+											{% if request.path.startswith("/location/how-to-use") %}is-active{% end %}"
 											href="/location/how-to-use">
 										{{ _("How To Use?") }}
 									</a>
diff --git a/src/templates/location/how-to-use.html b/src/templates/location/how-to-use/index.html
similarity index 99%
rename from src/templates/location/how-to-use.html
rename to src/templates/location/how-to-use/index.html
index aa0f0fbf..e5002332 100644
--- a/src/templates/location/how-to-use.html
+++ b/src/templates/location/how-to-use/index.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block title %}{{ _("How To Use?") }}{% end block %}
 
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 80bf199e..c5028c90 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -197,7 +197,7 @@ class Application(tornado.web.Application):
 			# Location
 			(r"/location/?", location.IndexHandler),
 			(r"/location/download", tornado.web.RedirectHandler, { "url" : "/location/install" }),
-			(r"/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use.html" }),
+			(r"/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use/index.html" }),
 			(r"/location/install", StaticHandler, { "template" : "location/install.html" }),
 			(r"/location/lookup/(.+)", location.LookupHandler),