From 262cea74c16427f47aab80dd59cbf0cb59eeb8c1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Mar 2011 18:28:09 -0500 Subject: Small package details template cleanup Signed-off-by: Dan McGee --- templates/packages/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 4253f0b3..6c8aee3a 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -103,7 +103,7 @@ {% endifequal %} Description: - {% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %} + {{ pkg.pkgdesc|default:"" }} Upstream URL: {% if pkg.url %} Date: Mon, 18 Apr 2011 13:48:44 -0500 Subject: Update out of date flag screen and email Now that multiple packages get marked out of date whenever this form is processed, have the page and email itself reflect this fact. Signed-off-by: Dan McGee --- templates/packages/flag.html | 28 +++++++++++++--------------- templates/packages/flag_confirmed.html | 19 +++++++++++++++++++ templates/packages/outofdate.txt | 8 +++----- 3 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 templates/packages/flag_confirmed.html (limited to 'templates/packages') diff --git a/templates/packages/flag.html b/templates/packages/flag.html index 35198dff..4a3c6966 100644 --- a/templates/packages/flag.html +++ b/templates/packages/flag.html @@ -1,23 +1,22 @@ {% extends "base.html" %} -{% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %} +{% block title %}Arch Linux - Flag Package - {{ package.pkgname }}{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %}
-{% if confirmed %} -

Package Flagged

- -

Thank you, the maintainers have been notified about {{ pkg.pkgname }}.

- -

You can return to the package details page for - {{pkg.pkgname}}.

-{% else %} -

Flag Package: {{ pkg.pkgname }}

+

Flag Package: {{ package.pkgname }}

If you notice a package is out-of-date (i.e., there is a newer stable release available), then please notify us using the form below.

+

Note that all of the following packages will be marked out of date:

+
    + {% for pkg in packages %} +
  • {{ pkg.pkgname }} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})
    • + {% endfor %} +
+

The message box portion of the flag utility is optional, and meant for short messages only. If you need more than 200 characters for your message, then file a bug report, email the maintainer directly, or send @@ -26,17 +25,16 @@ with your additional text.

Note: Please do not use this facility if the - package is broken! Use the bug tracker instead.

+ package is broken! Please file a bug instead.

-

Please confirm your flag request for {{pkg.pkgname}}:

+

Please confirm your flag request for {{package.pkgname}}:

{% csrf_token %}
{{ form.as_p }}
-

+

-{% endif %}
{% endblock %} diff --git a/templates/packages/flag_confirmed.html b/templates/packages/flag_confirmed.html new file mode 100644 index 00000000..02c24f72 --- /dev/null +++ b/templates/packages/flag_confirmed.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% block title %}Arch Linux - Package Flagged - {{ package.pkgname }}{% endblock %} +{% block navbarclass %}anb-packages{% endblock %} + +{% block content %} +
+

Package Flagged - {{ package.pkgname }}

+ +

Thank you, the maintainers have been notified the following packages are out-of-date:

+
    + {% for pkg in packages %} +
  • {{ pkg.pkgname }} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})
    • + {% endfor %} +
+ +

You can return to the package details page for + {{package.pkgname}}.

+
+{% endblock %} diff --git a/templates/packages/outofdate.txt b/templates/packages/outofdate.txt index 93abea03..4876c316 100644 --- a/templates/packages/outofdate.txt +++ b/templates/packages/outofdate.txt @@ -1,9 +1,7 @@ -{% autoescape off %}{{ email }} wants to notify you that the following package may be out-of-date: +{% autoescape off %}{{ email }} wants to notify you that the following packages may be out-of-date: - Package Name: {{ pkg.pkgname }} - Architecture: {{ pkg.arch.name }} - Repository: {{ pkg.repo.name }} - ({{ weburl }}) +{% for p in packages %} +* {{ p.pkgname }} {{ p.full_version }} [{{ p.repo.name|lower }}] ({{ p.arch.name }}): {{ p.get_full_url }}{% endfor %} {% if message %} The user provided the following additional text: -- cgit v1.2.3-2-g168b From d8022fd5720a8367a03bbff58668ed701a0bebcf Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 18 Apr 2011 23:00:30 -0500 Subject: Add a "Report a Bug" link We need Flyspray category data to make this more useful, and we can prefill the Subject and Category fields (along with putting it on the right project). Implements FS#23751. Signed-off-by: Dan McGee --- templates/packages/details.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 6c8aee3a..4c669892 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -18,6 +18,7 @@
  • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
  • SVN Entries (trunk)
  • Bug Reports
    • +
  • Report a Bug
    • {% if pkg.flag_date %}
  • Flagged out-of-date on {{ pkg.flag_date|date }}
    • {% with pkg.in_testing as tp %}{% if tp %} -- cgit v1.2.3-2-g168b From f1f01ecf0216441dd66f3bc6afc14fe104de291f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 18 Apr 2011 23:26:10 -0500 Subject: Reimplement links code as template tags These were starting to get a bit too much inside the model itself, and they don't really belong there as they are view layer concerns anyway. Signed-off-by: Dan McGee --- templates/packages/details.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 4c669892..1926abc2 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -15,10 +15,10 @@

    Package Actions

      -
    • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
      • -
    • SVN Entries (trunk)
      • -
    • Bug Reports
      • -
    • Report a Bug
      • +
    • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
      • +
    • SVN Entries (trunk)
      • +
    • Bug Reports
      • +
    • Report a Bug
      • {% if pkg.flag_date %}
    • Flagged out-of-date on {{ pkg.flag_date|date }}
      • {% with pkg.in_testing as tp %}{% if tp %} -- cgit v1.2.3-2-g168b From ef9faf4414edd013755431fb2e78d9e46d448cb8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 3 May 2011 14:41:00 -0500 Subject: Add a created date to package relations Signed-off-by: Dan McGee --- templates/packages/stale_relations.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates/packages') diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html index 8e2f8930..d51f7e44 100644 --- a/templates/packages/stale_relations.html +++ b/templates/packages/stale_relations.html @@ -17,6 +17,7 @@ Packages User Type + Created @@ -30,6 +31,7 @@ {% endfor %} {{ relation.user.get_full_name }} {{ relation.get_type_display }} + {{ relation.created }} {% empty %} No inactive user relations. @@ -46,6 +48,7 @@ Package Base User Type + Created @@ -55,6 +58,7 @@ {{ relation.pkgbase }} {{ relation.user.get_full_name }} {{ relation.get_type_display }} + {{ relation.created }} {% empty %} No non-existent pkgbase relations. @@ -71,6 +75,7 @@ Package Base Packages User + Created Allowed Repos Currently in Repos @@ -85,6 +90,7 @@ title="View package details for {{ pkg.pkgname }}">{{ pkg.repo|lower }}/{{ pkg.pkgname }} ({{ pkg.arch }}){% if not forloop.last %}, {% endif %} {% endfor %} {{ relation.user.get_full_name }} + {{ relation.created }} {{ relation.user.userprofile.allowed_repos.all|join:", " }} {{ relation.repositories|join:", " }} -- cgit v1.2.3-2-g168b