From: Michael Tremer Date: Sun, 28 Oct 2012 19:55:42 +0000 (+0100) Subject: Update modules for new tornado version. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6be289d27d6a89fbf97d526f78c72c04894d93;p=pbs.git Update modules for new tornado version. --- diff --git a/data/templates/base.html b/data/templates/base.html index a025de44..70072b46 100644 --- a/data/templates/base.html +++ b/data/templates/base.html @@ -192,7 +192,7 @@
{% block body %}EMPTY BODY{% end block %} - {{ modules.Footer() }} + {% module Footer() %}
{% end block %} diff --git a/data/templates/build-bugs.html b/data/templates/build-bugs.html index 772ab38f..f3ddd8b7 100644 --- a/data/templates/build-bugs.html +++ b/data/templates/build-bugs.html @@ -21,13 +21,13 @@ - {{ modules.BuildHeadline(_("Bug list"), build, short=True) }} + {% module BuildHeadline(_("Bug list"), build, short=True) %}
{% if fixed_bugs %}

{{ _("Fixed bugs") }}

- {{ modules.BugsTable(pkg, fixed_bugs) }} + {% module BugsTable(pkg, fixed_bugs) %} {% else %}

{{ _("No bugs here, yet.") }} diff --git a/data/templates/build-delete.html b/data/templates/build-delete.html index 93e0cb25..72d55655 100644 --- a/data/templates/build-delete.html +++ b/data/templates/build-delete.html @@ -25,7 +25,7 @@ - {{ modules.BuildHeadline(_("Build"), build) }} + {% module BuildHeadline(_("Build"), build) %}

diff --git a/data/templates/build-detail.html b/data/templates/build-detail.html index 008608b0..81908798 100644 --- a/data/templates/build-detail.html +++ b/data/templates/build-detail.html @@ -21,9 +21,9 @@ - {{ modules.BuildHeadline(_("Build"), build) }} - {{ modules.BuildStateWarnings(build) }} - {{ modules.PackageHeader(pkg) }} + {% module BuildHeadline(_("Build"), build) %} + {% module BuildStateWarnings(build) %} + {% module PackageHeader(pkg) %} {% if build.type == "scratch" and build.has_perm(current_user) %}
@@ -97,7 +97,7 @@ {% if build.message %} - {{ modules.Text(build.message) }} + {% module Text(build.message) %} {% end %} @@ -107,7 +107,7 @@
{% if bugs %} - {{ modules.BugsTable(pkg, bugs) }} + {% module BugsTable(pkg, bugs) %} {% else %}

{{ _("Nothing in here, yet.") }} @@ -181,7 +181,7 @@

- {{ modules.Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) }} + {% module Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) %} {% end %} {% if build.repo %} @@ -191,7 +191,7 @@
- {{ modules.Modal("build-unpush", build=build, repo=repo) }} + {% module Modal("build-unpush", build=build, repo=repo) %} {% end %}
{% elif build.can_move_forward %} @@ -224,16 +224,16 @@
- {{ modules.Modal("build-comment", build=build) }} + {% module Modal("build-comment", build=build) %} - {{ modules.WatchersSidebarTable(build, build.get_watchers()) }} + {% module WatchersSidebarTable(build, build.get_watchers()) %}
- {{ modules.Log(log) }} + {% module Log(log) %}
@@ -265,7 +265,7 @@
- {{ modules.JobsTable(build) }} + {% module JobsTable(build) %}
@@ -274,7 +274,7 @@
- {{ modules.JobsTable(build, build.test_jobs, type="test") }} + {% module JobsTable(build, build.test_jobs, type="test") %}
diff --git a/data/templates/build-index.html b/data/templates/build-index.html index 9c1d1a9f..d9308c4e 100644 --- a/data/templates/build-index.html +++ b/data/templates/build-index.html @@ -4,7 +4,7 @@ {% block body %}

{{ _("Build list") }}

- {{ modules.BuildTable(builds, show_user=True) }} + {% module BuildTable(builds, show_user=True) %} {% end block %} {% block sidebar %} diff --git a/data/templates/build-list.html b/data/templates/build-list.html index 8ef9751d..de770c59 100644 --- a/data/templates/build-list.html +++ b/data/templates/build-list.html @@ -6,7 +6,7 @@ {% block body %}

