]> git.ipfire.org Git - ipfire.org.git/commitdiff
Update fireinfo pages for new layout.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 19 Feb 2013 11:33:20 +0000 (12:33 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 19 Feb 2013 11:33:20 +0000 (12:33 +0100)
18 files changed:
templates/stasy-base-1.html [deleted file]
templates/stasy-base-2.html [deleted file]
templates/stasy-index.html [deleted file]
templates/stasy-model-detail.html [deleted file]
templates/stasy-profile-detail.html [deleted file]
templates/stasy-profile-notfound.html [deleted file]
templates/stasy-profile.html [deleted file]
templates/stasy-stats-admin.html [deleted file]
templates/stasy-stats-cpu-flags.html [deleted file]
templates/stasy-stats-cpus.html [deleted file]
templates/stasy-stats-geo.html [deleted file]
templates/stasy-stats-memory.html [deleted file]
templates/stasy-stats-network.html [deleted file]
templates/stasy-stats-oses.html [deleted file]
templates/stasy-stats-virtual.html [deleted file]
templates/stasy-stats.html [deleted file]
templates/stasy-vendor-detail.html [deleted file]
webapp/handlers_stasy.py

diff --git a/templates/stasy-base-1.html b/templates/stasy-base-1.html
deleted file mode 100644 (file)
index c812e27..0000000
+++ /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 (file)
index 361a858..0000000
+++ /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 (file)
index 2e1ed98..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "stasy-base-2.html" %}
-
-{% block title %}Fireinfo{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>
-                       Fireinfo <small>{{ _("A hardware data collection tool for IPFire") }}</small>
-               </h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       <strong>Fireinfo</strong> 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.
-                               </p>
-                       {% else %}
-                               <p>
-                                       <strong>Fireinfo</strong> 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.
-                               </p>
-                       {% end %}
-                       <hr>
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span8 offset2 well">
-                       {% if lang == "de" %}
-                               <p>
-                                       Bitte geben Sie die Profil-ID von ihrem System ein, welche
-                                       Sie auf der Fireinfo-Seite des Webinterfaces finden können:
-                               </p>
-                       {% else %}
-                               <p>
-                                       Please enter the profile ID of your system, which can be found
-                                       on the fireinfo page on the web interface, to see your profile:
-                               </p>
-                       {% end %}
-
-                       <hr>
-
-                       <form method="POST" action="">
-                               <div class="input-append">
-                                       <input type="text" class="span7" name="profile_id" value=""
-                                               placeholder="{{ _("Profile ID") }}"><button type="submit" class="btn">{{ _("Show") }}</button>
-                               </div>
-                               {% raw xsrf_form_html() %}
-                       </form>
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-model-detail.html b/templates/stasy-model-detail.html
deleted file mode 100644 (file)
index d50c05c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ vendor_name }} - {{ model_name or model_id }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ vendor_name }} - {{ model_name or model_id  }}</h1>
-       </div>
-
-       <p>
-               {{ _("This device is installed on approximately %.2f%% of all systems.") % percentage }}
-       </p>
-
-       <h2>{{ _("Feedback") }}</h2>
-       {% if lang == "de" %}
-               <p>
-                       Im IPFire-Wiki befindet sich eine Sektion mit Kommentaren und Ratschlägen
-                       zu dieser Hardware. Diese werden von der Community gesammelt.
-               </p>
-       {% else %}
-               <p>
-                       In the IPFire wiki is a section that keeps comments or instructions on
-                       the hardware. These information is maintained by the community.
-               </p>
-       {% end %}
-
-       <p>
-               {{ _("Go to the wiki") }}:
-               <a href="http://wiki.ipfire.org/{{ lang }}/hardware/fireinfo/{{ bus }}/{{ vendor_id }}/{{ model_id }}">{{ vendor_name }} - {{ model_name or model_id }}</a>
-       </p>
-{% end block %}
diff --git a/templates/stasy-profile-detail.html b/templates/stasy-profile-detail.html
deleted file mode 100644 (file)
index de98f68..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Profile") }} {{ profile.public_id }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Profile") }} {{ profile.public_id }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span6">
-                       <h3>{{ _("Operating system") }}</h3>
-                       <table class="table">
-                               <tr>
-                                       <td>
-                                               {{ _("Version") }}
-                                       </td>
-                                       <td>
-                                               {{ profile.release }}
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("Architecture") }}
-                                       </td>
-                                       <td>
-                                               {{ profile.cpu.arch }}
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("Kernel version") }}
-                                       </td>
-                                       <td>
-                                               {{ profile.kernel }}
-                                       </td>
-                               </tr>
-                       </table>
-               </div>
-
-               <div class="span6">
-                       {% if profile.hypervisor %}
-                               <h3>{{ _("Hypervisor") }}</h3>
-                               <p>
-                                       {{ _("This machine is running in a virtual environment.") }}
-                               </p>
-
-                               <table class="table">
-                                       <tr>
-                                               <td>
-                                                       {{ _("Vendor") }}
-                                               </td>
-                                               <td>
-                                                       {{ profile.hypervisor.vendor }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       {{ _("Type") }}
-                                               </td>
-                                               <td>
-                                                       {{ profile.hypervisor.type }}
-                                               </td>
-                                       </tr>
-                               </table>
-                       {% else %}
-                               <h3>{{ _("Hardware vendor") }}</h3>
-                               <table class="table">
-                                       <tr>
-                                               <td>
-                                                       {{ _("Vendor") }}
-                                               </td>
-                                               <td>
-                                                       {{ profile.vendor or _("Unknown") }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       {{ _("Model") }}
-                                               </td>
-                                               <td>
-                                                       {{ profile.model or _("Unknown") }}
-                                               </td>
-                                       </tr>
-                               </table>
-                       {% end %}
-               </div>
-       </div>
-
-       <hr>
-
-       {% if profile.network %}
-               <div class="row">
-                       <div class="span12">
-                               <h2>{{ _("Network") }}</h2>
-                               <p>
-                                       {{ _("Enabled network zones") }}
-
-                                       {% for zone in ("GREEN", "RED", "BLUE", "ORANGE") %}
-                                               {% if profile.network.has_zone(zone.lower()) %}
-                                                       {% if zone == "GREEN" %}
-                                                               <span class="label label-success">{{ _(zone) }}</span>
-                                                       {% elif zone == "RED" %}
-                                                               <span class="label label-important">{{ _(zone) }}</span>
-                                                       {% elif zone == "ORANGE" %}
-                                                               <span class="label label-warning">{{ _(zone) }}</span>
-                                                       {% elif zone == "BLUE" %}
-                                                               <span class="label label-info">{{ _(zone) }}</span>
-                                                       {% end %}
-                                               {% end %}
-                                       {% end %}
-                               </p>
-                       </div>
-               </div>
-       {% end %}
-
-       <hr>
-
-       <h2>{{ _("Hardware") }}</h2>
-       <div class="row">
-               <div class="span6">
-                       <table class="table">
-                               <tr>
-                                       <td colspan="2">
-                                               <strong>{{ _("CPU") }}</strong>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("Vendor") }}
-                                       </td>
-                                       <td>
-                                               <a href="/stats/cpus">{{ profile.cpu.vendor }}</a>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("Model") }}
-                                       </td>
-                                       <td>
-                                                {{ profile.cpu.model_string or _("Not available") }}
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("Cores") }}
-                                       </td>
-                                       <td>
-                                                {{ profile.cpu.count }}
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("Speed") }}
-                                       </td>
-                                       <td>
-                                               {{ profile.cpu.speed }} MHz
-                                               {% if profile.cpu.speed != profile.cpu.bogomips %}
-                                                       (Bogomips: {{ profile.cpu.bogomips }})
-                                               {% end %}
-                                       </td>
-                               </tr>
-                               {% if profile.cpu.vendor != "ARM" %}
-                                       <tr>
-                                               <td>
-                                                       {{ _("Supported features") }}
-                                               </td>
-                                               <td>
-                                                       {% if profile.cpu.capable_64bit %}
-                                                               <span class="label label-success">{{ _("64 bit capable") }}</span>
-                                                       {% end %}
-
-                                                       {% if profile.cpu.capable_pae %}
-                                                               <span class="label label-success">{{ _("PAE capable") }}</span>
-                                                       {% end %}
-
-                                                       {% if profile.cpu.capable_virt %}
-                                                               <span class="label label-success">{{ _("VT-x/AMD-V") }}</span>
-                                                       {% end %}
-                                               </td>
-                                       </tr>
-                               {% end %}
-                       </table>
-               </div>
-
-               <div class="span6">
-                       <table class="table">
-                               <tr>
-                                       <td>
-                                               {{ _("Memory size") }}
-                                       </td>
-                                       <td>
-                                               {{ format_size(profile.memory) }}
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {{ _("System disk size") }}
-                                       </td>
-                                       <td>
-                                               {{ format_size(profile.root_size) }}
-                                       </td>
-                               </tr>
-                       </table>
-               </div>
-       </div>
-
-       <hr>
-
-       {% if profile.devices %}
-               <h3>{{ _("Peripherial devices") }}</h3>
-               {% module StasyDeviceTable(profile.devices) %}
-               <hr>
-       {% end %}
-
-       <h3>{{ _("Signature images") }}</h3>
-       <ul class="unstyled">
-               {% for i in range(1) %}
-                       <li>
-                               <!-- XXX need some bbcode here -->
-                               <a href="http://i-use.ipfire.org/profile/{{ profile.public_id }}/{{ i }}.png">
-                                       <img src="http://i-use.ipfire.org/profile/{{ profile.public_id }}/{{ i }}.png"
-                                               alt="{{ _("Signature image") }}" />
-                               </a>
-                       </li>
-               {% end %}
-       </ul>
-
-       <div class="pull-right">
-               <p>
-                       {{ _("Last update") }}: {{ locale.format_date(profile.updated) }}
-               </p>
-       </div>
-{% end block %}
diff --git a/templates/stasy-profile-notfound.html b/templates/stasy-profile-notfound.html
deleted file mode 100644 (file)
index 0b1addb..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base-1.html" %}
-
-{% block title %}{{ _("Profile not found") }}}{% end block %}
-
-{% block body %}
-       <img class="pull-right" src="{{ static_url("images/error/404.png") }}" alt="{{ _("Error") }}" />
-       <div class="page-header">
-               <h1>404 - {{ _("Profile not found") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <p>
-                               {% if lang == "de" %}
-                                       Es wurden keine Daten für das Profil <code>{{ profile_id }}</code>
-                                       gefunden.
-                               {% else %}
-                                       There was no profile data found for profile <code>{{ profile_id }}</code>.
-                               {% end %}
-                       </p>
-                       <p>
-                               {% 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 %}
-                       </p>
-                       <p>
-                               {% if lang == "de" %}
-                                       Falls dieses Profil Ihr eigenes ist, so können Sie die Veröffentlichung
-                                       im Web-Interface
-                                       <a href="http://wiki.ipfire.org/de/fireinfo/my_profile" target="_blank">einschalten</a>.
-                               {% else %}
-                                       If this is your own profile, you can
-                                       <a href="http://wiki.ipfire.org/en/fireinfo/my_profile" target="_blank">enable</a>
-                                       the submission on the web user interface.
-                               {% end %}
-                       </p>
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-profile.html b/templates/stasy-profile.html
deleted file mode 100644 (file)
index a9ee6c0..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Profile lookup") }}{% end block %}
-
-{% block body %}
-       <h3>{{ _("Profile lookup") }}</h3>
-
-       <p>
-               Please enter your profile ID and have a look of the hardware components
-               that are installed on your system:
-       </p>
-
-       <form name="profile">
-               <p>
-                       <input type="text" name="profile_id" size="40" maxlength="40" />
-                       <input type="submit" value="{{ _("Show profile") }}" />
-               </p>
-       </form>
-{% end block %}
diff --git a/templates/stasy-stats-admin.html b/templates/stasy-stats-admin.html
deleted file mode 100644 (file)
index 71f759a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "stasy-base-2.html" %}
-
-{% block title %}{{ _("Admin") }}{% end block %}
-
-{% block body %}
-       <h3>Need a headline</h3>
-
-       <table>
-               <tr>
-                       <td>
-                               {{ _("Sending profiles") }}
-                       </td>
-                       <td>
-                               {{ profiles_count }} / {{ profiles_count_all }}
-                       </td>
-               </tr>
-               <tr>
-                       <td>
-                               {{ _("Archive size") }}
-                       </td>
-                       <td>
-                               {{ archives_count }}
-                       </td>
-               </tr>
-       </table>
-{% end block %}
-
diff --git a/templates/stasy-stats-cpu-flags.html b/templates/stasy-stats-cpu-flags.html
deleted file mode 100644 (file)
index 94ed2c6..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("CPU flags") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Processor flags") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       Diese Seite untersucht CPUs und ihre Funktionalitäten.
-                                       Anhand dieser Graphen können die Entwickler einige Entscheidungen
-                                       über die Betriebssystemkonfiguration treffen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       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.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("CPUs that support 64 bits") }}</h2>
-                       {% if lang == "de" %}
-                               <p>
-                                       Wieviele Prozessoren unterstützen die 64-Bit-Architektur?
-                               </p>
-                       {% else %}
-                               <p>
-                                       How many CPUs support the 64-bit architecture?
-                               </p>
-                       {% end %}
-                       {% module StasyTable(cpus_lm, sortby="percentage") %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("CPUs with PAE") }}</h2>
-                       {% if lang == "de" %}
-                               <p>
-                                       Diese Grafik zeigt uns wieviele Prozessoren das PAE-Flag unterstützen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       This chart shows us which CPUs have got the PAE flag.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(cpus_pae, sortby="percentage") %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("CPUs that support virtualization") }}</h2>
-                       {% if lang == "de" %}
-                               <p>
-                                       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).
-                               </p>
-                       {% else %}
-                               <p>
-                                       For future planning it is important to know if there is enough hardware
-                                       support for virtualization like VT-x and AMD-V.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(cpus_virt, sortby="percentage") %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-stats-cpus.html b/templates/stasy-stats-cpus.html
deleted file mode 100644 (file)
index 146db32..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Processors") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Hardware: CPUs") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <a href="/stats/cpuflags">{{ _("See statistics about common CPU flags") }}</a>
-                       <hr>
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("Vendors") }}</h2>
-                       {% if lang == "de" %}
-                               <p>
-                                       Eine Aufstellung über den beliebtesten Prozessor-Hersteller:
-                               </p>
-                       {% else %}
-                               <p>
-                                       This chart shows us which vendors is the most favorite for the CPUs
-                                       used in IPFire.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(cpu_vendors, sortby="percentage") %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("Speed") }}</h2>
-                       <p>
-                               {{ _("The average speed of all systems in the database is: <strong>%.2f MHz</strong>.") % average_speed }}
-                               <br>
-                               {{ _("All together, there are <strong>%s bogomips</strong> out there.") % locale.friendly_number(bogomips) }}
-                       </p>
-                       {% module StasyTable(cpu_speeds) %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("CPU core counter") }}</h2>
-                       <p>
-                               {{ _("See a breakdown of the CPU cores that are installed on the IPFire systems.") }}
-                       </p>
-                       {% module StasyCPUCoreTable(cpu_cores) %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-stats-geo.html b/templates/stasy-stats-geo.html
deleted file mode 100644 (file)
index 865cc2a..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Geo locations") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Geo locations") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       Dieses Diagramm zeigt in welchem Land IPFire am häufigsten
-                                       eingesetzt wird.
-                               </p>
-                       {% else %}
-                               <p>
-                                       This chart shows us in which country IPFire is running.
-                               </p>
-                       {% end %}
-                       {% module StasyGeoTable(geo_locations) %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("Language selection") }}</h2>
-                       {% if lang == "de" %}
-                               <p>
-                                       Dies gibt einen Überblick über die Häufigkeit der ausgewählten
-                                       Sprachen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       This will give a short overview about what languages are configured
-                                       on the IPFire webinterface.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(languages, sortby="percentage", locale=True) %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-stats-memory.html b/templates/stasy-stats-memory.html
deleted file mode 100644 (file)
index 99db6e4..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Memory") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Memory") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <p>
-                               {{ _("The average amount of memory of all systems in the database is: <strong>%.2f MB</strong>.") % average_memory }}
-                       </p>
-                       {% module StasyTable(memory) %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-stats-network.html b/templates/stasy-stats-network.html
deleted file mode 100644 (file)
index d9c6651..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Network") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Network configuration") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       Diese Grafik zeigt uns die beliebteste Netzwerkkonfiguration.
-                               </p>
-                       {% else %}
-                               <p>
-                                       This chart shows us which is the most favourite network configuration.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(network_zones, sortby="percentage", percentage=True) %}
-               </div>
-       </div>
-{% end block %}
-
diff --git a/templates/stasy-stats-oses.html b/templates/stasy-stats-oses.html
deleted file mode 100644 (file)
index 489e2c6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Operating system") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Releases") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% module StasyTable(releases, sortby="percentage") %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("Architectures") }}</h2>
-                       {% module StasyTable(arches, sortby="percentage") %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h3>{{ _("Kernels") }}</h3>
-                       {% if lang == "de" %}
-                               <p>
-                                       Dies zeigt uns, welche Kernel am häufigsten verwendet werden.
-                               </p>
-                       {% else %}
-                               <p>
-                                       This chart gives an overview about what kernel the machines are
-                                       runnning.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(kernels, sortby="percentage") %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-stats-virtual.html b/templates/stasy-stats-virtual.html
deleted file mode 100644 (file)
index 0c039cf..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Virtualization") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Virtualization support") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire läuft hervorragend in virtuellen Umgebungen.
-                               </p>
-                               <p>
-                                       Dieser Graph gibt Aufschluss darüber, wieviele Systeme
-                                       virtuell laufen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire is running very well in a virtual environment.
-                               </p>
-                               <p>
-                                       See this chart to get a clue about how many machines are running
-                                       virtually.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(is_virtual, sortby="percentage") %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <h2>{{ _("Hypervisors") }}</h2>
-                       {% if lang == "de" %}
-                               <p>
-                                       Diese Systeme werden eingesetzt um IPFire zu virtualisieren:
-                               </p>
-                       {% else %}
-                               <p>
-                                       This is a list of all hypervisor vendors that IPFire is running on.
-                               </p>
-                       {% end %}
-                       {% module StasyTable(hypervisor_vendors, sortby="percentage") %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/stasy-stats.html b/templates/stasy-stats.html
deleted file mode 100644 (file)
index 18ebba4..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ _("Statistics") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("fireinfo statistics") }}</h1>
-       </div>
-
-       <ul class="thumbnails">
-           <li class="span4">
-               <div class="thumbnail">
-                               <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="">
-                               <div class="caption">
-                                       <h3>
-                                               <a href="/stats/oses">
-                                                       {{ _("IPFire versions") }}
-                                               </a>
-                                       </h3>
-                                       <p>
-                                               {% if lang == "de" %}
-                                                       Übersicht über die aktuell laufenden Versionen der
-                                                       IPFire Systeme.
-                                               {% else %}
-                                                       Get an overview over all currently running versions
-                                                       of IPFire.
-                                               {% end %}
-                                       </p>
-                               </div>
-                       </div>
-               </li>
-           <li class="span4">
-               <div class="thumbnail">
-                               <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="">
-                               <div class="caption">
-                                       <h3>
-                                               <a href="/stats/geo">
-                                                       {{ _("Geo locations") }}
-                                               </a>
-                                       </h3>
-                                       <p>
-                                               {% if lang == "de" %}
-                                                       Zeigt eine Verteilung über die Länder, in
-                                                       denen IPFire-Systeme laufen.
-                                               {% else %}
-                                                       Shows a plot from all the countries in which
-                                                       IPFire systems are running.
-                                               {% end %}
-                                       </p>
-                               </div>
-                       </div>
-               </li>
-           <li class="span4">
-               <div class="thumbnail">
-                               <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="">
-                               <div class="caption">
-                                       <h3>
-                                               <a href="/stats/cpus">
-                                                       {{ _("Hardware: CPUs") }}
-                                               </a>
-                                       </h3>
-                                       <p>
-                                               {% if lang == "de" %}
-                                                       Zeigt Informationen über die Prozessortypen,
-                                                       Hersteller und Geschwindigkeiten.
-                                               {% else %}
-                                                       Shows information about processor types, vendors
-                                                       and clock speeds.
-                                               {% end %}
-                                       </p>
-                                       <h4>
-                                               <a href="/stats/cpuflags">
-                                                       {{ _("CPU features") }}
-                                               </a>
-                                       </h4>
-                               </div>
-                       </div>
-               </li>
-           <li class="span4">
-               <div class="thumbnail">
-                               <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="">
-                               <div class="caption">
-                                       <h3>
-                                               <a href="/stats/memory">
-                                                       {{ _("Hardware: Memory") }}
-                                               </a>
-                                       </h3>
-                                       <p>
-                                               {% if lang == "de" %}
-                                                       Zeigt Informationen über die durchschnittlich
-                                                       verbaute Menge an Arbeitsspeicher und mehr.
-                                               {% else %}
-                                                       Shows information about the average installed
-                                                       amount of RAM.
-                                               {% end %}
-                                       </p>
-                               </div>
-                       </div>
-               </li>
-           <li class="span4">
-               <div class="thumbnail">
-                               <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="">
-                               <div class="caption">
-                                       <h3>
-                                               <a href="/stats/network">
-                                                       {{ _("Network") }}
-                                               </a>
-                                       </h3>
-                                       <p>
-                                               {% if lang == "de" %}
-                                                       Zeigt Grafiken über die beliebteste
-                                                       Netzwerkkonfiguration.
-                                               {% else %}
-                                                       Shows plots about the favourite network
-                                                       configurations.
-                                               {% end %}
-                                       </p>
-                               </div>
-                       </div>
-               </li>
-           <li class="span4">
-               <div class="thumbnail">
-                               <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="">
-                               <div class="caption">
-                                       <h3>
-                                               <a href="/stats/virtual">
-                                                       {{ _("Virtualization") }}
-                                               </a>
-                                       </h3>
-                                       <p>
-                                               {% if lang == "de" %}
-                                                       Welcher Hypervisor wird am häufigsten eingesetzt?
-                                                       Wieviele Systeme laufen in einer virtuellen
-                                                       Umgebung?
-                                               {% else %}
-                                                       Which hypervisor is the most common one?
-                                                       How many systems are running in a virtual
-                                                       environment?
-                                               {% end %}
-                                       </p>
-                               </div>
-                       </div>
-               </li>
-    </ul>
-{% end block %}
diff --git a/templates/stasy-vendor-detail.html b/templates/stasy-vendor-detail.html
deleted file mode 100644 (file)
index 779914e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "stasy-base-1.html" %}
-
-{% block title %}{{ vendor_name }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ vendor_name }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       Dies ist eine Aufstellung über alle Geräte von
-                                       <strong>{{ vendor_name }}</strong> in der Datenbank.
-                       {% else %}
-                               <p>
-                                       This is a list of all devices this database knows about from
-                                       <strong>{{ vendor_name }}</strong>.
-                               </p>
-                       {% end %}
-
-                       {% module StasyDeviceTable(models) %}
-               </div>
-       </div>
-{% end block %}
index d0a929333eefc3c06cdf6ca1c08b103e65c8bdaf..d54b48737574bb794a7e173a47f05a2fef341099 100644 (file)
@@ -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)