Migrate all modules to newer versions of tornado.

diff --git a/templates/admin-downloads-mirrors.html b/templates/admin-downloads-mirrors.html
index c83be77365cae8b6676510c69ebffa60ecdc592a..629b7abfcd6cbd078e5a5f9da3db7aa2d03baead 100644 (file)
--- a/templates/admin-downloads-mirrors.html
+++ b/templates/admin-downloads-mirrors.html
@@ -5,9 +5,9 @@
                <h3>{{ _("Download statistics") }}</h3>
 
                <h4>{{ _("Mirror load from today") }}</h4>
-               {{ modules.StasyTable(mirror_load_today, sortby="percentage") }}
+               {% module StasyTable(mirror_load_today, sortby="percentage") %}
 
                <h4>{{ _("Mirror load") }}</h4>
-               {{ modules.StasyTable(mirror_load_total, sortby="percentage") }}
+               {% module StasyTable(mirror_load_total, sortby="percentage") %}
        </div>
 {% end %}

diff --git a/templates/admin-downloads.html b/templates/admin-downloads.html
index ea4d5b9fb429c09d9ca8c03ff938cf4871424637..2ce8aa0d3d6dff41b036dc898a0d0bf378d4e85d 100644 (file)
--- a/templates/admin-downloads.html
+++ b/templates/admin-downloads.html
@@ -21,7 +21,7 @@
                </table>
 
                <h4>{{ _("Downloads by country") }}</h4>
-               {{ modules.StasyGeoTable(downloads_locations_today) }}
-               {{ modules.StasyGeoTable(downloads_locations_total) }}
+               {% module StasyGeoTable(downloads_locations_today) %}
+               {% module StasyGeoTable(downloads_locations_total) %}
        </div>
 {% end %}

diff --git a/templates/base.html b/templates/base.html
index 7ace976c0b0031dce6b59c2499f6ca86ed843aa0..c5e813ffa6a1448f1bbb3474355071d86425989e 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -35,7 +35,7 @@
                                        <a class="brand" href="/">{{ hostname }}</a>
                                        <div class="nav-collapse">
                                                {% block menu %}
-                                                       {{ modules.Menu() }}
+                                                       {% module Menu() %}
                                                {% end block %}
                                        </div>
                                </div>

diff --git a/templates/builds.html b/templates/builds.html
deleted file mode 100644 (file)
index d3934c3..0000000
--- a/templates/builds.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ _("Builds") }}{% end block %}
-
-{% block content %}
-       <h3>{{ _("Nightly builds") }}</h3>
-
-       <table id="builds">
-               <tbody>
-                       {% if builds["<12h"] %}
-                               <tr class="headline">
-                                       <td colspan="3">
-                                               {{ _("Less than 12 hours ago") }}
-                                       </td>
-                               </tr>
-                               {% for build in builds["<12h"] %}
-                                       {{ modules.Build(build) }}
-                               {% end %}
-                       {% end %}
-                       
-                       {% if builds[">12h"] %}
-                               <tr class="headline">
-                                       <td colspan="3">
-                                               {{ _("More than 12 hours ago") }}
-                                       </td>
-                               </tr>
-                               {% for build in builds[">12h"] %}
-                                       {{ modules.Build(build) }}
-                               {% end %}
-                       {% end %}
-                       
-                       {% if builds[">24h"] %}
-                               <tr class="headline">
-                                       <td colspan="3">
-                                               {{ _("More than a day ago") }}
-                                       </td>
-                               </tr>
-                               {% for build in builds[">24h"] %}
-                                       {{ modules.Build(build) }}
-                               {% end %}
-                       {% end %}
-               </tbody>
-       </table>
-{% end block %}

diff --git a/templates/download-splash.html b/templates/download-splash.html
index f1665a0172b2c16b86157fb5a8ee96a0d2fe303b..8b540f51d30dc5ffbbea213e5b653eec5559e151 100644 (file)
--- a/templates/download-splash.html
+++ b/templates/download-splash.html
@@ -56,7 +56,7 @@
                </div>
        </div>
 