{{ _("Build job list") }}

- {{ modules.BuildTable(builds, show_user=True) }} + {% module BuildTable(builds, show_user=True) %} {% end block %} {% block sidebar %} diff --git a/data/templates/build-queue.html b/data/templates/build-queue.html index c06fb37e..b970110a 100644 --- a/data/templates/build-queue.html +++ b/data/templates/build-queue.html @@ -10,7 +10,7 @@

{% if jobs %} - {{ modules.JobsList(jobs) }} + {% module JobsList(jobs) %} {% else %} {{ _("No jobs to do.") }} {% end %} diff --git a/data/templates/build-schedule-test.html b/data/templates/build-schedule-test.html index 72f65067..ca5929f5 100644 --- a/data/templates/build-schedule-test.html +++ b/data/templates/build-schedule-test.html @@ -43,7 +43,7 @@ {{ _("The build job will be started when a build slot is available but not before the given time.") }}

- {{ modules.BuildOffset() }} + {% module BuildOffset() %} {% end block %} diff --git a/data/templates/builder-detail.html b/data/templates/builder-detail.html index 66627f01..c3777a9c 100644 --- a/data/templates/builder-detail.html +++ b/data/templates/builder-detail.html @@ -75,7 +75,7 @@ {% if builder.description %}

{{ _("Remarks") }}

- {{ modules.Text(builder.description) }} + {% module Text(builder.description) %}

{% end %} @@ -192,7 +192,7 @@

{{ _("Currently running builds on this host") }}

- {{ modules.JobsList(builder.get_active_jobs()) }} + {% module JobsList(builder.get_active_jobs()) %}
{% end %} @@ -200,7 +200,7 @@

{{ _("Log") }}

- {{ modules.Log(builder.get_history(limit=20)) }} + {% module Log(builder.get_history(limit=20)) %}
{% end block %} diff --git a/data/templates/builder-list.html b/data/templates/builder-list.html index 4831e1b6..647ca751 100644 --- a/data/templates/builder-list.html +++ b/data/templates/builder-list.html @@ -92,7 +92,7 @@
{% if log %}

{{ _("Log") }}

- {{ modules.Log(log) }} + {% module Log(log) %} {% end %}
diff --git a/data/templates/distro-detail.html b/data/templates/distro-detail.html index 304dbe40..ad38be4a 100644 --- a/data/templates/distro-detail.html +++ b/data/templates/distro-detail.html @@ -54,7 +54,7 @@ {{ _("Learn how to use them.") }} - {{ modules.RepositoryTable(distro, distro.repositories) }} + {% module RepositoryTable(distro, distro.repositories) %}
@@ -67,7 +67,7 @@ ({{ len(distro.sources) }}) - {{ modules.SourceTable(distro, distro.sources) }} + {% module SourceTable(distro, distro.sources) %} diff --git a/data/templates/distro-source-commit-detail.html b/data/templates/distro-source-commit-detail.html index 18f19a8d..837c94c9 100644 --- a/data/templates/distro-source-commit-detail.html +++ b/data/templates/distro-source-commit-detail.html @@ -67,7 +67,7 @@ {% if commit.message %} - {{ modules.Text(commit.message, pre=True) }} + {% module Text(commit.message, pre=True) %} {% end %} diff --git a/data/templates/distro-source-commits.html b/data/templates/distro-source-commits.html index d2bce9c4..246c0fbe 100644 --- a/data/templates/distro-source-commits.html +++ b/data/templates/distro-source-commits.html @@ -13,7 +13,7 @@

- {{ modules.CommitsTable(distro, source, commits) }} + {% module CommitsTable(distro, source, commits) %}
{% if offset %} diff --git a/data/templates/distro-source-detail.html b/data/templates/distro-source-detail.html index a0535c86..ff12252d 100644 --- a/data/templates/distro-source-detail.html +++ b/data/templates/distro-source-detail.html @@ -57,7 +57,7 @@

