fireinfo: Update driver URL schema

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

diff --git a/src/templates/fireinfo/modules/table-devices.html b/src/templates/fireinfo/modules/table-devices.html
index 7002550fd8b6782d1be64b650438563cd237b411..8669baa65760116eea0d9c38c61fa0b95e68f8f9 100644 (file)
--- a/src/templates/fireinfo/modules/table-devices.html
+++ b/src/templates/fireinfo/modules/table-devices.html
@@ -14,7 +14,7 @@
                                ‐ {{ d.model_string or "N/A (%s)" % d.model }}
 
                                {% if d.driver %}
-                                       (<a href="/device/driver/{{ d.driver }}">{{ d.driver }}</a>)
+                                       (<a href="/driver/{{ d.driver }}">{{ d.driver }}</a>)
                                {% end %}
                        </p>
                </div>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 5f81d69a7766999fd3bc8b6c249fe6c7bf2b2f45..bcb3b9c35620b96a50a9c63f994bb0b89208d56b 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -185,12 +185,14 @@ class Application(tornado.web.Application):
                # fireinfo.ipfire.org
                self.add_handlers(r"fireinfo(\.dev)?\.ipfire\.org", [
                        (r"/", fireinfo.IndexHandler),
-                       (r"/device/driver/(.*)", fireinfo.DeviceDriverDetail),
 
                        # Vendors
                        (r"/vendors", fireinfo.VendorsHandler),
                        (r"/vendors/(pci|usb)/([0-9a-f]{4})", fireinfo.VendorHandler),
 
+                       # Driver
+                       (r"/driver/(.*)", fireinfo.DriverDetail),
+
                        # Show profiles
                        (r"/profile/random", fireinfo.RandomProfileHandler),
                        (r"/profile/([a-z0-9]{40})", fireinfo.ProfileHandler),

diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index 2b04da9d83d06132def6af49f4fefea9351ac7d8..67855b9a9f64d1462cdb9e23e2489422f8dd3931 100644 (file)
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -157,6 +157,12 @@ class IndexHandler(BaseHandler):
                self.render("fireinfo/index.html")
 
 
+class DriverDetail(BaseHandler):
+       def get(self, driver):
+               self.render("fireinfo/driver.html", driver=driver,
+                       driver_map=self.fireinfo.get_driver_map(driver, when=self.when))
+
+
 class ProfileHandler(BaseHandler):
        def get(self, profile_id):
                profile = self.fireinfo.get_profile(profile_id, when=self.when)
@@ -176,12 +182,6 @@ class RandomProfileHandler(BaseHandler):
                self.redirect("/profile/%s" % profile_id)
 
 
-class DeviceDriverDetail(BaseHandler):
-       def get(self, driver):
-               self.render("fireinfo/driver.html", driver=driver,
-                       driver_map=self.fireinfo.get_driver_map(driver, when=self.when))
-
-
 class StatsHandler(BaseHandler):
        def get(self):
                self.render("fireinfo/stats.html")