From: Michael Tremer Date: Tue, 19 Feb 2013 11:33:20 +0000 (+0100) Subject: Update fireinfo pages for new layout. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=747f5084841206ef1b35ae47aed1bcdce0e1a66b;p=ipfire.org.git Update fireinfo pages for new layout. --- diff --git a/templates/stasy-base-1.html b/templates/stasy-base-1.html deleted file mode 100644 index c812e273..00000000 --- a/templates/stasy-base-1.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base-1.html" %} diff --git a/templates/stasy-base-2.html b/templates/stasy-base-2.html deleted file mode 100644 index 361a8585..00000000 --- a/templates/stasy-base-2.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base-2.html" %} diff --git a/templates/stasy-index.html b/templates/stasy-index.html deleted file mode 100644 index 2e1ed98e..00000000 --- a/templates/stasy-index.html +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "stasy-base-2.html" %} - -{% block title %}Fireinfo{% end block %} - -{% block body %} -
-

- Fireinfo {{ _("A hardware data collection tool for IPFire") }} -

-
- -
-
- {% if lang == "de" %} -

- Fireinfo ist ein Tool, welches anonym Informationen - über die in IPFire-Systemen verbaute Hardware sammelt. - Diese Daten sollen den Entwicklern helfen zu erkennen, welche - Hardware am häufigsten eingesetzt wird und sind auch hilfreich - um Hardware-Probleme ausfindig zu machen. -

- {% else %} -

- Fireinfo is a tool that anonymously collects statistical - data from IPFire systems. These data should help the developers to learn - which hardware is used most often to run an IPFire system, but is also - handy when it comes to debugging hardware problems. -

- {% end %} -
-
-
- -
-
- {% if lang == "de" %} -

- Bitte geben Sie die Profil-ID von ihrem System ein, welche - Sie auf der Fireinfo-Seite des Webinterfaces finden können: -

- {% else %} -

- Please enter the profile ID of your system, which can be found - on the fireinfo page on the web interface, to see your profile: -

- {% end %} - -
- -
-
- -
- {% raw xsrf_form_html() %} -
-
-
-{% end block %} diff --git a/templates/stasy-model-detail.html b/templates/stasy-model-detail.html deleted file mode 100644 index d50c05c9..00000000 --- a/templates/stasy-model-detail.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ vendor_name }} - {{ model_name or model_id }}{% end block %} - -{% block body %} -
-

{{ vendor_name }} - {{ model_name or model_id }}

-
- -

- {{ _("This device is installed on approximately %.2f%% of all systems.") % percentage }} -

- -

{{ _("Feedback") }}

- {% if lang == "de" %} -

- Im IPFire-Wiki befindet sich eine Sektion mit Kommentaren und Ratschlägen - zu dieser Hardware. Diese werden von der Community gesammelt. -

- {% else %} -

- In the IPFire wiki is a section that keeps comments or instructions on - the hardware. These information is maintained by the community. -

- {% end %} - -

- {{ _("Go to the wiki") }}: - {{ vendor_name }} - {{ model_name or model_id }} -

-{% end block %} diff --git a/templates/stasy-profile-detail.html b/templates/stasy-profile-detail.html deleted file mode 100644 index de98f68b..00000000 --- a/templates/stasy-profile-detail.html +++ /dev/null @@ -1,234 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Profile") }} {{ profile.public_id }}{% end block %} - -{% block body %} -
-

{{ _("Profile") }} {{ profile.public_id }}

-
- -
-
-

{{ _("Operating system") }}

- - - - - - - - - - - - - -
- {{ _("Version") }} - - {{ profile.release }} -
- {{ _("Architecture") }} - - {{ profile.cpu.arch }} -
- {{ _("Kernel version") }} - - {{ profile.kernel }} -
-
- -
- {% if profile.hypervisor %} -

{{ _("Hypervisor") }}

-

- {{ _("This machine is running in a virtual environment.") }} -

- - - - - - - - - - -
- {{ _("Vendor") }} - - {{ profile.hypervisor.vendor }} -
- {{ _("Type") }} - - {{ profile.hypervisor.type }} -
- {% else %} -

{{ _("Hardware vendor") }}