-       {{ modules.Advertisement("download-splash") }}
+       {% module Advertisement("download-splash") %}
 
        <h3>{{ _("Next steps") }}</h3>
        <div class="row">

diff --git a/templates/downloads-all.html b/templates/downloads-all.html
index 5d4f1147775d29ef52032ddf838d12274b7c19e9..855c10463e87cad372d10c5c54c967d2ca7ef7b3 100644 (file)
--- a/templates/downloads-all.html
+++ b/templates/downloads-all.html
@@ -17,6 +17,6 @@
        </div>
        
        {% 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 8cbc80014bbfd1270d8fe5bde38183a97961dd88..ed8348fd4e42ece4758210973e131a4a66e62e40 100644 (file)
--- 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 fc0d7bf4725168e4fc8aaa48fd01f1b21ca67d44..e0260c791b596a01deae49b8b7d48248587f696e 100644 (file)
--- a/templates/downloads.html
+++ b/templates/downloads.html
@@ -20,7 +20,7 @@
 
                                                <hr>
 
-                                               {{ modules.DownloadButton(release) }}
+                                               {% module DownloadButton(release) %}
                                                <br>
 
                                                <a href="http://downloads.ipfire.org/latest">

diff --git a/templates/mirrors.html b/templates/mirrors.html
index 1937f80f6882afed68f56bf6be085bcfcbc777fc..59f0f470cc980e355e57586e961300a5e5cea6c8 100644 (file)
--- a/templates/mirrors.html
+++ b/templates/mirrors.html
@@ -23,12 +23,12 @@
 
        {% if preferred_mirrors %}
                <h2>{{ _("Mirror servers nearby") }}</h2>
-               {{ modules.MirrorsTable(preferred_mirrors) }}
+               {% module MirrorsTable(preferred_mirrors) %}
 
                <h2>{{ _("Worldwide mirror servers") }}</h2>
-               {{ modules.MirrorsTable(other_mirrors) }}
+               {% module MirrorsTable(other_mirrors) %}
        {% else %}
                <h2>{{ _("Worldwide mirror servers") }}</h2>
-               {{ 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 272824911a3f5290ba5124081fa6a204b9929507..c09f82cfe495b45eb46ac53650cbcb5fbab1ad01 100644 (file)
--- a/templates/modules/release-item.html
+++ b/templates/modules/release-item.html
@@ -43,7 +43,7 @@
                                <hr>
 
                                <div class="ac">
-                                       {{ modules.DownloadButton(release) }}
+                                       {% module DownloadButton(release) %}
                                </div>
 
                                {% if not release.stable %}

diff --git a/templates/news-item.html b/templates/news-item.html
index afcdca474ca95fd7d702855f7b7950f424866d6f..0f93e0b219c41660fca08fd0ff0bfe47c465fd87 100644 (file)
--- a/templates/news-item.html
+++ b/templates/news-item.html
@@ -7,5 +7,5 @@
                <h1>{{ item.title }}</h1>
        </div>
 
-       {{ 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 f51e07e0b0319372f162cdbde077856cb3762bc5..e7df6f166ed02b2fd2e42d4707cad8a5670c9932 100644 (file)
--- a/templates/news-year.html
+++ b/templates/news-year.html
@@ -7,9 +7,9 @@
                <h1>{{ _("News from %(year)s") % { "year" : selected_year } }}</h1>
        </div>
 
-       {{ modules.NewsYearNavigation(selected_year) }}
+       {% module NewsYearNavigation(selected_year) %}
 
        <hr>
 
-       {{ modules.NewsTable(news) }}
+       {% module NewsTable(news) %}
 {% end block %}

diff --git a/templates/news.html b/templates/news.html
index 281f1aae03644e37c120390ed168059de7738c62..ac1e9ab45f656b31903ee2cec5ec7f8b638d9a68 100644 (file)
--- a/templates/news.html
+++ b/templates/news.html
@@ -83,11 +83,11 @@
        <div class="row">
                <div class="span6 offset3">
                        <h3>{{ _("Latest news") }}</h3>
-                       {{ modules.NewsTable(news) }}
+                       {% module NewsTable(news) %}
                </div>
        </div>
 
        <hr>
 
-       {{ modules.NewsYearNavigation() }}
+       {% module NewsYearNavigation() %}
 {% end block %}

diff --git a/templates/planet-main.html b/templates/planet-main.html
index c0338ae5bc678ced498194973be21f1de7cdb90f..c124b6a9e6eaff203f2f61b5c16472b0233b4620 100644 (file)
--- a/templates/planet-main.html
+++ b/templates/planet-main.html
@@ -33,7 +33,7 @@
        </div>
 
        {% for entry in entries %}
-               {{ modules.PlanetEntry(entry) }}
+               {% module PlanetEntry(entry) %}
        {% end %}
 
        <div class="row">

diff --git a/templates/planet-user.html b/templates/planet-user.html
index e7c6ebe1a8178ec60c2fe25f3932c60d9dc6ed3d..1ba3f71d56a18d75d682312f039d4aa92ce43886 100644 (file)
--- 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 %}
 
                <div class="row">

diff --git a/templates/stasy-profile-detail.html b/templates/stasy-profile-detail.html
index 74c95940ba743dc021de4cfa033cc30b013413e3..de98f68b90097571b80a6cec70adbfb058fe7937 100644 (file)
--- a/templates/stasy-profile-detail.html
+++ b/templates/stasy-profile-detail.html
@@ -209,7 +209,7 @@
 
        {% if profile.devices %}
                <h3>{{ _("Peripherial devices") }}</h3>
-               {{ modules.StasyDeviceTable(profile.devices) }}
+               {% module StasyDeviceTable(profile.devices) %}
                <hr>
        {% end %}
 

diff --git a/templates/stasy-stats-cpu-flags.html b/templates/stasy-stats-cpu-flags.html
index 2afa62e27eee469ecc6ccfa9cd28fe55457032b2..94ed2c6841a719b403d500e52cd5b3ce10b9cfe2 100644 (file)
--- 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?
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(cpus_lm, sortby="percentage") }}
+                       {% module StasyTable(cpus_lm, sortby="percentage") %}
                </div>
        </div>
 
@@ -53,7 +53,7 @@
                                        This chart shows us which CPUs have got the PAE flag.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(cpus_pae, sortby="percentage") }}
