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 920b3efbe3835759c0b52795eff2f91051d5fba9..cde0a0b273f752da45a035d109d86e5f81e06fc3 100644 (file)
--- 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 d8628f1f040e17134b28582da66e68fc4d2b30b6..7b829a1b6ddc12f794e978301ef9614c0a606b47 100644 (file)
--- 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 aa0f0fbf87bfecc2f70c9870d5be03b1cc52da72..e500233204d49c46a7a99777856564799a4aea96 100644 (file)
--- 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 80bf199e6c3fdce9cac4e15623121d6f5dfc3f87..c5028c90d339f4d163645cbd6871274db7a06fa6 100644 (file)
--- 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),