- - - - - - - - - -
- {{ _("Vendor") }} - - {{ profile.vendor or _("Unknown") }} -
- {{ _("Model") }} - - {{ profile.model or _("Unknown") }} -
- {% end %} -
-
- -
- - {% if profile.network %} -
-
-

{{ _("Network") }}

-

- {{ _("Enabled network zones") }} - - {% for zone in ("GREEN", "RED", "BLUE", "ORANGE") %} - {% if profile.network.has_zone(zone.lower()) %} - {% if zone == "GREEN" %} - {{ _(zone) }} - {% elif zone == "RED" %} - {{ _(zone) }} - {% elif zone == "ORANGE" %} - {{ _(zone) }} - {% elif zone == "BLUE" %} - {{ _(zone) }} - {% end %} - {% end %} - {% end %} -

-
-
- {% end %} - -
- -

{{ _("Hardware") }}

-
-
- - - - - - - - - - - - - - - - - - - - - {% if profile.cpu.vendor != "ARM" %} - - - - - {% end %} -
- {{ _("CPU") }} -
- {{ _("Vendor") }} - - {{ profile.cpu.vendor }} -
- {{ _("Model") }} - - {{ profile.cpu.model_string or _("Not available") }} -
- {{ _("Cores") }} - - {{ profile.cpu.count }} -
- {{ _("Speed") }} - - {{ profile.cpu.speed }} MHz - {% if profile.cpu.speed != profile.cpu.bogomips %} - (Bogomips: {{ profile.cpu.bogomips }}) - {% end %} -
- {{ _("Supported features") }} - - {% if profile.cpu.capable_64bit %} - {{ _("64 bit capable") }} - {% end %} - - {% if profile.cpu.capable_pae %} - {{ _("PAE capable") }} - {% end %} - - {% if profile.cpu.capable_virt %} - {{ _("VT-x/AMD-V") }} - {% end %} -
-
- -
- - - - - - - - - -
- {{ _("Memory size") }} - - {{ format_size(profile.memory) }} -
- {{ _("System disk size") }} - - {{ format_size(profile.root_size) }} -
-
-
- -
- - {% if profile.devices %} -

{{ _("Peripherial devices") }}

- {% module StasyDeviceTable(profile.devices) %} -
- {% end %} - -

{{ _("Signature images") }}

- - -
-

- {{ _("Last update") }}: {{ locale.format_date(profile.updated) }} -

-
-{% end block %} diff --git a/templates/stasy-profile-notfound.html b/templates/stasy-profile-notfound.html deleted file mode 100644 index 0b1addbb..00000000 --- a/templates/stasy-profile-notfound.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base-1.html" %} - -{% block title %}{{ _("Profile not found") }}}{% end block %} - -{% block body %} - {{ _( -
-

404 - {{ _("Profile not found") }}

-
- -
-
-

- {% if lang == "de" %} - Es wurden keine Daten für das Profil {{ profile_id }} - gefunden. - {% else %} - There was no profile data found for profile {{ profile_id }}. - {% end %} -

-

- {% if lang == "de" %} - Der Eigentümer dieses Profils hat möglicherweise der Veröffentlichung - der Daten nicht zugestimmt oder diese abgeschaltet. - {% else %} - The profile owner has probably not submitted any data - or recently disabled the transmission. - {% end %} -

-

- {% if lang == "de" %} - Falls dieses Profil Ihr eigenes ist, so können Sie die Veröffentlichung - im Web-Interface - einschalten. - {% else %} - If this is your own profile, you can - enable - the submission on the web user interface. - {% end %} -

-
-
-{% end block %} diff --git a/templates/stasy-profile.html b/templates/stasy-profile.html deleted file mode 100644 index a9ee6c02..00000000 --- a/templates/stasy-profile.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Profile lookup") }}{% end block %} - -{% block body %} -

{{ _("Profile lookup") }}

- -

- Please enter your profile ID and have a look of the hardware components - that are installed on your system: -

- -
-

- - -

-
-{% end block %} diff --git a/templates/stasy-stats-admin.html b/templates/stasy-stats-admin.html deleted file mode 100644 index 71f759a2..00000000 --- a/templates/stasy-stats-admin.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "stasy-base-2.html" %} - -{% block title %}{{ _("Admin") }}{% end block %} - -{% block body %} -

Need a headline