{{ _("Latest commits") }}

- {{ modules.CommitsTable(distro, source, commits) }} + {% module CommitsTable(distro, source, commits) %} {{ _("Show all commits") }} diff --git a/data/templates/distro-update-detail.html b/data/templates/distro-update-detail.html index 4c590bae..b2eb84f5 100644 --- a/data/templates/distro-update-detail.html +++ b/data/templates/distro-update-detail.html @@ -39,7 +39,7 @@
 

{{ _("Builds in this update") }}

- {{ modules.BuildTable(update.builds) }} + {% module BuildTable(update.builds) %} {% end block %} {% block sidebar %} diff --git a/data/templates/file-detail.html b/data/templates/file-detail.html index 9326ec30..0b60e3b7 100644 --- a/data/templates/file-detail.html +++ b/data/templates/file-detail.html @@ -109,7 +109,7 @@
 

{{ _("Files") }}

- {{ modules.PackageFilesTable(file.filelist) }} + {% module PackageFilesTable(file.filelist) %} {% end block %} {% block sidebar %} diff --git a/data/templates/index.html b/data/templates/index.html index f904eda3..e1e47f82 100644 --- a/data/templates/index.html +++ b/data/templates/index.html @@ -49,7 +49,7 @@
{% for type, updts, active in updates %}
- {{ modules.UpdatesTable(updts) }} + {% module UpdatesTable(updts) %}
{% end %}
@@ -71,7 +71,7 @@ {{ _("Ongoing build jobs") }} ({{ len(active_jobs) }}) - {{ modules.JobsList(active_jobs, show_builder=True) }} + {% module JobsList(active_jobs, show_builder=True) %} {% end %} @@ -85,7 +85,7 @@

{{ _("Lately processed jobs") }}

- {{ modules.JobsList(latest_jobs) }} + {% module JobsList(latest_jobs) %}
{% end %} diff --git a/data/templates/job-schedule-rebuild.html b/data/templates/job-schedule-rebuild.html index c5ea97a0..1687b25e 100644 --- a/data/templates/job-schedule-rebuild.html +++ b/data/templates/job-schedule-rebuild.html @@ -38,7 +38,7 @@ {{ _("The build job will be started when a build slot is available but not before the given time.") }}

- {{ modules.BuildOffset() }} + {% module BuildOffset() %}
{% end block %} diff --git a/data/templates/job-schedule-test.html b/data/templates/job-schedule-test.html index d86d4510..0e8dd357 100644 --- a/data/templates/job-schedule-test.html +++ b/data/templates/job-schedule-test.html @@ -44,7 +44,7 @@ {{ _("Please note, that all other kinds of build are preferred over the test builds.") }}

- {{ modules.BuildOffset() }} + {% module BuildOffset() %} {% end block %} diff --git a/data/templates/jobs-detail.html b/data/templates/jobs-detail.html index 67314fa0..7d716f67 100644 --- a/data/templates/jobs-detail.html +++ b/data/templates/jobs-detail.html @@ -182,7 +182,7 @@
- {{ modules.LogFilesTable(job, job.logfiles) }} + {% module LogFilesTable(job, job.logfiles) %}
@@ -201,7 +201,7 @@ ({{ len(job.packages) }}) - {{ modules.PackagesTable(job, job.packages) }} + {% module PackagesTable(job, job.packages) %} {% end %} @@ -212,7 +212,7 @@

{{ _("Log") }}

- {{ modules.Log(log) }} + {% module Log(log) %} {% end %} diff --git a/data/templates/log.html b/data/templates/log.html index e684a605..48a68fc0 100644 --- a/data/templates/log.html +++ b/data/templates/log.html @@ -3,5 +3,5 @@ {% block body %}

{{ _("Log") }}

- {{ modules.LogTable(log) }} + {% module LogTable(log) %} {% end %} diff --git a/data/templates/mirrors-list.html b/data/templates/mirrors-list.html index ed4d12ad..eb22a65d 100644 --- a/data/templates/mirrors-list.html +++ b/data/templates/mirrors-list.html @@ -88,7 +88,7 @@

