X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=templates%2Fpatchwork%2Fprofile.html;h=116d6d63bfdf575bb6f903b8832b1293327cea10;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hp=dd5d35e00ca6cf3b5348c648092fa08496e940c4;hpb=ec565d23253cfea2ddc3335e45ce58a0bc1bb052;p=patchwork

diff --git a/templates/patchwork/profile.html b/templates/patchwork/profile.html
index dd5d35e..116d6d6 100644
--- a/templates/patchwork/profile.html
+++ b/templates/patchwork/profile.html
@@ -7,17 +7,17 @@
 {% block body %}
 
 <p>
-{% if user.get_profile.maintainer_projects.count %}
+{% if user.profile.maintainer_projects.count %}
 Maintainer of
-{% for project in user.get_profile.maintainer_projects.all %}
-<a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
+{% for project in user.profile.maintainer_projects.all %}
+<a href="{% url 'patchwork.views.patch.list' project_id=project.linkname %}"
 >{{ project.linkname }}</a>{% if not forloop.last %},{% endif %}{% endfor %}.
 {% endif %}
 
-{% if user.get_profile.contributor_projects.count %}
+{% if user.profile.contributor_projects.count %}
 Contributor to
-{% for project in user.get_profile.contributor_projects.all %}
-<a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
+{% for project in user.profile.contributor_projects.all %}
+<a href="{% url 'patchwork.views.patch.list' project_id=project.linkname %}"
 >{{ project.linkname }}</a>{% if not forloop.last %},{% endif %}{% endfor %}.
 {% endif %}
 </p>
@@ -25,10 +25,10 @@ Contributor to
 <div class="leftcol">
 <div class="box">
  <h2>Todo</h2>
-{% if user.get_profile.n_todo_patches %}
- <p>Your <a href="{% url patchwork.views.user.todo_lists %}">todo
-  list</a> contains {{ user.get_profile.n_todo_patches }}
-  patch{{ user.get_profile.n_todo_patches|pluralize:"es" }}.</p>
+{% if user.profile.n_todo_patches %}
+ <p>Your <a href="{% url 'patchwork.views.user.todo_lists' %}">todo
+  list</a> contains {{ user.profile.n_todo_patches }}
+  patch{{ user.profile.n_todo_patches|pluralize:"es" }}.</p>
 {% else %}
  <p>Your todo list contains patches that have been delegated to you. You
   have no items in your todo list at present.</p>
@@ -39,36 +39,52 @@ Contributor to
 <h2>Linked email addresses</h2>
 <p>The following email addresses are associated with this patchwork account.
 Adding alternative addresses allows patchwork to group contributions that
-you have made under different addressses.</p>
+you have made under different addresses.</p>
+<p>The "notify?" column allows you to opt-in or -out of automated
+patchwork notification emails. Setting it to "no" will disable automated
+notifications for that address.</p>
 <p>Adding a new email address will send a confirmation email to that
 address.</p>
-<table class="vertical" style="width: 20em;">
+<table class="vertical">
  <tr>
   <th>email</th>
-  <th/>
- </tr>
- <tr>
-  <td>{{ user.email }}</td>
-  <td></td>
+  <th>action</th>
+  <th>notify?</th>
  </tr>
 {% for email in linked_emails %}
- {% ifnotequal email.email user.email %}
  <tr>
   <td>{{ email.email }}</td>
   <td>
-   {% ifnotequal user.email email.email %}
-   <form action="{% url patchwork.views.user.unlink person_id=email.id %}"
+  {% ifnotequal user.email email.email %}
+   <form action="{% url 'patchwork.views.user.unlink' person_id=email.id %}"
     method="post">
     {% csrf_token %}
     <input type="submit" value="Unlink"/>
    </form>
     {% endifnotequal %}
+  </td>
+  <td>
+   {% if email.is_optout %}
+   <form method="post" action="{% url 'patchwork.views.mail.optin' %}">
+    No,
+     {% csrf_token %}
+     <input type="hidden" name="email" value="{{email.email}}"/>
+     <input type="submit" value="Opt-in"/>
+    </form>
+   {% else %}
+    <form method="post" action="{% url 'patchwork.views.mail.optout' %}">
+    Yes,
+     {% csrf_token %}
+     <input type="hidden" name="email" value="{{email.email}}"/>
+     <input type="submit" value="Opt-out"/>
+    </form>
+   {% endif %}
+  </td>
  </tr>
- {% endifnotequal %}
 {% endfor %}
  <tr>
-  <td colspan="2">
-   <form action="{% url patchwork.views.user.link %}" method="post">
+  <td colspan="3">
+   <form action="{% url 'patchwork.views.user.link' %}" method="post">
     {% csrf_token %}
     {{ linkform.email }}
     <input type="submit" value="Add"/>
@@ -88,11 +104,10 @@ address.</p>
 <p>You have the following bundle{{ bundle|length|pluralize }}:</p>
 <ul>
 {% for bundle in bundles %}
- <li><a href="{% url patchwork.views.bundle.bundle bundle_id=bundle.id %}"
-   >{{ bundle.name }}</a></li>
+ <li><a href="{{ bundle.get_absolute_url }}">{{ bundle.name }}</a></li>
 {% endfor %}
 </ul>
-<p>Visit the <a href="{%url patchwork.views.bundle.bundles %}">bundles
+<p>Visit the <a href="{%url 'patchwork.views.bundle.bundles' %}">bundles
  page</a> to manage your bundles.</p>
 {% else %}
 <p>You have no bundles.</p>
@@ -119,7 +134,7 @@ address.</p>
 
 <div class="box">
 <h2>Authentication</h2>
-<a href="{% url django.contrib.auth.views.password_change %}">Change password</a>
+<a href="{% url 'django.contrib.auth.views.password_change' %}">Change password</a>
 </div>
 
 </div>