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 <dan@archlinux.org>

3 files changed, 35 insertions, 20 deletions

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 %}
 <div id="pkg-flag" class="box">
-{% if confirmed %}
-    <h2>Package Flagged</h2>
-
-    <p>Thank you, the maintainers have been notified about <strong>{{ pkg.pkgname }}</strong>.</p>
-
-    <p>You can return to the package details page for
-    <a href="{{ pkg.get_absolute_url }}" title="Package details for {{pkg.pkgname}}">{{pkg.pkgname}}</a>.</p>
-{% else %}
-    <h2>Flag Package: {{ pkg.pkgname }}</h2>
+    <h2>Flag Package: {{ package.pkgname }}</h2>
 
     <p>If you notice a package is out-of-date (i.e., there is a newer
     <strong>stable</strong> release available), then please notify us using
     the form below.</p>
 
+    <p>Note that all of the following packages will be marked out of date:</p>
+    <ul>
+        {% for pkg in packages %}
+        <li>{{ pkg.pkgname }} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
+        {% endfor %}
+    </ul>
+
     <p>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.</p>
 
     <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
-    package is broken!  Use the <a href="https://bugs.archlinux.org"
-        title="Arch Linux Bugtracker">bug tracker</a> instead.</p>
+    package is broken! Please <a href="https://bugs.archlinux.org/"
+        title="Arch Linux Bugtracker">file a bug</a> instead.</p>
 
-    <p>Please confirm your flag request for {{pkg.pkgname}}:</p>
+    <p>Please confirm your flag request for {{package.pkgname}}:</p>
 
     <form id="flag-pkg-form" method="post">{% csrf_token %}
         <fieldset>
             {{ form.as_p }}
         </fieldset>
-		<p><label></label> <input title="Flag {{ pkg.pkgname }} as out-of-date" type="submit" value="Flag Package" /></p>
+        <p><label></label> <input title="Flag {{ package.pkgname }} as out-of-date" type="submit" value="Flag Package" /></p>
     </form>
-{% endif %}
 </div>
 {% 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 %}
+<div id="pkg-flag" class="box">
+	<h2>Package Flagged - {{ package.pkgname }}</h2>
+
+    <p>Thank you, the maintainers have been notified the following packages are out-of-date:</p>
+    <ul>
+        {% for pkg in packages %}
+        <li>{{ pkg.pkgname }} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
+        {% endfor %}
+    </ul>
+
+    <p>You can return to the package details page for
+    <a href="{{ package.get_absolute_url }}" title="Package details for {{package.pkgname}}">{{package.pkgname}}</a>.</p>
+</div>
+{% 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: