From: Michael Tremer Date: Thu, 7 Feb 2013 13:32:01 +0000 (+0000) Subject: Migrate all modules to newer versions of tornado. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b6308b08ac3e324267ad9479f1deaaae34fd47c;p=ipfire.org.git Migrate all modules to newer versions of tornado. --- diff --git a/templates/admin-downloads-mirrors.html b/templates/admin-downloads-mirrors.html index c83be773..629b7abf 100644 --- a/templates/admin-downloads-mirrors.html +++ b/templates/admin-downloads-mirrors.html @@ -5,9 +5,9 @@

{{ _("Download statistics") }}

{{ _("Mirror load from today") }}

- {{ modules.StasyTable(mirror_load_today, sortby="percentage") }} + {% module StasyTable(mirror_load_today, sortby="percentage") %}

{{ _("Mirror load") }}

- {{ modules.StasyTable(mirror_load_total, sortby="percentage") }} + {% module StasyTable(mirror_load_total, sortby="percentage") %} {% end %} diff --git a/templates/admin-downloads.html b/templates/admin-downloads.html index ea4d5b9f..2ce8aa0d 100644 --- a/templates/admin-downloads.html +++ b/templates/admin-downloads.html @@ -21,7 +21,7 @@

{{ _("Downloads by country") }}

- {{ modules.StasyGeoTable(downloads_locations_today) }} - {{ modules.StasyGeoTable(downloads_locations_total) }} + {% module StasyGeoTable(downloads_locations_today) %} + {% module StasyGeoTable(downloads_locations_total) %} {% end %} diff --git a/templates/base.html b/templates/base.html index 7ace976c..c5e813ff 100644 --- a/templates/base.html +++ b/templates/base.html @@ -35,7 +35,7 @@ {{ hostname }}
{% block menu %} - {{ modules.Menu() }} + {% module Menu() %} {% end block %}
diff --git a/templates/builds.html b/templates/builds.html deleted file mode 100644 index d3934c32..00000000 --- a/templates/builds.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Builds") }}{% end block %} - -{% block content %} -

{{ _("Nightly builds") }}

- - - - {% if builds["<12h"] %} - - - - {% for build in builds["<12h"] %} - {{ modules.Build(build) }} - {% end %} - {% end %} - - {% if builds[">12h"] %} - - - - {% for build in builds[">12h"] %} - {{ modules.Build(build) }} - {% end %} - {% end %} - - {% if builds[">24h"] %} - - - - {% for build in builds[">24h"] %} - {{ modules.Build(build) }} - {% end %} - {% end %} - -
- {{ _("Less than 12 hours ago") }} -
- {{ _("More than 12 hours ago") }} -
- {{ _("More than a day ago") }} -
-{% end block %} diff --git a/templates/download-splash.html b/templates/download-splash.html index f1665a01..8b540f51 100644 --- a/templates/download-splash.html +++ b/templates/download-splash.html @@ -56,7 +56,7 @@ - {{ modules.Advertisement("download-splash") }} + {% module Advertisement("download-splash") %}

{{ _("Next steps") }}

diff --git a/templates/downloads-all.html b/templates/downloads-all.html index 5d4f1147..855c1046 100644 --- a/templates/downloads-all.html +++ b/templates/downloads-all.html @@ -17,6 +17,6 @@
{% for release in releases %} - {{ modules.ReleaseItemShort(release) }} + {% module ReleaseItemShort(release) %} {% end %} {% end block %} diff --git a/templates/downloads-item.html b/templates/downloads-item.html index 8cbc8001..ed8348fd 100644 --- a/templates/downloads-item.html +++ b/templates/downloads-item.html @@ -3,5 +3,5 @@ {% block title %}Download {{ release.name }}{% end block %} {% block body %} - {{ modules.ReleaseItem(release, latest=latest) }} + {% module ReleaseItem(release, latest=latest) %} {% end block %} diff --git a/templates/downloads.html b/templates/downloads.html index fc0d7bf4..e0260c79 100644 --- a/templates/downloads.html +++ b/templates/downloads.html @@ -20,7 +20,7 @@
- {{ modules.DownloadButton(release) }} + {% module DownloadButton(release) %}
diff --git a/templates/mirrors.html b/templates/mirrors.html index 1937f80f..59f0f470 100644 --- a/templates/mirrors.html +++ b/templates/mirrors.html @@ -23,12 +23,12 @@ {% if preferred_mirrors %}