{{ _("Log") }}

- {{ modules.Log(log) }} + {% module Log(log) %}
{% end block %} diff --git a/data/templates/modules/build-table.html b/data/templates/modules/build-table.html index 2610fbe9..2f1f2409 100644 --- a/data/templates/modules/build-table.html +++ b/data/templates/modules/build-table.html @@ -49,10 +49,10 @@ {% if show_user %} {% if build.type == "scratch" and build.user %} - {{ modules.Maintainer(build.user) }} + {% module Maintainer(build.user) %} {% elif build.type == "release" %} - {{ modules.Maintainer(build.pkg.maintainer) }} + {% module Maintainer(build.pkg.maintainer) %} {% else %}   {% end %} diff --git a/data/templates/modules/log-entry-comment.html b/data/templates/modules/log-entry-comment.html index 660c170d..d576ff11 100644 --- a/data/templates/modules/log-entry-comment.html +++ b/data/templates/modules/log-entry-comment.html @@ -12,7 +12,7 @@ {% block message %} {% if entry.get_message(current_user) %} - {{ modules.Text(entry.get_message(current_user), pre=False) }} + {% module Text(entry.get_message(current_user), pre=False) %} {% else %} {{ _("No comment given.") }} {% end %} diff --git a/data/templates/modules/log-entry.html b/data/templates/modules/log-entry.html index e9ad66b2..b7f90350 100644 --- a/data/templates/modules/log-entry.html +++ b/data/templates/modules/log-entry.html @@ -25,7 +25,7 @@ {% block message %}

- {{ modules.Text(entry.get_message(current_user), pre=False) }} + {% module Text(entry.get_message(current_user), pre=False) %}

{% end block %} diff --git a/data/templates/modules/log.html b/data/templates/modules/log.html index 92d22451..33f46119 100644 --- a/data/templates/modules/log.html +++ b/data/templates/modules/log.html @@ -1,9 +1,9 @@
{% for entry in entries %} {% if entry.type == "comment" %} - {{ modules.LogEntryComment(entry, **args) }} + {% module LogEntryComment(entry, **args) %} {% else %} - {{ modules.LogEntry(entry, **args) }} + {% module LogEntry(entry, **args) %} {% end %} {% end %}
diff --git a/data/templates/modules/package-header.html b/data/templates/modules/package-header.html index f64597f2..546084d8 100644 --- a/data/templates/modules/package-header.html +++ b/data/templates/modules/package-header.html @@ -33,7 +33,7 @@ {{ _("Maintainer") }} - {{ modules.Maintainer(pkg.maintainer) }} + {% module Maintainer(pkg.maintainer) %} {% end %} diff --git a/data/templates/package-detail-list.html b/data/templates/package-detail-list.html index de9d25e8..bb3c85ac 100644 --- a/data/templates/package-detail-list.html +++ b/data/templates/package-detail-list.html @@ -17,8 +17,8 @@ - {{ modules.BuildHeadline(_("Package"), latest_build, shorter=True) }} - {{ modules.PackageHeader(pkg) }} + {% module BuildHeadline(_("Package"), latest_build, shorter=True) %} + {% module PackageHeader(pkg) %}
@@ -53,7 +53,7 @@
- {{ modules.BuildTable(release_builds, show_repo=True) }} + {% module BuildTable(release_builds, show_repo=True) %}
@@ -63,7 +63,7 @@
- {{ modules.BuildTable(scratch_builds, show_user=True) }} + {% module BuildTable(scratch_builds, show_user=True) %}
@@ -82,7 +82,7 @@

{{ _("Open bugs") }}

{% if bugs %} - {{ modules.BugsTable(pkg, bugs) }} + {% module BugsTable(pkg, bugs) %} {% else %}
{{ _("There are currently no open bugs for %s.") % escape(pkg.name) }} diff --git a/data/templates/package-detail.html b/data/templates/package-detail.html index 34c4a559..3668cbeb 100644 --- a/data/templates/package-detail.html +++ b/data/templates/package-detail.html @@ -75,7 +75,7 @@ {% if pkg.maintainer %} {{ _("Maintainer") }} - {{ modules.Maintainer(pkg.maintainer) }} + {% module Maintainer(pkg.maintainer) %} {% end %} @@ -271,6 +271,6 @@ {% if pkg.filelist %}