+                       {% module StasyTable(cpus_pae, sortby="percentage") %}
                </div>
        </div>
 
@@ -72,7 +72,7 @@
                                        support for virtualization like VT-x and AMD-V.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(cpus_virt, sortby="percentage") }}
+                       {% module StasyTable(cpus_virt, sortby="percentage") %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/stasy-stats-cpus.html b/templates/stasy-stats-cpus.html
index d2136343dd762bf2672aa83387bc24b133f184f8..146db32d9be82f1c4a8abefd1719a18316f67018 100644 (file)
--- a/templates/stasy-stats-cpus.html
+++ b/templates/stasy-stats-cpus.html
@@ -27,7 +27,7 @@
                                        used in IPFire.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(cpu_vendors, sortby="percentage") }}
+                       {% module StasyTable(cpu_vendors, sortby="percentage") %}
                </div>
        </div>
 
@@ -39,7 +39,7 @@
                                <br>
                                {{ _("All together, there are <strong>%s bogomips</strong> out there.") % locale.friendly_number(bogomips) }}
                        </p>
-                       {{ modules.StasyTable(cpu_speeds) }}
+                       {% module StasyTable(cpu_speeds) %}
                </div>
        </div>
 
@@ -49,7 +49,7 @@
                        <p>
                                {{ _("See a breakdown of the CPU cores that are installed on the IPFire systems.") }}
                        </p>