{{ _("Mirror servers nearby") }}

- {{ modules.MirrorsTable(preferred_mirrors) }} + {% module MirrorsTable(preferred_mirrors) %}

{{ _("Worldwide mirror servers") }}

- {{ modules.MirrorsTable(other_mirrors) }} + {% module MirrorsTable(other_mirrors) %} {% else %}

{{ _("Worldwide mirror servers") }}

- {{ modules.MirrorsTable(other_mirrors) }} + {% module MirrorsTable(other_mirrors) %} {% end %} {% end block %} diff --git a/templates/modules/release-item.html b/templates/modules/release-item.html index 27282491..c09f82cf 100644 --- a/templates/modules/release-item.html +++ b/templates/modules/release-item.html @@ -43,7 +43,7 @@
- {{ modules.DownloadButton(release) }} + {% module DownloadButton(release) %}
{% if not release.stable %} diff --git a/templates/news-item.html b/templates/news-item.html index afcdca47..0f93e0b2 100644 --- a/templates/news-item.html +++ b/templates/news-item.html @@ -7,5 +7,5 @@

{{ item.title }}

- {{ modules.NewsItem(item, show_heading=False) }} + {% module NewsItem(item, show_heading=False) %} {% end block %} diff --git a/templates/news-year.html b/templates/news-year.html index f51e07e0..e7df6f16 100644 --- a/templates/news-year.html +++ b/templates/news-year.html @@ -7,9 +7,9 @@

{{ _("News from %(year)s") % { "year" : selected_year } }}

- {{ modules.NewsYearNavigation(selected_year) }} + {% module NewsYearNavigation(selected_year) %}
- {{ modules.NewsTable(news) }} + {% module NewsTable(news) %} {% end block %} diff --git a/templates/news.html b/templates/news.html index 281f1aae..ac1e9ab4 100644 --- a/templates/news.html +++ b/templates/news.html @@ -83,11 +83,11 @@

{{ _("Latest news") }}

- {{ modules.NewsTable(news) }} + {% module NewsTable(news) %}
- {{ modules.NewsYearNavigation() }} + {% module NewsYearNavigation() %} {% end block %} diff --git a/templates/planet-main.html b/templates/planet-main.html index c0338ae5..c124b6a9 100644 --- a/templates/planet-main.html +++ b/templates/planet-main.html @@ -33,7 +33,7 @@ {% for entry in entries %} - {{ modules.PlanetEntry(entry) }} + {% module PlanetEntry(entry) %} {% end %}
diff --git a/templates/planet-user.html b/templates/planet-user.html index e7c6ebe1..1ba3f71d 100644 --- a/templates/planet-user.html +++ b/templates/planet-user.html @@ -9,7 +9,7 @@ {% if entries %} {% for entry in entries %} - {{ modules.PlanetEntry(entry, show_avatar=False) }} + {% module PlanetEntry(entry, show_avatar=False) %} {% end %}
diff --git a/templates/stasy-profile-detail.html b/templates/stasy-profile-detail.html index 74c95940..de98f68b 100644 --- a/templates/stasy-profile-detail.html +++ b/templates/stasy-profile-detail.html @@ -209,7 +209,7 @@ {% if profile.devices %}

{{ _("Peripherial devices") }}

- {{ modules.StasyDeviceTable(profile.devices) }} + {% module StasyDeviceTable(profile.devices) %}
{% end %} diff --git a/templates/stasy-stats-cpu-flags.html b/templates/stasy-stats-cpu-flags.html index 2afa62e2..94ed2c68 100644 --- a/templates/stasy-stats-cpu-flags.html +++ b/templates/stasy-stats-cpu-flags.html @@ -37,7 +37,7 @@ How many CPUs support the 64-bit architecture?

