]> git.ipfire.org Git - people/ms/westferry.git/commitdiff
graphs: Remove title in graph image except for exports
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 13 Dec 2015 00:05:42 +0000 (01:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 13 Dec 2015 00:05:42 +0000 (01:05 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/westferry/handlers/analytics.py

index 19861a5772f3f3a79a9ffd010a4232e0b07a1a1c..3b412656d0a983b39b20eb88f65518ea5c1a919f 100644 (file)
@@ -78,6 +78,9 @@ class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler):
                # Connections
                m.add_handler(AnalyticsNetworkConnectionsOverviewHandler)
 
+               # Fragmentation
+               m.add_handler(AnalyticsNetworkIPFragmentationHandler)
+
                return m
 
 
@@ -170,6 +173,21 @@ class AnalyticsNetworkConnectionsStatesDCCPHandler(AnalyticsNetworkConnectionsBa
                self.render_graphs(graphs)
 
 
+class AnalyticsNetworkIPFragmentationHandler(AnalyticsNetworkBaseHandler):
+       url = r"/analytics/network/fragmentation"
+       title = N_("Fragmentation")
+
+       def get(self):
+               _ = self.locale.translate
+
+               graphs = [
+                       ui.graphs.Graph(self, "ipv6-fragmentation"),
+                       ui.graphs.Graph(self, "ipv4-fragmentation"),
+               ]
+
+               self.render_graphs(graphs)
+
+
 class AnalyticsSystemBaseHandler(AnalyticsBaseHandler):
        @property
        def menu(self):
@@ -317,8 +335,16 @@ class GraphExportHandler(base.BaseHandler):
                g = ui.graphs.Graph(self, template_name, object_id=object_id)
 
                # Generate the graph image
-               image = g.generate_graph(format=format.upper(), interval=interval,
-                       height=height, width=width)
+               kwargs = {
+                       "format"     : format.upper(),
+                       "interval"   : interval,
+                       "height"     : height,
+                       "width"      : width,
+
+                       # Include the title in the PDF exports
+                       "with_title" : format == "pdf",
+               }
+               image = g.generate_graph(**kwargs)
 
                # Set the HTTP headers
                self._make_headers(format, template_name, object_id)