- - - - - - - - - - -
- {{ _("Sending profiles") }} - - {{ profiles_count }} / {{ profiles_count_all }} -
- {{ _("Archive size") }} - - {{ archives_count }} -
-{% end block %} - diff --git a/templates/stasy-stats-cpu-flags.html b/templates/stasy-stats-cpu-flags.html deleted file mode 100644 index 94ed2c68..00000000 --- a/templates/stasy-stats-cpu-flags.html +++ /dev/null @@ -1,78 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("CPU flags") }}{% end block %} - -{% block body %} -
-

{{ _("Processor flags") }}

-
- -
-
- {% if lang == "de" %} -

- Diese Seite untersucht CPUs und ihre Funktionalitäten. - Anhand dieser Graphen können die Entwickler einige Entscheidungen - über die Betriebssystemkonfiguration treffen. -

- {% else %} -

- On this page we will examine which CPUs provide a specific feature. - These charts will help the IPFire developers to make decisions about - the operating system configuration. -

- {% end %} -
-
- -
-
-

{{ _("CPUs that support 64 bits") }}

- {% if lang == "de" %} -

- Wieviele Prozessoren unterstützen die 64-Bit-Architektur? -

- {% else %} -

- How many CPUs support the 64-bit architecture? -

- {% end %} - {% module StasyTable(cpus_lm, sortby="percentage") %} -
-
- -
-
-

{{ _("CPUs with PAE") }}

- {% if lang == "de" %} -

- Diese Grafik zeigt uns wieviele Prozessoren das PAE-Flag unterstützen. -

- {% else %} -

- This chart shows us which CPUs have got the PAE flag. -

- {% end %} - {% module StasyTable(cpus_pae, sortby="percentage") %} -
-
- -
-
-

{{ _("CPUs that support virtualization") }}

- {% if lang == "de" %} -

- Für zukünftige Planungen ist es nötig zu wissen, ob genug - Hardware mit Virtualisierungsunterstützung vorhanden ist - (Intels VT-x and AMD-V). -

- {% else %} -

- For future planning it is important to know if there is enough hardware - support for virtualization like VT-x and AMD-V. -

- {% end %} - {% module StasyTable(cpus_virt, sortby="percentage") %} -
-
-{% end block %} diff --git a/templates/stasy-stats-cpus.html b/templates/stasy-stats-cpus.html deleted file mode 100644 index 146db32d..00000000 --- a/templates/stasy-stats-cpus.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Processors") }}{% end block %} - -{% block body %} -
-

{{ _("Hardware: CPUs") }}

-
- -
-
- {{ _("See statistics about common CPU flags") }} -
-
-
- -
-
-

{{ _("Vendors") }}

- {% if lang == "de" %} -

- Eine Aufstellung über den beliebtesten Prozessor-Hersteller: -

- {% else %} -

- This chart shows us which vendors is the most favorite for the CPUs - used in IPFire. -

- {% end %} - {% module StasyTable(cpu_vendors, sortby="percentage") %} -
-
- -
-
-

{{ _("Speed") }}

-

- {{ _("The average speed of all systems in the database is: %.2f MHz.") % average_speed }} -
- {{ _("All together, there are %s bogomips out there.") % locale.friendly_number(bogomips) }} -

- {% module StasyTable(cpu_speeds) %} -
-
- -
-
-

{{ _("CPU core counter") }}

-

- {{ _("See a breakdown of the CPU cores that are installed on the IPFire systems.") }} -

- {% module StasyCPUCoreTable(cpu_cores) %} -
-
-{% end block %} diff --git a/templates/stasy-stats-geo.html b/templates/stasy-stats-geo.html deleted file mode 100644 index 865cc2a5..00000000 --- a/templates/stasy-stats-geo.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Geo locations") }}{% end block %} - -{% block body %} -
-

{{ _("Geo locations") }}

-
- -
-
- {% if lang == "de" %} -

- Dieses Diagramm zeigt in welchem Land IPFire am häufigsten - eingesetzt wird. -

- {% else %} -

- This chart shows us in which country IPFire is running. -

- {% end %} - {% module StasyGeoTable(geo_locations) %} -
-
- -
-
-

{{ _("Language selection") }}

- {% if lang == "de" %} -

- Dies gibt einen Überblick über die Häufigkeit der ausgewählten - Sprachen. -

