fireinfo: Drop language and network stats

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

diff --git a/Makefile.am b/Makefile.am
index b81d7187c983ce5304011d930aa34777cc4e4118..a05d730c3fc10df6e8ce1aa2ea0f606cebe321f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,9 +146,7 @@ templates_fireinfo_DATA = \
        src/templates/fireinfo/stats-cpus.html \
        src/templates/fireinfo/stats-geo.html \
        src/templates/fireinfo/stats.html \
-       src/templates/fireinfo/stats-languages.html \
        src/templates/fireinfo/stats-memory.html \
-       src/templates/fireinfo/stats-network.html \
        src/templates/fireinfo/stats-oses.html \
        src/templates/fireinfo/vendor.html \
        src/templates/fireinfo/vendors.html

diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index 759b87358ed625d2e08ba38f4712ddb0b2b04552..8c76da1cf957395ad85b13852c79765bc30aab79 100644 (file)
--- a/src/backend/fireinfo.py
+++ b/src/backend/fireinfo.py
@@ -1813,14 +1813,6 @@ class Fireinfo(Object):
 
                return ((r.location, r.count) for r in res)
 
-       def get_language_map(self, when=None):
-               res = self.db.query("WITH profiles AS (SELECT fireinfo_profiles_with_data_at(%s) AS id) \
-                       SELECT language, COUNT(language)::float / (SELECT COUNT(*) FROM profiles) AS count FROM profiles \
-                       LEFT JOIN fireinfo_profiles_languages ON profiles.id = fireinfo_profiles_languages.profile_id \
-                       WHERE fireinfo_profiles_languages.language IS NOT NULL GROUP BY language ORDER BY count DESC", when)
-
-               return ((r.language, r.count) for r in res)
-
        @property
        def cpu_vendors(self):
                res = self.db.query("SELECT DISTINCT vendor FROM fireinfo_processors ORDER BY vendor")
@@ -2053,14 +2045,3 @@ class Fireinfo(Object):
                                GROUP BY subsystem, model, vendor, driver, deviceclass", when, IGNORED_DEVICES, subsystem, vendor)
 
                return self._process_devices(res)
-
-       def get_network_zones_map(self, when=None):
-               res = self.db.get("WITH profiles AS (SELECT fireinfo_profiles_with_data_at(%s) AS id) \
-                       SELECT COUNT(NULLIF(has_red, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_red, \
-                               COUNT(NULLIF(has_green, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_green, \
-                               COUNT(NULLIF(has_orange, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_orange, \
-                               COUNT(NULLIF(has_blue, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_blue FROM profiles \
-                               LEFT JOIN fireinfo_profiles_networks ON profiles.id = fireinfo_profiles_networks.profile_id \
-                               WHERE fireinfo_profiles_networks.profile_id IS NOT NULL", when)
-
-               return res

diff --git a/src/templates/fireinfo/stats-languages.html b/src/templates/fireinfo/stats-languages.html
deleted file mode 100644 (file)
index 6060353..0000000
--- a/src/templates/fireinfo/stats-languages.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Languages") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Languages") }}</h1>
-       </div>
-
-       <dl class="dl-horizontal">
-               {% for language, percentage in languages %}
-                       <dt>{% module LanguageName(language) %}</dt>
-                       <dd>{% module ProgressBar(percentage) %}</dd>
-               {% end %}
-       </dl>
-{% end block %}

diff --git a/src/templates/fireinfo/stats-network.html b/src/templates/fireinfo/stats-network.html
deleted file mode 100644 (file)
index 4aa2bc6..0000000
--- a/src/templates/fireinfo/stats-network.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Networking") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Network configuration") }}</h1>
-       </div>
-
-       <p>
-               This chart shows us which is the most favourite network configuration.
-       </p>
-
-       <dl class="dl-horizontal">
-               <dt>{{ _("RED") }}</dt>
-               <dd>{% module ProgressBar(network.has_red) %}</dd>
-
-               <dt>{{ _("GREEN") }}</dt>
-               <dd>{% module ProgressBar(network.has_green) %}</dd>
-
-               <dt>{{ _("ORANGE") }}</dt>
-               <dd>{% module ProgressBar(network.has_orange) %}</dd>
-
-               <dt>{{ _("BLUE") }}</dt>
-               <dd>{% module ProgressBar(network.has_blue) %}</dd>
-       </dl>
-{% end block %}
-

