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

Conflicts:
	media/archweb.css
	public/views.py
	urls.py

2 files changed, 8 insertions, 9 deletions

diff --git a/templates/todolists/email_notification.txt b/templates/todolists/email_notification.txt
index abe1dbf3..1825912c 100644
--- a/templates/todolists/email_notification.txt
+++ b/templates/todolists/email_notification.txt
@@ -1,14 +1,9 @@
-{% autoescape off %}* Note: this is an automated message
+{% autoescape off %}The todo list {{ todolist.name }} has had the following packages added to it for which you are a maintainer:
 
-The following package:
-
-    Package Name: {{ pkg.pkgname }}
-    Architecture: {{ pkg.arch.name }}
-    Repository:   {{ pkg.repo.name }}
-    ({{ weburl }})
-
-has been added to this todo list:
+{% for tpkg in todo_packages %}
+{{ tpkg.pkg.repo.name|lower }}/{{ tpkg.pkg.pkgname }} ({{ tpkg.pkg.arch.name }}) - {{ tpkg.pkg.get_full_url }}{% endfor %}
 
+Todo list information:
 Creator: {{todolist.creator.get_full_name}}
 Name: {{todolist.name}}
 Description:
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 046aed32..477e0180 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -38,6 +38,7 @@
                 <td>{{ pkg.pkg.repo.name|capfirst }}</td>
                 <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
                 <td>
+                    {% if perms.main.change_todolistpkg %}
                     {% if pkg.complete %}
                     <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
                         class="status-link complete" title="Toggle completion status">Complete</a>
@@ -45,6 +46,9 @@
                     <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
                         class="status-link incomplete" title="Toggle completion status">Incomplete</a>
                     {% endif %}
+                    {% else %}
+                    {% if pkg.complete %}<span class="complete">Complete</span>{% else %}<span class="incomplete">Incomplete</span>{% endif %}
+                    {% endif %}
                 </td>
             </tr>
             {% endfor %}