From: Michael Tremer Date: Sun, 28 Oct 2012 20:33:05 +0000 (+0100) Subject: Remove all calls of escape(). X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa556bf731cbd60918915583be6447fc5c7a359;p=pbs.git Remove all calls of escape(). This is now done automatically by the tornado template engine. --- diff --git a/data/templates/base.html b/data/templates/base.html index 70072b46..1b020634 100644 --- a/data/templates/base.html +++ b/data/templates/base.html @@ -129,15 +129,15 @@
  • - {{ escape(current_user.realname) }} + {{ current_user.realname }}
    • {% if session and session.impersonated_user %}
  • {{ _("Impersonated by") }}
  • - + - {{ escape(session.user.realname) }} + {{ session.user.realname }}
    • {% end %} diff --git a/data/templates/build-bugs.html b/data/templates/build-bugs.html index f3ddd8b7..6ca40d59 100644 --- a/data/templates/build-bugs.html +++ b/data/templates/build-bugs.html @@ -13,11 +13,11 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }}
    • diff --git a/data/templates/build-delete.html b/data/templates/build-delete.html index 72d55655..4c36aca4 100644 --- a/data/templates/build-delete.html +++ b/data/templates/build-delete.html @@ -13,11 +13,11 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }} /
  • @@ -31,7 +31,7 @@

    - {{ _("You are about to delete build %s.") % escape(build.name) }} + {{ _("You are about to delete build %s.") % build.name }}

    diff --git a/data/templates/build-detail.html b/data/templates/build-detail.html index 81908798..8692634c 100644 --- a/data/templates/build-detail.html +++ b/data/templates/build-detail.html @@ -13,11 +13,11 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }}
    • @@ -70,7 +70,7 @@ {{ _("Commit") }} {{ build.pkg.commit.revision[:7] }} - - {{ escape(build.pkg.commit.subject) }} + - {{ build.pkg.commit.subject }} {% end %} @@ -89,7 +89,7 @@ {% elif build.severity == "new package" %} {{ _("New package") }} {% else %} - {{ _("Unhandled: %s") % escape(build.severity) }} + {{ _("Unhandled: %s") % build.severity }} {% end %} @@ -156,7 +156,7 @@ {% if build.repo %} - {{ escape(build.distro.name) }} - + {{ build.distro.name }} - {{ build.repo.name }} {{ _("since %s") % locale.format_date(build.repo_time, relative=False) }} @@ -344,7 +344,7 @@ {{ _("Build dependencies") }} - {{ locale.list(["%(r)s" % { "r" : escape(r) } for r in build.pkg.requires]) }} + {{ locale.list(["%(r)s" % { "r" : r } for r in build.pkg.requires]) }} {% end %} diff --git a/data/templates/build-filter.html b/data/templates/build-filter.html index 38308958..0625d1cc 100644 --- a/data/templates/build-filter.html +++ b/data/templates/build-filter.html @@ -15,7 +15,7 @@ {% for distro in distros %} - + {% end %} @@ -54,7 +54,7 @@ diff --git a/data/templates/build-manage.html b/data/templates/build-manage.html index a9d71214..2d1eb875 100644 --- a/data/templates/build-manage.html +++ b/data/templates/build-manage.html @@ -1,12 +1,12 @@ {% extends "base.html" %} -{% block title %}{{ _("Manage build %s") % escape(build.name) }}{% end block %} +{% block title %}{{ _("Manage build %s") % build.name }}{% end block %} {% block body %}

    - {{ _("Manage build") }}: {{ escape(build.name) }} - - {{ _("Distribution") }}: {{ escape(distro.name) }} + {{ _("Manage build") }}: {{ build.name }} + - {{ _("Distribution") }}: {{ distro.name }}

    @@ -55,7 +55,7 @@ {% for repo in distro.repositories %} {% if not build.repo == repo %} {% end %} {% end %} @@ -63,8 +63,8 @@ {% elif next_repo %} - {{ escape(next_repo.name) }} - - {{ escape(next_repo.summary) }} + {{ next_repo.name }} + - {{ next_repo.summary }} {% end %}

    diff --git a/data/templates/build-schedule-test.html b/data/templates/build-schedule-test.html index ca5929f5..5a4ae977 100644 --- a/data/templates/build-schedule-test.html +++ b/data/templates/build-schedule-test.html @@ -13,11 +13,11 @@ /

  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }} /
  • diff --git a/data/templates/build-state.html b/data/templates/build-state.html index 56766cbd..6f914c01 100644 --- a/data/templates/build-state.html +++ b/data/templates/build-state.html @@ -15,7 +15,7 @@
    - {{ escape(build.pkg.summary) }} + {{ build.pkg.summary }}
    diff --git a/data/templates/builder-delete.html b/data/templates/builder-delete.html index 9a1952e8..2f5e154a 100644 --- a/data/templates/builder-delete.html +++ b/data/templates/builder-delete.html @@ -13,11 +13,11 @@ /
  • - {{ escape(builder.name) }} + {{ builder.name }} /
  • - {{ _("Delete") }} + {{ _("Delete") }}
    • @@ -33,10 +33,10 @@
    - + {{ _("Delete %s") % builder.name }} - {{ _("Cancel") }} + {{ _("Cancel") }}
    diff --git a/data/templates/builder-detail.html b/data/templates/builder-detail.html index c3777a9c..409eda11 100644 --- a/data/templates/builder-detail.html +++ b/data/templates/builder-detail.html @@ -13,7 +13,7 @@ /
  • - {{ escape(builder.name) }} + {{ builder.name }}
    • @@ -43,7 +43,7 @@ {% elif builder.status == "deleted" %} {{ _("Deleted") }} {% else %} - {{ _("Unknown status: %s") % escape(builder.status) }} + {{ _("Unknown status: %s") % builder.status }} {% end %} @@ -86,7 +86,7 @@ @@ -102,7 +102,7 @@ @@ -116,7 +116,7 @@ diff --git a/data/templates/distro-list.html b/data/templates/distro-list.html index 013c17ba..a0405c1f 100644 --- a/data/templates/distro-list.html +++ b/data/templates/distro-list.html @@ -38,15 +38,15 @@ {% for distro in distros %} - + @@ -61,7 +61,7 @@ - + {% if commit.message %} @@ -77,7 +77,7 @@
    {% if source.gitweb %}
    - + {{ _("Open in gitweb") }}
    @@ -119,7 +119,7 @@ {{ pkg.friendly_name }}
    {% end %} diff --git a/data/templates/distro-source-commit-reset.html b/data/templates/distro-source-commit-reset.html index 1ffd61b6..e2be478d 100644 --- a/data/templates/distro-source-commit-reset.html +++ b/data/templates/distro-source-commit-reset.html @@ -11,12 +11,12 @@ /
  • - {{ escape(distro.name) }} + {{ distro.name }} /
  • - {{ _("Source: %s") % escape(source.name) }} + {{ _("Source: %s") % source.name }} /
    • @@ -29,10 +29,10 @@

    - {{ _("Source") }}: {{ escape(source.name) }} + {{ _("Source") }}: {{ source.name }}
    - {{ commit.revision[:7] }} - {{ escape(commit.subject) }} + {{ commit.revision[:7] }} - {{ commit.subject }}

    @@ -67,7 +67,7 @@ {{ pkg.friendly_name }} {% end %} diff --git a/data/templates/distro-source-commits.html b/data/templates/distro-source-commits.html index 246c0fbe..e3416808 100644 --- a/data/templates/distro-source-commits.html +++ b/data/templates/distro-source-commits.html @@ -2,14 +2,14 @@ {% block body %}

    - {{ _("Distribution") }}: {{ escape(distro.name) }} - - {{ _("Source") }}: {{ escape(source.name) }} - {{ _("Commits") }} + {{ _("Distribution") }}: {{ distro.name }} + - {{ _("Source") }}: {{ source.name }} - {{ _("Commits") }}

    {{ _("Source repository") }}: - {{ escape(source.name) }} + {{ source.name }}

    diff --git a/data/templates/distro-source-detail.html b/data/templates/distro-source-detail.html index ff12252d..c2618e6b 100644 --- a/data/templates/distro-source-detail.html +++ b/data/templates/distro-source-detail.html @@ -11,19 +11,19 @@ /
  • - {{ escape(distro.name) }} + {{ distro.name }} /
  • - {{ _("Source: %s") % escape(source.name) }} + {{ _("Source: %s") % source.name }}

    • - {{ _("Source") }}: {{ escape(source.name) }} + {{ _("Source") }}: {{ source.name }}

    @@ -35,15 +35,15 @@ {% end %} - + diff --git a/data/templates/distro-update-detail.html b/data/templates/distro-update-detail.html index b2eb84f5..4d0d5c3b 100644 --- a/data/templates/distro-update-detail.html +++ b/data/templates/distro-update-detail.html @@ -7,9 +7,9 @@
    - {{ _("Summary") }}: {{ escape(update.summary) }} + {{ _("Summary") }}: {{ update.summary }} - 
    {{ escape(update.description) }}
    + 
    {{ update.description }}
    {{ _("Pakfire version") }} - {{ escape(builder.pakfire_version) or _("N/A") }} + {{ builder.pakfire_version or _("N/A") }}
    {{ _("CPU model") }} - {{ escape(builder.cpu_model) or _("Unknown") }} + {{ builder.cpu_model or _("Unknown") }}
    {{ _("Load average") }} - {{ escape(builder.loadavg or _("N/A")) }} + {{ builder.loadavg or _("N/A") }} {% if builder.overload %} {{ _("Overload") }} {% end %} diff --git a/data/templates/builder-edit.html b/data/templates/builder-edit.html index 36fe7839..ca638d44 100644 --- a/data/templates/builder-edit.html +++ b/data/templates/builder-edit.html @@ -1,6 +1,6 @@ {% extends "base-form1.html" %} -{% block title %}{{ _("Edit builder %s") % escape(builder.hostname) }}{% end block %} +{% block title %}{{ _("Edit builder %s") % builder.hostname }}{% end block %} {% block body %}
    -

    {{ _("Manage builder:") }} {{ escape(builder.hostname) }}

    +

    {{ _("Manage builder:") }} {{ builder.hostname }}

    @@ -33,7 +33,7 @@
    - {{ escape(builder.hostname) }} + {{ builder.hostname }}

    {{ _("The hostname cannot be changed.") }}

    diff --git a/data/templates/builder-list.html b/data/templates/builder-list.html index 647ca751..7d79463c 100644 --- a/data/templates/builder-list.html +++ b/data/templates/builder-list.html @@ -53,7 +53,7 @@ {{ locale.list([a.name for a in builder.arches]) }}
    		- {{ escape(builder.load1 or _("N/A")) }} + {{ builder.load1 or _("N/A") }} {{ len(builder.get_active_jobs()) }}/{{ builder.max_jobs }} diff --git a/data/templates/builder-pass.html b/data/templates/builder-pass.html index 5a44fb72..201b6bfa 100644 --- a/data/templates/builder-pass.html +++ b/data/templates/builder-pass.html @@ -11,11 +11,11 @@ /
  • - {{ escape(builder.name) }} + {{ builder.name }} /
  • - {{ _("Manage") }} + {{ _("Manage") }}
    • diff --git a/data/templates/builds-watchers-add.html b/data/templates/builds-watchers-add.html index 014acbef..cc702948 100644 --- a/data/templates/builds-watchers-add.html +++ b/data/templates/builds-watchers-add.html @@ -13,11 +13,11 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }} /
  • @@ -75,7 +75,7 @@
    - {{ escape(current_user.realname) }} + {{ current_user.realname }}
    {% end %} diff --git a/data/templates/distro-detail.html b/data/templates/distro-detail.html index ad38be4a..18f5a3f0 100644 --- a/data/templates/distro-detail.html +++ b/data/templates/distro-detail.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Distribution") }}: {{ escape(distro.name) }}{% end block %} +{% block title %}{{ _("Distribution") }}: {{ distro.name }}{% end block %} {% block body %}

    - {{ _("Distribution") }}: {{ escape(distro.name) }} - {{ escape(distro.slogan) }} + {{ _("Distribution") }}: {{ distro.name }} + {{ distro.slogan }}

    - {{ escape(distro.description) }} - {{ escape(distro.vendor) }} + {{ distro.description }} + {{ distro.vendor }}

    diff --git a/data/templates/distro-edit.html b/data/templates/distro-edit.html index 67d098b3..d167d6aa 100644 --- a/data/templates/distro-edit.html +++ b/data/templates/distro-edit.html @@ -67,7 +67,7 @@

    • - {{ escape(distro.name) }} -
    {{ escape(distro.slogan) }} + {{ distro.name }} +
    {{ distro.slogan }}     		diff --git a/data/templates/distro-source-commit-detail.html b/data/templates/distro-source-commit-detail.html index 837c94c9..b6fcfadd 100644 --- a/data/templates/distro-source-commit-detail.html +++ b/data/templates/distro-source-commit-detail.html @@ -13,12 +13,12 @@ /
  • - {{ escape(distro.name) }} + {{ distro.name }} /
  • - {{ _("Source: %s") % escape(source.name) }} + {{ _("Source: %s") % source.name }} /
    • @@ -31,10 +31,10 @@

    - {{ _("Source") }}: {{ escape(source.name) }} + {{ _("Source") }}: {{ source.name }}
    - {{ commit.revision[:7] }} - {{ escape(commit.subject) }} + {{ commit.revision[:7] }} - {{ commit.subject }}

    @@ -45,7 +45,7 @@
    {{ _("Revision") }}{{ escape(commit.revision) }}{{ commit.revision }}
    {{ _("Date") }}
    {{ _("Subject") }}{{ escape(commit.subject) }}{{ commit.subject }}
    - {{ escape(pkg.summary) }} + {{ pkg.summary }}
    - {{ escape(pkg.summary) }} + {{ pkg.summary }}
    {{ _("Gitweb") }} - - {{ escape(source.gitweb) }} + + {{ source.gitweb }}
    {{ _("Branch") }}{{ escape(source.branch) }}{{ source.branch }}
    {{ _("Imported commits") }}
    @@ -26,7 +26,7 @@ diff --git a/data/templates/distro-update-edit.html b/data/templates/distro-update-edit.html index 9a7ce0bd..b3af2028 100644 --- a/data/templates/distro-update-edit.html +++ b/data/templates/distro-update-edit.html @@ -9,7 +9,7 @@ {% else %} {{ _("Create new update") }} {% end %} - - {{ _("Distribution") }}: {{ escape(distro.name) }} + - {{ _("Distribution") }}: {{ distro.name }} diff --git a/data/templates/error.html b/data/templates/error.html index 82ad6f40..2c7e2f62 100644 --- a/data/templates/error.html +++ b/data/templates/error.html @@ -37,7 +37,7 @@ {% end %} diff --git a/data/templates/file-detail.html b/data/templates/file-detail.html index 0b60e3b7..9f90ca6c 100644 --- a/data/templates/file-detail.html +++ b/data/templates/file-detail.html @@ -38,7 +38,7 @@ {% if file.maintainer %} - + {% end %} diff --git a/data/templates/job-schedule-rebuild.html b/data/templates/job-schedule-rebuild.html index 1687b25e..22f70264 100644 --- a/data/templates/job-schedule-rebuild.html +++ b/data/templates/job-schedule-rebuild.html @@ -13,11 +13,11 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }} /
  • diff --git a/data/templates/job-schedule-test.html b/data/templates/job-schedule-test.html index 0e8dd357..23f0f93b 100644 --- a/data/templates/job-schedule-test.html +++ b/data/templates/job-schedule-test.html @@ -13,11 +13,11 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }} /
  • diff --git a/data/templates/jobs-detail.html b/data/templates/jobs-detail.html index 7d716f67..640d478a 100644 --- a/data/templates/jobs-detail.html +++ b/data/templates/jobs-detail.html @@ -13,22 +13,22 @@ /
  • - {{ escape(build.pkg.name) }} + {{ build.pkg.name }} /
  • - {{ escape(build.name) }} + {{ build.name }} /
  • - {{ escape(job.arch.name) }} + {{ job.arch.name }}

    • - {{ _("Build job") }}: {{ escape(job.name) }}
    - {{ escape(job.pkg.summary) }} + {{ _("Build job") }}: {{ job.name }}
    + {{ job.pkg.summary }}

    diff --git a/data/templates/keys-delete.html b/data/templates/keys-delete.html index c8a9f2eb..e52c7c12 100644 --- a/data/templates/keys-delete.html +++ b/data/templates/keys-delete.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Delete key %s") % escape(key.uids) }}{% end block %} +{% block title %}{{ _("Delete key %s") % key.uids }}{% end block %} {% block body %} diff --git a/data/templates/login-successful.html b/data/templates/login-successful.html index e214690f..d7e74628 100644 --- a/data/templates/login-successful.html +++ b/data/templates/login-successful.html @@ -20,7 +20,7 @@

    - {{ _("Welcome, %s.") % escape(user.realname) }} + {{ _("Welcome, %s.") % user.realname }}

    diff --git a/data/templates/mirrors-delete.html b/data/templates/mirrors-delete.html index 8a471da4..a92ae035 100644 --- a/data/templates/mirrors-delete.html +++ b/data/templates/mirrors-delete.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Delete mirror %s") % escape(mirror.hostname) }}{% end block %} +{% block title %}{{ _("Delete mirror %s") % mirror.hostname }}{% end block %} {% block body %}

    -

    {{ _("Mirror") }}: {{ escape(mirror.hostname) }}

    +

    {{ _("Mirror") }}: {{ mirror.hostname }}

    - {{ _("You are going to delete the mirror %s.") % escape(mirror.hostname) }} + {{ _("You are going to delete the mirror %s.") % mirror.hostname }}

    - - {{ _("Delete %s") % escape(mirror.hostname) }} + + {{ _("Delete %s") % mirror.hostname }} - {{ _("Cancel") }} + {{ _("Cancel") }}
    diff --git a/data/templates/mirrors-detail.html b/data/templates/mirrors-detail.html index 99cca74e..b1e0a367 100644 --- a/data/templates/mirrors-detail.html +++ b/data/templates/mirrors-detail.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Mirror: %s") % escape(mirror.hostname) }}{% end block %} +{% block title %}{{ _("Mirror: %s") % mirror.hostname }}{% end block %} {% block body %}

    - {{ _("Mirror: %s") % escape(mirror.hostname) }} - {{ _("hosted by %s") % escape(mirror.owner) }} + {{ _("Mirror: %s") % mirror.hostname }} + {{ _("hosted by %s") % mirror.owner }}

    @@ -30,7 +30,7 @@
    - + {% if current_user and current_user.has_perm("manage_mirrors") %} @@ -38,7 +38,7 @@ {% end %} diff --git a/data/templates/modules/log-entry.html b/data/templates/modules/log-entry.html index b7f90350..70f3446f 100644 --- a/data/templates/modules/log-entry.html +++ b/data/templates/modules/log-entry.html @@ -13,7 +13,7 @@ {% if current_user == entry.user %} {{ _("You") }} {% else %} - {{ escape(entry.user.realname) }} + {{ entry.user.realname }} {% end %} {% else %} {{ _("Pakfire Build Service") }} @@ -32,7 +32,7 @@ {% block footer %} {% if entry.get_footer(current_user) %}

    - {{ escape(entry.get_footer(current_user)) }} + {{ entry.get_footer(current_user) }}

    {% end %} {% end block %} diff --git a/data/templates/modules/log-files-table.html b/data/templates/modules/log-files-table.html index 46e74a44..92f7be01 100644 --- a/data/templates/modules/log-files-table.html +++ b/data/templates/modules/log-files-table.html @@ -10,7 +10,7 @@ {% for file in files %} - + {% end %} diff --git a/data/templates/modules/maintainer.html b/data/templates/modules/maintainer.html index 60149872..7bc4a585 100644 --- a/data/templates/modules/maintainer.html +++ b/data/templates/modules/maintainer.html @@ -1,12 +1,12 @@ {% if type == "string" %} {{ format_email(maintainer) }} {% elif type == "user" %} - + {% if maintainer.is_admin() %} {% else %} {% end %} - {{ escape(maintainer.realname) }} + {{ maintainer.realname }} {% end %} diff --git a/data/templates/modules/package-header.html b/data/templates/modules/package-header.html index 546084d8..5a4401d6 100644 --- a/data/templates/modules/package-header.html +++ b/data/templates/modules/package-header.html @@ -24,7 +24,7 @@ {% end %} @@ -44,7 +44,7 @@

    {{ _("Description") }}

    - {{ escape(pkg.description) }} + {{ pkg.description }}
    diff --git a/data/templates/modules/packages-files-table.html b/data/templates/modules/packages-files-table.html index f2b6c888..08b66559 100644 --- a/data/templates/modules/packages-files-table.html +++ b/data/templates/modules/packages-files-table.html @@ -6,7 +6,7 @@ {{ format_filemode(file.type, file.mode) }} {% end %} diff --git a/data/templates/modules/watchers-sidebar-table.html b/data/templates/modules/watchers-sidebar-table.html index f1c5b23f..c2893887 100644 --- a/data/templates/modules/watchers-sidebar-table.html +++ b/data/templates/modules/watchers-sidebar-table.html @@ -19,7 +19,7 @@
    -
    {{ escape(pkg.description) }}
    +
    {{ pkg.description }}
    @@ -63,13 +63,13 @@
    {% if pkg.maintainer %} @@ -108,7 +108,7 @@ {% end %} @@ -117,7 +117,7 @@ {% end %} @@ -137,7 +137,7 @@ {% end %} @@ -204,7 +204,7 @@ @@ -215,7 +215,7 @@
      {% for dep in pkg.requires %} -
    • {{ escape(dep) }}
      • +
    • {{ dep }}
      • {% end %}
    @@ -224,7 +224,7 @@
      {% for dep in pkg.prerequires %} -
    • {{ escape(dep) }}
      • +
    • {{ dep }}
      • {% end %}
    {% end %} @@ -235,7 +235,7 @@
      {% for dep in pkg.obsoletes %} -
    • {{ escape(dep) }}
      • +
    • {{ dep }}
      • {% end %}
    @@ -245,7 +245,7 @@
      {% for dep in pkg.conflicts %} -
    • {{ escape(dep) }}
      • +
    • {{ dep }}
      • {% end %}
    @@ -262,7 +262,7 @@

    {{ _("Build dependencies") }}

      {% for dep in pkg.requires %} -
    • {{ escape(dep) }}
      • +
    • {{ dep }}
      • {% end %}
    diff --git a/data/templates/package-properties.html b/data/templates/package-properties.html index 4d797a2c..3284d8ac 100644 --- a/data/templates/package-properties.html +++ b/data/templates/package-properties.html @@ -13,11 +13,11 @@ /
  • - {{ escape(pkg.name) }} + {{ pkg.name }} /
  • - {{ _("Properties") }} + {{ _("Properties") }}
    • @@ -91,7 +91,7 @@
    - {{ _("Cancel") }} + {{ _("Cancel") }}
    diff --git a/data/templates/packages-list.html b/data/templates/packages-list.html index 150a56c1..eb88ecce 100644 --- a/data/templates/packages-list.html +++ b/data/templates/packages-list.html @@ -72,7 +72,7 @@ {{ pkg }} {% end %} diff --git a/data/templates/repository-detail.html b/data/templates/repository-detail.html index 92271417..d759b39d 100644 --- a/data/templates/repository-detail.html +++ b/data/templates/repository-detail.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} - {{ _("Repository") }}: {{ escape(repo.name) }} - {{ _("Distribution") }}: {{ escape(distro.name) }} + {{ _("Repository") }}: {{ repo.name }} - {{ _("Distribution") }}: {{ distro.name }} {% end block %} {% block body %} @@ -15,11 +15,11 @@ /
  • - {{ escape(distro.name) }} + {{ distro.name }} /
  • - {{ escape(repo.name) }} + {{ repo.name }}
    • @@ -47,8 +47,8 @@

    - {{ _("Repository") }}: {{ escape(repo.name) }} - {{ escape(distro.name) }} + {{ _("Repository") }}: {{ repo.name }} + {{ distro.name }}

    diff --git a/data/templates/repository-edit.html b/data/templates/repository-edit.html index 4f5b21d0..1774fdd2 100644 --- a/data/templates/repository-edit.html +++ b/data/templates/repository-edit.html @@ -1,11 +1,11 @@ {% extends "base.html" %} -{% block title %}{{ _("Edit repository %s") % escape(repo.name) }}{% end block %} +{% block title %}{{ _("Edit repository %s") % repo.name }}{% end block %} {% block body %}

    - {{ _("Edit repository %s") % escape(repo.name) }} - - {{ _("Distribution") }}: {{ escape(distro.name) }} + {{ _("Edit repository %s") % repo.name }} + - {{ _("Distribution") }}: {{ distro.name }}

    @@ -14,7 +14,7 @@
    {{ _("Maintainer") }} - {{ escape(user.realname) }} + {{ user.realname }}
    {{ _("Exception (traceback):") }}

    - 
    {{ escape(exception) }}
    + 
    {{ exception }}
    {{ _("Maintainer") }}{{ escape(file.maintainer or pkg.maintainer) }}{{ file.maintainer or pkg.maintainer }}
    {% for uid in key.uids %} - {{ escape(uid) }}
    + {{ uid }}
    {% end %}
    {{ _("Hostname") }}{{ escape(mirror.hostname) }}{{ mirror.hostname }}
    {{ _("Contact") }} {% if mirror.contact %} - {{ escape(mirror.contact) }} + {{ mirror.contact }} {% else %} {{ _("N/A") }} {% end %} @@ -78,7 +78,7 @@
    • - + {{ _("Edit settings") }} @@ -86,7 +86,7 @@
    • - + {{ _("Delete mirror") }} diff --git a/data/templates/mirrors-edit.html b/data/templates/mirrors-edit.html index c6ad0fef..56ed2366 100644 --- a/data/templates/mirrors-edit.html +++ b/data/templates/mirrors-edit.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Edit mirror %s") % escape(mirror.hostname) }}{% end block %} +{% block title %}{{ _("Edit mirror %s") % mirror.hostname }}{% end block %} {% block body %}
      -

      {{ _("Edit mirror: %s") % escape(mirror.hostname) }}

      +

      {{ _("Edit mirror: %s") % mirror.hostname }}

      @@ -33,7 +33,7 @@
      - +

      {{ _("The canonical hostname.") }} @@ -58,7 +58,7 @@

      - +

      {{ _("The owner of the mirror server.") }} @@ -69,7 +69,7 @@

      - +

      {{ _("An email address to contact an administrator of the mirror.") }} @@ -81,7 +81,7 @@

      - {{ _("Cancel") }} + {{ _("Cancel") }}
      diff --git a/data/templates/mirrors-list.html b/data/templates/mirrors-list.html index eb22a65d..2d882999 100644 --- a/data/templates/mirrors-list.html +++ b/data/templates/mirrors-list.html @@ -41,15 +41,15 @@ {% for mirror in mirrors %}
    - [{{ escape(mirror.country_code) }}] + [{{ mirror.country_code }}] - - {{ escape(mirror.hostname) }} + + {{ mirror.hostname }} - {{ escape(mirror.owner or _("N/A")) }} + {{ mirror.owner or _("N/A") }} {{ mirror.check_status }} diff --git a/data/templates/modules/bugs-table.html b/data/templates/modules/bugs-table.html index e38a28c1..5e7a40fc 100644 --- a/data/templates/modules/bugs-table.html +++ b/data/templates/modules/bugs-table.html @@ -4,10 +4,10 @@ #{{ bug.id }}
    - {{ escape(bug.status) }} + {{ bug.status }}     		- {{ escape(bug.summary) }} + {{ bug.summary }} {% if bug.assignee %}
    {{ format_email(bug.assignee) }} diff --git a/data/templates/modules/build-headline.html b/data/templates/modules/build-headline.html index debc284e..44ff3891 100644 --- a/data/templates/modules/build-headline.html +++ b/data/templates/modules/build-headline.html @@ -19,12 +19,12 @@ {% end %} {% if shorter %} - {{ escape(pkg.name) }} + {{ pkg.name }} {% else %} - {{ escape(build.name) }} + {{ build.name }} {% end %}
    - {{ escape(pkg.summary) }} + {{ pkg.summary }} diff --git a/data/templates/modules/build-table.html b/data/templates/modules/build-table.html index 2f1f2409..3451e7fc 100644 --- a/data/templates/modules/build-table.html +++ b/data/templates/modules/build-table.html @@ -37,9 +37,9 @@ {% if show_repo %}     		{% if build.repo %} - {{ escape(build.distro.name) }} + {{ build.distro.name }} / - {{ escape(build.repo.name) }} + {{ build.repo.name }} {% else %}   {% end %} diff --git a/data/templates/modules/comments-table.html b/data/templates/modules/comments-table.html index d96674c7..0f228074 100644 --- a/data/templates/modules/comments-table.html +++ b/data/templates/modules/comments-table.html @@ -2,13 +2,13 @@ {% if comments %} {% for comment in comments %}
    -

    {{ escape(comment.text) }}

    +

    {{ comment.text }}

    {% if show_package %} {{ _("on %s") % comment.pkg.friendly_name }} - {% end %} {% if show_user %} - {{ _("by %s") % escape(comment.user.realname) }} - + {{ _("by %s") % comment.user.realname }} - {% end %} {{ locale.format_date(comment.time_created) }} diff --git a/data/templates/modules/commits-table.html b/data/templates/modules/commits-table.html index 46459fe5..ba56c85c 100644 --- a/data/templates/modules/commits-table.html +++ b/data/templates/modules/commits-table.html @@ -28,7 +28,7 @@ {{ format_email(commit.author) }}
    		- {{ escape(commit.subject) }} + {{ commit.subject }}
    {{ escape(file.name) }}{{ file.name }} {{ format_size(file.filesize) }} diff --git a/data/templates/modules/log-table.html b/data/templates/modules/log-table.html index 547b7e9f..b9bf4691 100644 --- a/data/templates/modules/log-table.html +++ b/data/templates/modules/log-table.html @@ -13,7 +13,7 @@ {% end %} - {{ escape(message.message) }} + {{ message.message }}
    {{ _("License") }} - {{ escape(pkg.license) }} + {{ pkg.license }}
    - {{ escape(file.user) }}:{{ escape(file.group) }} + {{ file.user }}:{{ file.group }} {% if file.size is None %} @@ -16,7 +16,7 @@ {% end %} - {{ escape(file.name) }} + {{ file.name }}
    diff --git a/data/templates/modules/source-table.html b/data/templates/modules/source-table.html index 23e61616..9b5a868a 100644 --- a/data/templates/modules/source-table.html +++ b/data/templates/modules/source-table.html @@ -10,8 +10,8 @@ {% for source in sources %}
    - {{ escape(source.name) }} -
    {{ _("Branch: %s") % escape(source.branch) }} + {{ source.name }} +
    {{ _("Branch: %s") % source.branch }}     		{{ source.num_commits }} @@ -20,7 +20,7 @@ {{ source.head_revision.revision[:7] }} - {{ format_date(source.head_revision.date) }} -
    {{ escape(source.head_revision.subject) }} +
    {{ source.head_revision.subject }}
    {{ _("Homepage") }} - {{ escape(pkg.url) }} + {{ pkg.url }}
    {{ _("License") }} - {{ escape(pkg.license) }} + {{ pkg.license }}
    {{ _("Build") }} - {{ escape(pkg.build.name) }} + {{ pkg.build.name }}
    {{ _("Job") }} - {{ escape(pkg.job.name) }} + {{ pkg.job.name }}
    {{ _("Commit") }} {{ pkg.commit.revision[:7] }} -
    {{ escape(pkg.commit.subject) }} +
    {{ pkg.commit.subject }}
    - {{ escape(summary) }} + {{ summary }}
    {{ _("Name") }} - + {{ _("The name of the repository.") }} @@ -24,7 +24,7 @@
    {{ _("Description") }} - +
    diff --git a/data/templates/search-form.html b/data/templates/search-form.html index f8afce30..1f275cad 100644 --- a/data/templates/search-form.html +++ b/data/templates/search-form.html @@ -15,13 +15,13 @@ {% if pattern %}
    -

    {{ _("No search results for '%s'.") % escape(pattern) }}

    +

    {{ _("No search results for '%s'.") % pattern }}

    ×

    {{ _("Notice") }}

    - {{ _("Your search query '%s' did not return any results.") % escape(pattern) }} + {{ _("Your search query '%s' did not return any results.") % pattern }} {{ _("Use the box below to try again.") }}
    {% else %} @@ -41,7 +41,7 @@
    - +
    diff --git a/data/templates/search-results.html b/data/templates/search-results.html index 5329ef64..28b6cec8 100644 --- a/data/templates/search-results.html +++ b/data/templates/search-results.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Search results for '%s'") % escape(pattern) }}{% end block %} +{% block title %}{{ _("Search results for '%s'") % pattern }}{% end block %} {% block body %}

    - {{ _("Search results for '%s'") % escape(pattern) }} + {{ _("Search results for '%s'") % pattern }}

    @@ -35,7 +35,7 @@
    - +
    @@ -54,11 +54,11 @@ {% for pkg in pkgs %} - - {{ escape(pkg.name) }} + + {{ pkg.name }} - {{ escape(pkg.summary) }} + {{ pkg.summary }} {% end %} @@ -76,7 +76,7 @@

    - {{ _("%s was found in the following package.", "%s was found in the following packages.", len(files)) % escape(pattern) }} + {{ _("%s was found in the following package.", "%s was found in the following packages.", len(files)) % pattern }}

    @@ -87,7 +87,7 @@ {{ pkg.friendly_name }} {% end %} @@ -110,9 +110,9 @@ {% for user in users %} diff --git a/data/templates/uploads-list.html b/data/templates/uploads-list.html index 840a4663..f40207fa 100644 --- a/data/templates/uploads-list.html +++ b/data/templates/uploads-list.html @@ -43,15 +43,15 @@ {% for upload in uploads %} - + - + @@ -90,7 +90,7 @@ {% if not current_user == user and current_user.is_admin() %}
  • - {{ _("Impersonate user") }} + {{ _("Impersonate user") }}
    • {% end %} @@ -140,10 +140,10 @@
    - 
    {{ format_filemode(file.type, file.mode) }} {{ file.user }}:{{ file.group }} {% if file.size %}{{ format_size(file.size) }}{% else %}-{% end %} {{ escape(file.name) }}
    + 
    {{ format_filemode(file.type, file.mode) }} {{ file.user }}:{{ file.group }} {% if file.size %}{{ format_size(file.size) }}{% else %}-{% end %} {{ file.name }}
    - {{ escape(user.realname) }} + {{ user.realname }} {% if not user.name == user.realname %} - ({{ escape(user.name) }}) + ({{ user.name }}) {% end %}
    {{ escape(upload.filename) }}{{ upload.filename }} {% if upload.builder %} - - {{ escape(upload.builder.name) }} + + {{ upload.builder.name }} {% elif upload.user %} - - {{ escape(upload.user.realname) }} + + {{ upload.user.realname }} {% else %} {{ _("No owner.") }} diff --git a/data/templates/user-impersonation.html b/data/templates/user-impersonation.html index 13f4a189..071d1a5b 100644 --- a/data/templates/user-impersonation.html +++ b/data/templates/user-impersonation.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}{{ _("Impersonate user %s") % escape(user.realname) }}{% end block %} +{% block title %}{{ _("Impersonate user %s") % user.realname }}{% end block %} {% block body %}
    -

    {{ _("User impersonation") }}: {{ escape(user.realname) }}

    +

    {{ _("User impersonation") }}: {{ user.realname }}

    @@ -24,8 +24,8 @@
    {{ xsrf_form_html() }} - - + +
    diff --git a/data/templates/user-profile-builds.html b/data/templates/user-profile-builds.html index f0ac47b5..f5076289 100644 --- a/data/templates/user-profile-builds.html +++ b/data/templates/user-profile-builds.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block body %} -

    {{ _("Builds by %s") % escape(user.realname) }}

    +

    {{ _("Builds by %s") % user.realname }}

    {% if builds %} diff --git a/data/templates/user-profile-passwd-ok.html b/data/templates/user-profile-passwd-ok.html index aa34c1a5..94a3c007 100644 --- a/data/templates/user-profile-passwd-ok.html +++ b/data/templates/user-profile-passwd-ok.html @@ -13,11 +13,11 @@ /
  • - {{ escape(user.realname) }} + {{ user.realname }} /
  • - {{ _("Change password") }} + {{ _("Change password") }} /
  • @@ -38,12 +38,12 @@

    {% else %}

    - {{ _("The password of %s has successfully been changed.") % escape(user.realname) }} + {{ _("The password of %s has successfully been changed.") % user.realname }}

    {% end %}
    - {{ _("Ok") }} + {{ _("Ok") }}
    diff --git a/data/templates/user-profile-passwd.html b/data/templates/user-profile-passwd.html index 9e861bfd..c18e9910 100644 --- a/data/templates/user-profile-passwd.html +++ b/data/templates/user-profile-passwd.html @@ -13,11 +13,11 @@ /
  • - {{ escape(user.realname) }} + {{ user.realname }} /
  • - {{ _("Change password") }} + {{ _("Change password") }}
    • @@ -36,7 +36,7 @@

    {% else %}

    - {{ _("In this dialog, you may change the password of %s.") % escape(user.realname) }} + {{ _("In this dialog, you may change the password of %s.") % user.realname }}

    {% end %}
    @@ -48,7 +48,7 @@ {% if error_msg %}
    × - {{ _("Oops!") }} {{ escape(error_msg) }} + {{ _("Oops!") }} {{ error_msg }}
    {% end %} @@ -93,7 +93,7 @@
    - {{ _("Cancel") }} + {{ _("Cancel") }}
    diff --git a/data/templates/user-profile.html b/data/templates/user-profile.html index 7aa89c21..6ccf2ea7 100644 --- a/data/templates/user-profile.html +++ b/data/templates/user-profile.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ escape(user.realname) }}{% end block %} +{% block title %}{{ user.realname }}{% end block %} {% block body %}
    -

    {{ _("User") }}: {{ escape(user.realname) }}

    +

    {{ _("User") }}: {{ user.realname }}

    @@ -27,12 +27,12 @@
    {{ _("Username") }}{{ escape(user.name) }}{{ user.name }}
    {{ _("Email") }} - {{ escape(user.email) }} + {{ user.email }}