{% end %} - {{ modules.StasyTable(cpus_lm, sortby="percentage") }} + {% module StasyTable(cpus_lm, sortby="percentage") %}
@@ -53,7 +53,7 @@ This chart shows us which CPUs have got the PAE flag.

{% end %} - {{ modules.StasyTable(cpus_pae, sortby="percentage") }} + {% module StasyTable(cpus_pae, sortby="percentage") %} @@ -72,7 +72,7 @@ support for virtualization like VT-x and AMD-V.

{% end %} - {{ modules.StasyTable(cpus_virt, sortby="percentage") }} + {% module StasyTable(cpus_virt, sortby="percentage") %} {% end block %} diff --git a/templates/stasy-stats-cpus.html b/templates/stasy-stats-cpus.html index d2136343..146db32d 100644 --- a/templates/stasy-stats-cpus.html +++ b/templates/stasy-stats-cpus.html @@ -27,7 +27,7 @@ used in IPFire.

{% end %} - {{ modules.StasyTable(cpu_vendors, sortby="percentage") }} + {% module StasyTable(cpu_vendors, sortby="percentage") %} @@ -39,7 +39,7 @@
{{ _("All together, there are %s bogomips out there.") % locale.friendly_number(bogomips) }}

- {{ modules.StasyTable(cpu_speeds) }} + {% module StasyTable(cpu_speeds) %} @@ -49,7 +49,7 @@

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

- {{ modules.StasyCPUCoreTable(cpu_cores) }} + {% module StasyCPUCoreTable(cpu_cores) %} {% end block %} diff --git a/templates/stasy-stats-geo.html b/templates/stasy-stats-geo.html index d6ad0774..865cc2a5 100644 --- a/templates/stasy-stats-geo.html +++ b/templates/stasy-stats-geo.html @@ -19,7 +19,7 @@ This chart shows us in which country IPFire is running.

{% end %} - {{ modules.StasyGeoTable(geo_locations) }} + {% module StasyGeoTable(geo_locations) %} @@ -37,7 +37,7 @@ on the IPFire webinterface.

{% end %} - {{ modules.StasyTable(languages, sortby="percentage", locale=True) }} + {% module StasyTable(languages, sortby="percentage", locale=True) %} {% end block %} diff --git a/templates/stasy-stats-memory.html b/templates/stasy-stats-memory.html index ad5429f4..99db6e4f 100644 --- a/templates/stasy-stats-memory.html +++ b/templates/stasy-stats-memory.html @@ -12,7 +12,7 @@

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

- {{ modules.StasyTable(memory) }} + {% module StasyTable(memory) %} {% end block %} diff --git a/templates/stasy-stats-network.html b/templates/stasy-stats-network.html index 148e66f5..d9c66516 100644 --- a/templates/stasy-stats-network.html +++ b/templates/stasy-stats-network.html @@ -18,7 +18,7 @@ This chart shows us which is the most favourite network configuration.

{% end %} - {{ modules.StasyTable(network_zones, sortby="percentage", percentage=True) }} + {% module StasyTable(network_zones, sortby="percentage", percentage=True) %} {% end block %} diff --git a/templates/stasy-stats-oses.html b/templates/stasy-stats-oses.html index 45000d34..489e2c6b 100644 --- a/templates/stasy-stats-oses.html +++ b/templates/stasy-stats-oses.html @@ -9,14 +9,14 @@
- {{ modules.StasyTable(releases, sortby="percentage") }} + {% module StasyTable(releases, sortby="percentage") %}

{{ _("Architectures") }}

- {{ modules.StasyTable(arches, sortby="percentage") }} + {% module StasyTable(arches, sortby="percentage") %}
@@ -33,7 +33,7 @@ runnning.