-                       {{ modules.StasyCPUCoreTable(cpu_cores) }}
+                       {% module StasyCPUCoreTable(cpu_cores) %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/stasy-stats-geo.html b/templates/stasy-stats-geo.html
index d6ad0774d607ef479a36bfac3b34bb15677518c5..865cc2a5e3625640e1050741d32fdddf0d99a3a1 100644 (file)
--- 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.
                                </p>
                        {% end %}
-                       {{ modules.StasyGeoTable(geo_locations) }}
+                       {% module StasyGeoTable(geo_locations) %}
                </div>
        </div>
 
@@ -37,7 +37,7 @@
                                        on the IPFire webinterface.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(languages, sortby="percentage", locale=True) }}
+                       {% 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
index ad5429f475772622fc2627120fb3464df71c68a7..99db6e4fca78dfdd88ac8bf17e98de51ff7eaead 100644 (file)
--- a/templates/stasy-stats-memory.html
+++ b/templates/stasy-stats-memory.html
@@ -12,7 +12,7 @@
                        <p>
                                {{ _("The average amount of memory of all systems in the database is: <strong>%.2f MB</strong>.") % average_memory }}
                        </p>
-                       {{ modules.StasyTable(memory) }}
+                       {% module StasyTable(memory) %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/stasy-stats-network.html b/templates/stasy-stats-network.html
index 148e66f53a3bf222b519c61c87f11d36839b9f3b..d9c665162c5f22987ffd17758bc4e125523f0e8d 100644 (file)
--- 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.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(network_zones, sortby="percentage", percentage=True) }}
+                       {% 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
index 45000d349555cfd9d8c888963c02861c9d186938..489e2c6b8f5c0e76308287b6e556ac075e5d279d 100644 (file)
--- a/templates/stasy-stats-oses.html
+++ b/templates/stasy-stats-oses.html
@@ -9,14 +9,14 @@
 
        <div class="row">
                <div class="span12">
-                       {{ modules.StasyTable(releases, sortby="percentage") }}
+                       {% module StasyTable(releases, sortby="percentage") %}
                </div>
        </div>
 
        <div class="row">
                <div class="span12">
                        <h2>{{ _("Architectures") }}</h2>
-                       {{ modules.StasyTable(arches, sortby="percentage") }}
+                       {% module StasyTable(arches, sortby="percentage") %}
                </div>
        </div>
 
@@ -33,7 +33,7 @@
                                        runnning.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(kernels, sortby="percentage") }}
+                       {% module StasyTable(kernels, sortby="percentage") %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/stasy-stats-virtual.html b/templates/stasy-stats-virtual.html
index b4101a12ac485f660c8d960914df1e9f6bf8b493..0c039cfb4577bfa2f33a7fedfb54fc7be77ebf3c 100644 (file)
--- a/templates/stasy-stats-virtual.html
+++ b/templates/stasy-stats-virtual.html
@@ -26,7 +26,7 @@
                                        virtually.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(is_virtual, sortby="percentage") }}
+                       {% module StasyTable(is_virtual, sortby="percentage") %}
                </div>
        </div>
 
@@ -42,7 +42,7 @@
                                        This is a list of all hypervisor vendors that IPFire is running on.
                                </p>
                        {% end %}
