location: Rename Download to Install

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

diff --git a/Makefile.am b/Makefile.am
index c29a13eb51a125af47f9ede6a2d557671b67806e..920b3efbe3835759c0b52795eff2f91051d5fba9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -262,9 +262,9 @@ templates_fireinfo_modules_DATA = \
 templates_fireinfo_modulesdir = $(templates_fireinfodir)/modules
 
 templates_location_DATA = \
-       src/templates/location/download.html \
        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

diff --git a/src/templates/base.html b/src/templates/base.html
index 09061b4d1243d0f153cde00b94a21ac4b882a19e..28cd6c902b9ce8175c5d092777fc3d82fb85b919 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -98,9 +98,9 @@
                                                                        </a>
 
                                                                        <a class="navbar-item is-tab
-                                                                                       {% if request.path.startswith("/location/download") %}is-active{% end %}"
-                                                                                       href="/location/download">
-                                                                               {{ _("Download") }}
+                                                                                       {% if request.path == "/location/install" %}is-active{% end %}"
+                                                                                       href="/location/install">
+                                                                               {{ _("Install") }}
                                                                        </a>
 
                                                                {# Main #}

diff --git a/src/templates/location/download.html b/src/templates/location/install.html
similarity index 87%
rename from src/templates/location/download.html
rename to src/templates/location/install.html
index d5c5273780e7ff548ea89e04b74e40b98e5b8a76..5324179546b7a7889c9552a1089fd0c5ee8a75c5 100644 (file)
--- a/src/templates/location/download.html
+++ b/src/templates/location/install.html
@@ -1,6 +1,6 @@
 {% extends "../base.html" %}
 
-{% block title %}{{ _("Download") }}{% end block %}
+{% block title %}{{ _("Install IPFire Location") }}{% end block %}
 
 {% block container %}
        <section class="hero is-primary">
@@ -19,12 +19,12 @@
                                                        </a>
                                                </li>
                                                <li class="is-active">
-                                                       <a href="#" aria-current="page">{{ _("Download") }}</a>
+                                                       <a href="#" aria-current="page">{{ _("Install") }}</a>
                                                </li>
                                        </ul>
                                </nav>
 
-                               <h1 class="title">{{ _("Download IPFire Location") }}</h1>
+                               <h1 class="title">{{ _("Install IPFire Location") }}</h1>
                                <h6 class="subtitle">
                                        Learn how to download and install <code>libloc</code>
                                </h6>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 01a764aae784100606549be6cbf41ca0434bef1b..80bf199e6c3fdce9cac4e15623121d6f5dfc3f87 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -196,8 +196,9 @@ class Application(tornado.web.Application):
 
                        # Location
                        (r"/location/?", location.IndexHandler),
-                       (r"/location/download", StaticHandler, { "template" : "location/download.html" }),
+                       (r"/location/download", tornado.web.RedirectHandler, { "url" : "/location/install" }),
                        (r"/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use.html" }),
+                       (r"/location/install", StaticHandler, { "template" : "location/install.html" }),
                        (r"/location/lookup/(.+)", location.LookupHandler),
 
                        # Single-Sign-On for Discourse