{% end %} - {{ modules.StasyTable(kernels, sortby="percentage") }} + {% module StasyTable(kernels, sortby="percentage") %} {% end block %} diff --git a/templates/stasy-stats-virtual.html b/templates/stasy-stats-virtual.html index b4101a12..0c039cfb 100644 --- a/templates/stasy-stats-virtual.html +++ b/templates/stasy-stats-virtual.html @@ -26,7 +26,7 @@ virtually.

{% end %} - {{ modules.StasyTable(is_virtual, sortby="percentage") }} + {% module StasyTable(is_virtual, sortby="percentage") %} @@ -42,7 +42,7 @@ This is a list of all hypervisor vendors that IPFire is running on.

{% end %} - {{ modules.StasyTable(hypervisor_vendors, sortby="percentage") }} + {% module StasyTable(hypervisor_vendors, sortby="percentage") %} {% end block %} diff --git a/templates/stasy-vendor-detail.html b/templates/stasy-vendor-detail.html index dc14d145..779914ef 100644 --- a/templates/stasy-vendor-detail.html +++ b/templates/stasy-vendor-detail.html @@ -20,7 +20,7 @@

{% end %} - {{ modules.StasyDeviceTable(models) }} + {% module StasyDeviceTable(models) %} {% end block %} diff --git a/templates/static/donation.html b/templates/static/donation.html index 3e1bd064..f2cce6d7 100644 --- a/templates/static/donation.html +++ b/templates/static/donation.html @@ -55,7 +55,7 @@
- {{ modules.DonationBox() }} + {% module DonationBox() %}
diff --git a/templates/tracker-torrent-detail.html b/templates/tracker-torrent-detail.html index a4d8c52d..09f1c32a 100644 --- a/templates/tracker-torrent-detail.html +++ b/templates/tracker-torrent-detail.html @@ -21,11 +21,11 @@ {% if peers %}

{{ _("Peers") }}

- {{ modules.TrackerPeerList(peers, percentages=True) }} + {% module TrackerPeerList(peers, percentages=True) %} {% end %} {% if seeds %}

{{ _("Seeds") }}

- {{ modules.TrackerPeerList(seeds) }} + {% module TrackerPeerList(seeds) %} {% end %} {% end block %} diff --git a/templates/wishlist/closed.html b/templates/wishlist/closed.html index 45f0857c..5eaaac1f 100644 --- a/templates/wishlist/closed.html +++ b/templates/wishlist/closed.html @@ -26,7 +26,7 @@
{% if wishes %} - {{ modules.Wishlist(wishes) }} + {% module Wishlist(wishes) %}
diff --git a/templates/wishlist/donate.html b/templates/wishlist/donate.html index f3290598..71685627 100644 --- a/templates/wishlist/donate.html +++ b/templates/wishlist/donate.html @@ -32,7 +32,7 @@
- {{ modules.DonationBox(wish.tag) }} + {% module DonationBox(wish.tag) %}
{% end block %} diff --git a/templates/wishlist/index.html b/templates/wishlist/index.html index daf86cea..360237dc 100644 --- a/templates/wishlist/index.html +++ b/templates/wishlist/index.html @@ -36,7 +36,7 @@
{% if wishes %} - {{ modules.Wishlist(wishes) }} + {% module Wishlist(wishes) %} {% else %}
{% if lang == "de" %} diff --git a/templates/wishlist/modules/wishlist.html b/templates/wishlist/modules/wishlist.html index f5d1f1c7..6d371016 100644 --- a/templates/wishlist/modules/wishlist.html +++ b/templates/wishlist/modules/wishlist.html @@ -1,5 +1,5 @@
    {% for wish in wishes %} - {{ modules.Wish(wish, short=short) }} + {% module Wish(wish, short=short) %} {% end %}
diff --git a/templates/wishlist/wish.html b/templates/wishlist/wish.html index 9281b2a7..ee7fcc59 100644 --- a/templates/wishlist/wish.html +++ b/templates/wishlist/wish.html @@ -7,7 +7,7 @@

{{ wish.title }}

- {{ modules.Wishlist([wish,], short=True) }} + {% module Wishlist([wish,], short=True) %} {{ wish.description }}