-                       {{ modules.StasyTable(hypervisor_vendors, sortby="percentage") }}
+                       {% module StasyTable(hypervisor_vendors, sortby="percentage") %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/stasy-vendor-detail.html b/templates/stasy-vendor-detail.html
index dc14d145dac046074df9d9cbfbeca2661fd918b0..779914ef620e1a93f434b41f0c34cf29e7d163b7 100644 (file)
--- a/templates/stasy-vendor-detail.html
+++ b/templates/stasy-vendor-detail.html
@@ -20,7 +20,7 @@
                                </p>
                        {% end %}
 
-                       {{ modules.StasyDeviceTable(models) }}
+                       {% module StasyDeviceTable(models) %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/static/donation.html b/templates/static/donation.html
index 3e1bd0642485b586c7ec88a644bcb29f0e231f7d..f2cce6d7f58e452eb0719120600344af5a170bb3 100644 (file)
--- a/templates/static/donation.html
+++ b/templates/static/donation.html
@@ -55,7 +55,7 @@
 
        <div class="row">
                <div class="span10 offset1">
-                       {{ modules.DonationBox() }}
+                       {% module DonationBox() %}
 
                        <hr>
 

diff --git a/templates/tracker-torrent-detail.html b/templates/tracker-torrent-detail.html
index a4d8c52da0123b259fcd4bd3535ddceefcb20d43..09f1c32a86a8b6253b1819d123cb29473dbf5f1a 100644 (file)
--- a/templates/tracker-torrent-detail.html
+++ b/templates/tracker-torrent-detail.html
@@ -21,11 +21,11 @@
 
        {% if peers %}
                <h3>{{ _("Peers") }}</h3>
-               {{ modules.TrackerPeerList(peers, percentages=True) }}
+               {% module TrackerPeerList(peers, percentages=True) %}
        {% end %}
 
        {% if seeds %}
                <h3>{{ _("Seeds") }}</h3>
-               {{ modules.TrackerPeerList(seeds) }}
+               {% module TrackerPeerList(seeds) %}
        {% end %}
 {% end block %}

diff --git a/templates/wishlist/closed.html b/templates/wishlist/closed.html
index 45f0857c518575822b508d5d4129b48544b0c8cf..5eaaac1f0566c32512b72f86a0c008f00052f314 100644 (file)
--- a/templates/wishlist/closed.html
+++ b/templates/wishlist/closed.html
@@ -26,7 +26,7 @@
        <hr>
 
        {% if wishes %}
-               {{ modules.Wishlist(wishes) }}
+               {% module Wishlist(wishes) %}
 
                <hr>
 

diff --git a/templates/wishlist/donate.html b/templates/wishlist/donate.html
index f32905988d3bfeee4820a8e4d0176e7fddf80d04..71685627c2d63fdd496a988d5df626a82ed8805a 100644 (file)
--- a/templates/wishlist/donate.html
+++ b/templates/wishlist/donate.html
@@ -32,7 +32,7 @@
 
        <div class="row">
                <div class="span10 offset1">
-                       {{ modules.DonationBox(wish.tag) }}
+                       {% module DonationBox(wish.tag) %}
                </div>
        </div>
 {% end block %}

diff --git a/templates/wishlist/index.html b/templates/wishlist/index.html
index daf86cea556e768544e8e856837fbddcf675601b..360237dcec1acef0c310f2a63a12401cfb20463b 100644 (file)
--- a/templates/wishlist/index.html
+++ b/templates/wishlist/index.html
@@ -36,7 +36,7 @@
        <hr>
 
        {% if wishes %}
-               {{ modules.Wishlist(wishes) }}
+               {% module Wishlist(wishes) %}
        {% else %}
                <div class="alert alert-error ac">
                        {% if lang == "de" %}

diff --git a/templates/wishlist/modules/wishlist.html b/templates/wishlist/modules/wishlist.html
index f5d1f1c7505cb1b976b6dae70d39ce3913e63c87..6d3710160060f4d59e8ffeab06d4e32ddb06df70 100644 (file)
--- a/templates/wishlist/modules/wishlist.html
+++ b/templates/wishlist/modules/wishlist.html
@@ -1,5 +1,5 @@
 <ul class="thumbnails wishes">
        {% for wish in wishes %}
-               {{ modules.Wish(wish, short=short) }}
+               {% module Wish(wish, short=short) %}
        {% end %}
 </ul>

diff --git a/templates/wishlist/wish.html b/templates/wishlist/wish.html
index 9281b2a727264d6f23a49024c6180aec589c45f1..ee7fcc5935fa355e37e498e2059203f15fef6fd3 100644 (file)
--- a/templates/wishlist/wish.html
+++ b/templates/wishlist/wish.html
@@ -7,7 +7,7 @@
                <h1>{{ wish.title }}</h1>
        </div>
 
-       {{ modules.Wishlist([wish,], short=True) }}
+       {% module Wishlist([wish,], short=True) %}
 
        {{ wish.description }}