fireinfo: Fix links

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

diff --git a/src/templates/fireinfo/admin.html b/src/templates/fireinfo/admin.html
index 98e4704efc66456ac6757f8807fd9c325a15680f..bbc5b816630ddeca52708ba3e4feda7dbe486bf5 100644 (file)
--- a/src/templates/fireinfo/admin.html
+++ b/src/templates/fireinfo/admin.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>

diff --git a/src/templates/fireinfo/driver.html b/src/templates/fireinfo/driver.html
index 948261dae6d4f20be39940b95fafbd112b4fcd3f..10a4b75250f9bb3003181dd4406697cfc728ef68 100644 (file)
--- a/src/templates/fireinfo/driver.html
+++ b/src/templates/fireinfo/driver.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>

diff --git a/src/templates/fireinfo/index.html b/src/templates/fireinfo/index.html
index 78a053423b1dd3ac7b1711e4becd60cbf2120766..608cfe85f2095357d5129ebd02929a7b4a7941c4 100644 (file)
--- a/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>
@@ -23,7 +23,7 @@
 
                                <h1 class="title">{{ _("Fireinfo") }}</h1>
 
-                               <a class="button is-dark is-medium" href="/profile/random">
+                               <a class="button is-dark is-medium" href="/fireinfo/profile/random">
                                        {{ _("Show a Random Profile") }}
                                </a>
                        </div>
@@ -46,7 +46,7 @@
                                                                {{ _("of all IPFire systems are on the latest release, released %s") % locale.format_date(latest_release.published, relative=True, shorter=True) }}
                                                        </h5>
 
-                                                       <a class="button is-primary is-outlined" href="/releases">
+                                                       <a class="button is-primary is-outlined" href="/fireinfo/releases">
                                                                {{ _("See All Releases") }}
                                                        </a>
                                                </div>
@@ -107,7 +107,7 @@
                                                        </div>
                                                {% end %}
 
-                                               <a class="button is-primary" href="/processors">
+                                               <a class="button is-primary" href="/fireinfo/processors">
                                                        {{ _("Processor Features") }}
                                                </a>
                                        </div>

diff --git a/src/templates/fireinfo/modules/table-devices.html b/src/templates/fireinfo/modules/table-devices.html
index 28deefb41ce9070bfa131e5c66c127f6c0f2b28c..9faef1f409a1bccf087af7f6a109e309debdca1e 100644 (file)
--- a/src/templates/fireinfo/modules/table-devices.html
+++ b/src/templates/fireinfo/modules/table-devices.html
@@ -13,7 +13,7 @@
                        <div class="level-item">
                                <p>
                                        {% if d.vendor_string %}
-                                               <a href="/vendors/{{ d.subsystem }}/{{ d.vendor }}">{{ d.vendor_string }}</a>
+                                               <a href="/fireinfo/vendors/{{ d.subsystem }}/{{ d.vendor }}">{{ d.vendor_string }}</a>
                                        {% else %}
                                                <p>N/A</p>
                                        {% end %}
@@ -24,7 +24,7 @@
                        <div class="level-item">
                                {% if d.driver %}
                                        <span class="tag">
-                                               <a href="/drivers/{{ d.driver }}">{{ d.driver }}</a>
+                                               <a href="/fireinfo/drivers/{{ d.driver }}">{{ d.driver }}</a>
                                        </span>
                                {% end %}
                        </div>

diff --git a/src/templates/fireinfo/processors.html b/src/templates/fireinfo/processors.html
index 8f4ddec1e384482ebd202d7896bc30be14865b35..05aba9b19971f11cc6b8afa918fc70099d03f2a9 100644 (file)
--- a/src/templates/fireinfo/processors.html
+++ b/src/templates/fireinfo/processors.html
@@ -11,7 +11,7 @@
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>

diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html
index 3c48132e061078b60be3c4429c38ed3a9c9f47f2..5ee46c1fc5f745294273c81b2a604cdba36dfa36 100644 (file)
--- a/src/templates/fireinfo/profile.html
+++ b/src/templates/fireinfo/profile.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>
@@ -19,12 +19,12 @@
                                                        </a>
                                                </li>
                                                <li>
-                                                       <a href="../profile/random">
+                                                       <a href="/fireinfo/profile/random">
                                                                {{ _("Random Profile") }}
                                                        </a>
                                                </li>
                                                <li class="is-active">
-                                                       <a href="../profile/random">
+                                                       <a href="/fireinfo/profile/random">
                                                                {{ profile.public_id }}
                                                        </a>
                                                </li>

diff --git a/src/templates/fireinfo/releases.html b/src/templates/fireinfo/releases.html
index 1f46eccf06b6cf96846b5c2e743310a39db48796..43864f4de8d1e5145e6e08d197acf9ad7b460e47 100644 (file)
--- a/src/templates/fireinfo/releases.html
+++ b/src/templates/fireinfo/releases.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>

diff --git a/src/templates/fireinfo/vendor.html b/src/templates/fireinfo/vendor.html
index 67155cc370b8228da4b10a96fe49fd691104a2b6..637f6ff982e957d4f15079de60f25c3e2e39fba1 100644 (file)
--- a/src/templates/fireinfo/vendor.html
+++ b/src/templates/fireinfo/vendor.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>

diff --git a/src/templates/fireinfo/vendors.html b/src/templates/fireinfo/vendors.html
index e6b7d7b3dca757703851ef9c5c6491764794c398..33dca376e39ee0c18d1991a767bafdc508f35d16 100644 (file)
--- a/src/templates/fireinfo/vendors.html
+++ b/src/templates/fireinfo/vendors.html
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="https://ipfire.org/">
+                                                       <a href="/">
                                                                Home
                                                        </a>
                                                </li>
@@ -38,7 +38,9 @@
                                        <div class="column is-4">{{ vendor }}</div>
                                        <div class="column is-3">
                                                {% for subsystem, vendor_id in sorted(vendors[vendor]) %}
-                                                       <a href="/vendors/{{ subsystem }}/{{ vendor_id }}">{{ subsystem.upper() }}</a>
+                                                       <a href="/fireinfo/vendors/{{ subsystem }}/{{ vendor_id }}">
+                                                               {{ subsystem.upper() }}
+                                                       </a>
                                                {% end %}
                                        </div>
                                </div>

diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index dd5c67d64fbb948beff3a7145477a4e11df87aa4..415f47423affccbddcc2be58dbb074e4c9431d4a 100644 (file)
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -95,7 +95,7 @@ class RandomProfileHandler(base.AnalyticsMixin, BaseHandler):
                if not profile:
                        raise tornado.web.HTTPError(404, "Could not find a random profile")
 
-               self.redirect("/profile/%s" % profile.profile_id)
+               self.redirect("/fireinfo/profile/%s" % profile.profile_id)
 
 
 class ReleasesHandler(base.AnalyticsMixin, BaseHandler):