Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	devel/views.py
	feeds.py
	templates/devel/index.html
	templates/packages/flag.html
	templates/public/index.html
	todolists/views.py
	urls.py

5 files changed, 46 insertions, 24 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 83673867..a8b2346e 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -15,9 +15,10 @@
         <div id="actionlist">
         <h4>Package Actions</h4>
             <ul class="small">
-                <li><a href="{{ pkg.get_arch_svn_link }}" title="View SVN entries in the {{pkg.repo|lower}}-{{pkg.arch}} branch">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
-                <li><a href="{{ pkg.get_trunk_svn_link }}" title="View SVN entries on trunk">SVN Entries (trunk)</a></li>
-                <li><a href="{{ pkg.get_bugs_link }}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
+                <li><a href="{% svn_arch pkg %}" title="View SVN entries in the {{pkg.repo|lower}}-{{pkg.arch}} branch">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
+                <li><a href="{% svn_trunk pkg %}" title="View SVN entries on trunk">SVN Entries (trunk)</a></li>
+                <li><a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
+                <li><a href="{% bug_report pkg %}" title="Report bug for {{ pkg.pkgname }}">Report a Bug</a></li>
                 {% if pkg.flag_date %}
                 <li><span class="flagged">Flagged out-of-date on {{ pkg.flag_date|date }}</span></li>
                 {% with pkg.in_testing as tp %}{% if tp %}
@@ -103,7 +104,7 @@
         {% endifequal %}
         <tr>
             <th>Description:</th>
-            <td class="wrap">{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}</td>
+            <td class="wrap">{{ pkg.pkgdesc|default:"" }}</td>
         </tr><tr>
             <th>Upstream URL:</th>
             <td>{% if pkg.url %}<a href="{{ pkg.url }}"
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 52c0444c..74f6982c 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -1,23 +1,22 @@
 {% extends "base.html" %}
-{% block title %}Parabola - Flag Package - {{ pkg.pkgname }}{% endblock %}
+{% block title %}Parabola - 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.parabolagnulinux.org"
-        title="Parabola Bugtracker">bug tracker</a> instead.</p>
+    package is broken! Please <a href="https://bugs.parabolagnulinux.org"
+        title="Parabola 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:
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 @@
                 <th>Packages</th>
                 <th>User</th>
                 <th>Type</th>
+                <th>Created</th>
             </tr>
         </thead>
         <tbody>
@@ -30,6 +31,7 @@
                 {% endfor %}</td>
                 <td>{{ relation.user.get_full_name }}</td>
                 <td>{{ relation.get_type_display }}</td>
+                <td>{{ relation.created }}</td>
             </tr>
             {% empty %}
                 <tr class="empty"><td colspan="5"><em>No inactive user relations.</em></td></tr>
@@ -46,6 +48,7 @@
                 <th>Package Base</th>
                 <th>User</th>
                 <th>Type</th>
+                <th>Created</th>
             </tr>
         </thead>
         <tbody>
@@ -55,6 +58,7 @@
                 <td>{{ relation.pkgbase }}</td>
                 <td>{{ relation.user.get_full_name }}</td>
                 <td>{{ relation.get_type_display }}</td>
+                <td>{{ relation.created }}</td>
             </tr>
             {% empty %}
                 <tr class="empty"><td colspan="4"><em>No non-existent pkgbase relations.</em></td></tr>
@@ -71,6 +75,7 @@
                 <th>Package Base</th>
                 <th>Packages</th>
                 <th>User</th>
+                <th>Created</th>
                 <th>Allowed Repos</th>
                 <th>Currently in Repos</th>
             </tr>
@@ -85,6 +90,7 @@
                         title="View package details for {{ pkg.pkgname }}">{{ pkg.repo|lower }}/{{ pkg.pkgname }} ({{ pkg.arch }})</a>{% if not forloop.last %}, {% endif %}
                 {% endfor %}</td>
                 <td>{{ relation.user.get_full_name }}</td>
+                <td>{{ relation.created }}</td>
                 <td class="wrap">{{ relation.user.userprofile.allowed_repos.all|join:", " }}</td>
                 <td class="wrap">{{ relation.repositories|join:", " }}</td>
             </tr>