From 1e3b2aadf6cc9491b477130d7d6972a20486a984 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Oct 2018 12:00:27 +0000
Subject: [PATCH] fireinfo: Update driver URL schema

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/fireinfo/modules/table-devices.html |  2 +-
 src/web/__init__.py                               |  4 +++-
 src/web/fireinfo.py                               | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/templates/fireinfo/modules/table-devices.html b/src/templates/fireinfo/modules/table-devices.html
index 7002550f..8669baa6 100644
--- a/src/templates/fireinfo/modules/table-devices.html
+++ b/src/templates/fireinfo/modules/table-devices.html
@@ -14,7 +14,7 @@
 				&dash; {{ 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 5f81d69a..bcb3b9c3 100644
--- 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 2b04da9d..67855b9a 100644
--- 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")
-- 
2.39.2