- {% else %} -

- This will give a short overview about what languages are configured - on the IPFire webinterface. -

- {% end %} - {% module StasyTable(languages, sortby="percentage", locale=True) %} -
-
-{% end block %} diff --git a/templates/stasy-stats-memory.html b/templates/stasy-stats-memory.html deleted file mode 100644 index 99db6e4f..00000000 --- a/templates/stasy-stats-memory.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Memory") }}{% end block %} - -{% block body %} -
-

{{ _("Memory") }}

-
- -
-
-

- {{ _("The average amount of memory of all systems in the database is: %.2f MB.") % average_memory }} -

- {% module StasyTable(memory) %} -
-
-{% end block %} diff --git a/templates/stasy-stats-network.html b/templates/stasy-stats-network.html deleted file mode 100644 index d9c66516..00000000 --- a/templates/stasy-stats-network.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Network") }}{% end block %} - -{% block body %} -
-

{{ _("Network configuration") }}

-
- -
-
- {% if lang == "de" %} -

- Diese Grafik zeigt uns die beliebteste Netzwerkkonfiguration. -

- {% else %} -

- This chart shows us which is the most favourite network configuration. -

- {% end %} - {% module StasyTable(network_zones, sortby="percentage", percentage=True) %} -
-
-{% end block %} - diff --git a/templates/stasy-stats-oses.html b/templates/stasy-stats-oses.html deleted file mode 100644 index 489e2c6b..00000000 --- a/templates/stasy-stats-oses.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Operating system") }}{% end block %} - -{% block body %} -
-

{{ _("Releases") }}

-
- -
-
- {% module StasyTable(releases, sortby="percentage") %} -
-
- -
-
-

{{ _("Architectures") }}

- {% module StasyTable(arches, sortby="percentage") %} -
-
- -
-
-

{{ _("Kernels") }}

- {% if lang == "de" %} -

- Dies zeigt uns, welche Kernel am häufigsten verwendet werden. -

- {% else %} -

- This chart gives an overview about what kernel the machines are - runnning. -

- {% end %} - {% module StasyTable(kernels, sortby="percentage") %} -
-
-{% end block %} diff --git a/templates/stasy-stats-virtual.html b/templates/stasy-stats-virtual.html deleted file mode 100644 index 0c039cfb..00000000 --- a/templates/stasy-stats-virtual.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Virtualization") }}{% end block %} - -{% block body %} -
-

{{ _("Virtualization support") }}

-
- -
-
- {% if lang == "de" %} -

- IPFire läuft hervorragend in virtuellen Umgebungen. -

-

- Dieser Graph gibt Aufschluss darüber, wieviele Systeme - virtuell laufen. -

- {% else %} -

- IPFire is running very well in a virtual environment. -

-

- See this chart to get a clue about how many machines are running - virtually. -

- {% end %} - {% module StasyTable(is_virtual, sortby="percentage") %} -
-
- -
-
-

{{ _("Hypervisors") }}

- {% if lang == "de" %} -

- Diese Systeme werden eingesetzt um IPFire zu virtualisieren: -

- {% else %} -

- This is a list of all hypervisor vendors that IPFire is running on. -

- {% end %} - {% module StasyTable(hypervisor_vendors, sortby="percentage") %} -
-
-{% end block %} diff --git a/templates/stasy-stats.html b/templates/stasy-stats.html deleted file mode 100644 index 18ebba46..00000000 --- a/templates/stasy-stats.html +++ /dev/null @@ -1,145 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ _("Statistics") }}{% end block %} - -{% block body %} -
-

{{ _("fireinfo statistics") }}

-
- - -{% end block %} diff --git a/templates/stasy-vendor-detail.html b/templates/stasy-vendor-detail.html deleted file mode 100644 index 779914ef..00000000 --- a/templates/stasy-vendor-detail.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "stasy-base-1.html" %} - -{% block title %}{{ vendor_name }}{% end block %} - -{% block body %} -
-

{{ vendor_name }}

-
- -
-
- {% if lang == "de" %} -

- Dies ist eine Aufstellung über alle Geräte von - {{ vendor_name }} in der Datenbank. - {% else %} -

- This is a list of all devices this database knows about from - {{ vendor_name }}. -