diff --git a/src/templates/fireinfo/stats.html b/src/templates/fireinfo/stats.html
index 4f703858162050a4bd43938c5c6cff19cfaa8a66..b7f2c302ecc32ef5238186b02c44312067467eb9 100644 (file)
--- a/src/templates/fireinfo/stats.html
+++ b/src/templates/fireinfo/stats.html
@@ -15,10 +15,6 @@
                                <h3>
                                        <a href="/statistics/releases">{{ _("IPFire Releases") }}</a>
                                </h3>
-
-                               <h4>
-                                       <a href="/statistics/networking">{{ _("Networking") }}</a>
-                               </h4>
                        </div>
                </div>
 
@@ -41,10 +37,6 @@
                                <h4>
                                        <a href="/statistics/geo-locations">{{ _("Geo Locations") }}</a>
                                </h4>
-
-                               <h4>
-                                       <a href="/statistics/languages">{{ _("Languages") }}</a>
-                               </h4>
                        </div>
                </div>
        </div>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 0041ab4bd0ac056e0fa85e22eb35473314dcb37f..4cca0adceb47f4c34b6f258f166afe847d30a88e 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -80,9 +80,7 @@ class Application(tornado.web.Application):
                                # Nopaste
                                "Code"                 : nopaste.CodeModule,
 
-                               # Old modules
-                               "LanguageName"         : ui_modules.LanguageNameModule,
-
+                               # Fireinfo
                                "ProgressBar"          : ui_modules.ProgressBarModule,
                                "FireinfoDeviceTable"  : fireinfo.DeviceTableModule,
                                "FireinfoDeviceAndGroupsTable" : fireinfo.DeviceAndGroupsTableModule,
@@ -205,9 +203,7 @@ class Application(tornado.web.Application):
                        (r"/statistics/processors", fireinfo.StatsProcessorsHandler),
                        (r"/statistics/processors/(arm|x86)", fireinfo.StatsProcessorDetailHandler),
                        (r"/statistics/geo-locations", fireinfo.StatsGeoHandler),
-                       (r"/statistics/languages", fireinfo.StatsLanguagesHandler),
                        (r"/statistics/memory", fireinfo.StatsMemoryHandler),
-                       (r"/statistics/networking", fireinfo.StatsNetworkingHandler),
                        (r"/statistics/releases", fireinfo.StatsReleasesHandler),
                ])
 

diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index 03b28a61e41b73a58160122104f628b029e2a554..5a48f58ed94e31eb5a5c4cbb1d26b2cb81d2b79a 100644 (file)
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -259,19 +259,6 @@ class StatsGeoHandler(BaseHandler):
                        geo_locations = self.fireinfo.get_geo_location_map(when=self.when))
 
 
-class StatsLanguagesHandler(BaseHandler):
-       def get(self):
-               return self.render("fireinfo/stats-languages.html",
-                       languages = self.fireinfo.get_language_map(when=self.when))
-
-
-class StatsNetworkingHandler(BaseHandler):
-       def get(self):
-               network=self.fireinfo.get_network_zones_map(when=self.when)
-
-               return self.render("fireinfo/stats-network.html", network=network)
-
-
 class VendorsHandler(BaseHandler):
        def get(self):
                vendors = self.fireinfo.get_vendor_list(when=self.when)

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index 07f095895add7eee7585f3960011e143a26583b4..e50d1ac8474745e529b4a80570daabe2709edfba 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -10,34 +10,6 @@ class UIModule(tornado.web.UIModule):
                return self.handler.backend
 
 
-class LanguageNameModule(UIModule):
-       def render(self, language):
-               _ = self.locale.translate
-
-               if language == "de":
-                       return _("German")
-               elif language == "en":
-                       return _("English")
-               elif language == "es":
-                       return _("Spanish")
-               elif language == "fr":
-                       return _("French")
-               elif language == "it":
-                       return _("Italian")
-               elif language == "nl":
-                       return _("Dutch")
-               elif language == "pl":
-                       return _("Polish")
-               elif language == "pt":
-                       return _("Portuguese")
-               elif language == "ru":
-                       return _("Russian")
-               elif language == "tr":
-                       return _("Turkish")
-
-               return language
-
-
 class MapModule(UIModule):
        def render(self, latitude, longitude):
                return self.render_string("modules/map.html", latitude=latitude, longitude=longitude)