{{ _("Files") }}

- {{ modules.PackageFilesTable(pkg, pkg.filelist) }} + {% module PackageFilesTable(pkg, pkg.filelist) %} {% end %} {% end block %} diff --git a/data/templates/package-properties.html b/data/templates/package-properties.html index 5ed9e2de..4d797a2c 100644 --- a/data/templates/package-properties.html +++ b/data/templates/package-properties.html @@ -21,7 +21,7 @@ - {{ modules.BuildHeadline(None, build, shorter=True) }} + {% module BuildHeadline(None, build, shorter=True) %}
diff --git a/data/templates/repository-detail.html b/data/templates/repository-detail.html index 51137a94..92271417 100644 --- a/data/templates/repository-detail.html +++ b/data/templates/repository-detail.html @@ -55,7 +55,7 @@
- {{ modules.Text(repo.description, pre=False) }} + {% module Text(repo.description, pre=False) %}


@@ -127,7 +127,7 @@
{{ _("These builds were already put into this repository, but were not pushed out to the mirror servers, yet.") }}
- {{ modules.BuildTable(unpushed_builds, show_repo_time=True) }} + {% module BuildTable(unpushed_builds, show_repo_time=True) %}
{% end %} @@ -139,7 +139,7 @@ {{ _("Builds in this repository") }} ({{ len(builds) }}) - {{ modules.BuildTable(builds, show_repo_time=True, show_can_move_forward=True) }} + {% module BuildTable(builds, show_repo_time=True, show_can_move_forward=True) %}
{% end %} @@ -151,7 +151,7 @@ {{ _("Obsolete builds") }} ({{ len(obsolete_builds) }}) - {{ modules.BuildTable(obsolete_builds) }} + {% module BuildTable(obsolete_builds) %}
{% end %} diff --git a/data/templates/user-comments.html b/data/templates/user-comments.html index 846825ee..0644cc06 100644 --- a/data/templates/user-comments.html +++ b/data/templates/user-comments.html @@ -3,7 +3,7 @@ {% block body %}

{{ _("Latest user comments") }}

- {{ modules.CommentsTable(comments, show_package=True, show_user=True) }} + {% module CommentsTable(comments, show_package=True, show_user=True) %} {% end block %} {% block sidebar %} diff --git a/data/templates/user-list.html b/data/templates/user-list.html index a8de0b9a..16db9672 100644 --- a/data/templates/user-list.html +++ b/data/templates/user-list.html @@ -23,7 +23,7 @@ {{ _("Developers") }} ({{ len(admins) }}) - {{ modules.UsersTable(admins) }} + {% module UsersTable(admins) %} {% end %} {% if testers %} @@ -31,7 +31,7 @@ {{ _("Testers") }} ({{ len(testers) }}) - {{ modules.UsersTable(testers) }} + {% module UsersTable(testers) %} {% end %} {% if users %} @@ -39,6 +39,6 @@ {{ _("Users") }} ({{ len(admins) }}) - {{ modules.UsersTable(users) }} + {% module UsersTable(users) %} {% end %} {% end block %} diff --git a/data/templates/user-profile-builds.html b/data/templates/user-profile-builds.html index 7739250f..f0ac47b5 100644 --- a/data/templates/user-profile-builds.html +++ b/data/templates/user-profile-builds.html @@ -8,7 +8,7 @@ {% for order, items in sorted(builds.items()) %} {{ order }} - {{ modules.BuildTable(items) }} + {% module BuildTable(items) %} {% end %} {% else %} diff --git a/data/templates/user-profile.html b/data/templates/user-profile.html index 091a4f18..7aa89c21 100644 --- a/data/templates/user-profile.html +++ b/data/templates/user-profile.html @@ -148,8 +148,8 @@ --> + {% module LogTable(user.log) %} --> + {..% module CommentsTable(user.comments, show_package=True, show_user=False) %..} --> {% end block %}