Simplify class names for analytics and demo handlers

[people/ms/westferry.git] / src / westferry / handlers / analytics.py

diff --git a/src/westferry/handlers/analytics.py b/src/westferry/handlers/analytics.py
index 3cf785e838f681a95eadc0977ebe7f06853f6ef9..daa0999e16a00f70a5c2f16f8cc4a77c61ca0f7e 100644 (file)
--- a/src/westferry/handlers/analytics.py
+++ b/src/westferry/handlers/analytics.py
@@ -28,7 +28,7 @@ from .. import ui
 
 from ..i18n import N_
 
-class AnalyticsBaseHandler(base.BaseHandler):
+class BaseHandler(base.BaseHandler):
        @property
        def menu(self):
                _ = self.locale.translate
@@ -36,13 +36,13 @@ class AnalyticsBaseHandler(base.BaseHandler):
                m = ui.menus.Menu(self, _("Analytics"))
 
                # Overview
-               m.add_handler(AnalyticsOverviewHandler)
+               m.add_handler(OverviewHandler)
 
                # Network
-               m.add_handler(AnalyticsNetworkOverviewHandler)
+               m.add_handler(NetworkOverviewHandler)
 
                # System
-               m.add_handler(AnalyticsSystemOverviewHandler)
+               m.add_handler(SystemOverviewHandler)
 
                return m
 
@@ -50,7 +50,7 @@ class AnalyticsBaseHandler(base.BaseHandler):
                self.render("graphs.html", graphs=graphs)
 
 
-class AnalyticsOverviewHandler(AnalyticsBaseHandler):
+class OverviewHandler(BaseHandler):
        url = r"/analytics"
        title = N_("Overview")
 
@@ -58,7 +58,7 @@ class AnalyticsOverviewHandler(AnalyticsBaseHandler):
                self.render("base.html")
 
 
-class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler):
+class NetworkBaseHandler(BaseHandler):
        @property
        def menu(self):
                _ = self.locale.translate
@@ -66,21 +66,21 @@ class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler):
                m = ui.menus.Menu(self, _("Network"))
 
                # Back...
-               m.add_handler(AnalyticsOverviewHandler, title=_("Back..."))
+               m.add_handler(OverviewHandler, title=_("Back..."))
 
                # Overview
-               m.add_handler(AnalyticsNetworkOverviewHandler, title=_("Overview"))
+               m.add_handler(NetworkOverviewHandler, title=_("Overview"))
 
                # Connections
-               m.add_handler(AnalyticsNetworkConnectionsHandler)
+               m.add_handler(NetworkConnectionsHandler)
 
                # Fragmentation
-               m.add_handler(AnalyticsNetworkIPFragmentationHandler)
+               m.add_handler(NetworkIPFragmentationHandler)
 
                return m
 
 
-class AnalyticsNetworkOverviewHandler(AnalyticsNetworkBaseHandler):
+class NetworkOverviewHandler(NetworkBaseHandler):
        url = r"/analytics/network"
        title = N_("Network")
 
@@ -88,7 +88,7 @@ class AnalyticsNetworkOverviewHandler(AnalyticsNetworkBaseHandler):
                self.render("base.html")
 
 
-class AnalyticsNetworkConnectionsHandler(AnalyticsNetworkBaseHandler):
+class NetworkConnectionsHandler(NetworkBaseHandler):
        url = r"/analytics/connections"
        title = N_("Connections")
 
@@ -102,7 +102,7 @@ class AnalyticsNetworkConnectionsHandler(AnalyticsNetworkBaseHandler):
                self.render_graphs(graphs)
 
 
-class AnalyticsNetworkIPFragmentationHandler(AnalyticsNetworkBaseHandler):
+class NetworkIPFragmentationHandler(NetworkBaseHandler):
        url = r"/analytics/network/fragmentation"
        title = N_("Fragmentation")
 