- {% end %} - - {% module StasyDeviceTable(models) %} -
-
-{% end block %} diff --git a/webapp/handlers_stasy.py b/webapp/handlers_stasy.py index d0a92933..d54b4873 100644 --- a/webapp/handlers_stasy.py +++ b/webapp/handlers_stasy.py @@ -223,10 +223,10 @@ class StasyProfileSendHandler(StasyBaseHandler): class StasyIndexHandler(StasyBaseHandler): def _profile_not_found(self, profile_id): self.set_status(404) - self.render("stasy-profile-notfound.html", profile_id=profile_id) + self.render("fireinfo/profile-notfound.html", profile_id=profile_id) def get(self): - self.render("stasy-index.html") + self.render("fireinfo/index.html") def post(self): profile_id = self.get_argument("profile_id", None) @@ -247,17 +247,17 @@ class StasyProfileDetailHandler(StasyIndexHandler): self._profile_not_found(profile_id) return - self.render("stasy-profile-detail.html", profile=profile) + self.render("fireinfo/profile-detail.html", profile=profile) class StasyStatsHandler(StasyBaseHandler): def get(self): - self.render("stasy-stats.html") + self.render("fireinfo/stats.html") class StasyStatsCPUHandler(StasyBaseHandler): def get(self): - return self.render("stasy-stats-cpus.html", + return self.render("fireinfo/stats-cpus.html", cpu_vendors=self.stasy.cpu_vendors_map, average_speed=self.stasy.cpu_speed_average, cpu_speeds=self.stasy.cpu_speed_map, @@ -278,18 +278,18 @@ class StasyStatsCPUFlagsHandler(StasyBaseHandler): for name, flag in flags: kwargs["cpus_" + name] = self.stasy.get_cpu_flag_map(flag) - return self.render("stasy-stats-cpu-flags.html", **kwargs) + return self.render("fireinfo/stats-cpu-flags.html", **kwargs) class StasyStatsMemoryHandler(StasyBaseHandler): def get(self): - return self.render("stasy-stats-memory.html", + return self.render("fireinfo/stats-memory.html", average_memory=self.stasy.memory_average, memory=self.stasy.get_memory_map()) class StasyStatsOSesHandler(StasyBaseHandler): def get(self): - return self.render("stasy-stats-oses.html", + return self.render("fireinfo/stats-oses.html", arches=self.stasy.arch_map, kernels=self.stasy.kernel_map, releases=self.stasy.release_map) @@ -297,20 +297,20 @@ class StasyStatsOSesHandler(StasyBaseHandler): class StasyStatsVirtualHandler(StasyBaseHandler): def get(self): - return self.render("stasy-stats-virtual.html", + return self.render("fireinfo/stats-virtual.html", hypervisor_vendors = self.stasy.hypervisor_map, is_virtual = self.stasy.virtual_map) class StasyStatsGeoHandler(StasyBaseHandler): def get(self): - return self.render("stasy-stats-geo.html", + return self.render("fireinfo/stats-geo.html", languages = self.stasy.get_language_map(), geo_locations = self.stasy.get_geo_location_map()) class StasyStatsNetworkHandler(StasyBaseHandler): def get(self): - return self.render("stasy-stats-network.html", + return self.render("fireinfo/stats-network.html", network_zones=self.stasy.get_network_zones_map()) @@ -327,7 +327,7 @@ class StasyStatsVendorDetail(StasyBaseHandler): # Get a list of all models we know from this vendor models = self.stasy.get_models_by_vendor(bus, vendor_id) - self.render("stasy-vendor-detail.html", + self.render("fireinfo/vendor-detail.html", vendor_name=vendor_name, models=models) @@ -346,7 +346,7 @@ class StasyStatsModelDetail(StasyBaseHandler): percentage = \ self.stasy.get_device_percentage(bus, vendor_id, model_id) * 100 - self.render("stasy-model-detail.html", + self.render("fireinfo/model-detail.html", vendor_id=vendor_id, vendor_name=vendor_name, model_id=model_id, @@ -372,5 +372,5 @@ class AdminFireinfoStatsHandler(StasyBaseHandler): #updates[_("All versions")] = self.stasy.get_updated_since(since).count() #data["updated_since_24h"] = updates - self.render("stasy-stats-admin.html", **data) + self.render("fireinfo/stats-admin.html", **data)