@@ -115,7 +115,7 @@ class AnalyticsNetworkIPFragmentationHandler(AnalyticsNetworkBaseHandler):
                        tab.add_graph("%s-fragmentation" % proto)
 
 
-class AnalyticsSystemBaseHandler(AnalyticsBaseHandler):
+class SystemBaseHandler(BaseHandler):
        @property
        def menu(self):
                _ = self.locale.translate
@@ -123,25 +123,25 @@ class AnalyticsSystemBaseHandler(AnalyticsBaseHandler):
                m = ui.menus.Menu(self, _("System"))
 
                # Back...
-               m.add_handler(AnalyticsOverviewHandler, title=_("Back..."))
+               m.add_handler(OverviewHandler, title=_("Back..."))
 
                # Overview
-               m.add_handler(AnalyticsSystemOverviewHandler, title=_("Overview"))
+               m.add_handler(SystemOverviewHandler, title=_("Overview"))
 
                # Most interesting items
-               m.add_handler(AnalyticsSystemProcessorsHandler)
-               m.add_handler(AnalyticsSystemMemoryHandler)
-               m.add_handler(AnalyticsSystemTemperaturesHandler)
+               m.add_handler(SystemProcessorsHandler)
+               m.add_handler(SystemMemoryHandler)
+               m.add_handler(SystemTemperaturesHandler)
 
                # Others
                s = m.add_menu(_("More"))
-               s.add_handler(AnalyticsSystemContextSwitchesHandler)
-               s.add_handler(AnalyticsSystemInterruptsHandler)
+               s.add_handler(SystemContextSwitchesHandler)
+               s.add_handler(SystemInterruptsHandler)
 
                return m
 
 
-class AnalyticsSystemOverviewHandler(AnalyticsSystemBaseHandler):
+class SystemOverviewHandler(SystemBaseHandler):
        url = r"/analytics/system"
        title = N_("System")
 
@@ -152,7 +152,7 @@ class AnalyticsSystemOverviewHandler(AnalyticsSystemBaseHandler):
                tab.add_graph("loadavg")
 
 
-class AnalyticsSystemProcessorsHandler(AnalyticsSystemBaseHandler):
+class SystemProcessorsHandler(SystemBaseHandler):
        url = r"/analytics/system/processors"
        title = N_("Processors")
 
@@ -169,7 +169,7 @@ class AnalyticsSystemProcessorsHandler(AnalyticsSystemBaseHandler):
                tab.add_graph("processor-temperature")
 
 
-class AnalyticsSystemMemoryHandler(AnalyticsSystemBaseHandler):
+class SystemMemoryHandler(SystemBaseHandler):
        url = r"/analytics/system/memory"
        title = N_("Memory")
 
@@ -180,7 +180,7 @@ class AnalyticsSystemMemoryHandler(AnalyticsSystemBaseHandler):
                tab.add_graph("memory")
 
 
-class AnalyticsSystemTemperaturesHandler(AnalyticsSystemBaseHandler):
+class SystemTemperaturesHandler(SystemBaseHandler):
        url = r"/analytics/system/temperatures"
        title = N_("Temperatures")
 
@@ -195,7 +195,7 @@ class AnalyticsSystemTemperaturesHandler(AnalyticsSystemBaseHandler):
                self.render_graphs(graphs)
 
 
-class AnalyticsSystemContextSwitchesHandler(AnalyticsSystemBaseHandler):
+class SystemContextSwitchesHandler(SystemBaseHandler):
        url = r"/analytics/system/context-switches"
        title = N_("Context Switches")
 
@@ -209,7 +209,7 @@ class AnalyticsSystemContextSwitchesHandler(AnalyticsSystemBaseHandler):
                self.render_graphs(graphs)
 
 
-class AnalyticsSystemInterruptsHandler(AnalyticsSystemBaseHandler):
+class SystemInterruptsHandler(SystemBaseHandler):
        url = r"/analytics/system/interrupts"
        title = N_("Interrupts")