Merge branch 'dam-ammain'

MR: nm-team/nm.debian.org!3


Signed-off-by: Mattia Rizzolo <mattia@debian.org>

process/templates/process/amdashboard.html

@@ -79,19 +79,6 @@ $(function() {
 <p>Currently there are no free application managers.</p>
 {% endif %}
 
-<h2>Debian Account Manager</h2>
-
-<p>The following applicants have been approved by the NM committee and the FD
-but a DAM has not fully processed them yet (sorted by FD approval):</p>
-{% include "process/process_table.html" with p=p progs=prog_fd_ok extras="m" only %}
-
-<p>Applicants approved by a DAM, but for which no account has been created yet:</p>
-{% include "process/process_table.html" with p=p progs=prog_dam_ok extras="m" only %}
-
-<p>These are applications that have been put on hold at the DAM stage
-(sorted by hold date):</p>
-{% include "process/process_table.html" with p=p progs=prog_dam_hold extras="m" only %}
-
 {% endif %}
 
 

process/templates/process/process_table.html

-{% load nm %}
-{% if progs %}
-<table class="proctable tablesorter">
-    <thead>
-        <tr>
-            <th>Started</th>
-            <th>Last</th>
-            <th>Target</th>
-            <th>Applicant</th>
-            <th>Uid</th>
-            <th>Adv.</th>
-            {% if "m" in extras %}
-            <th>Manager</th>
-            {% endif %}
-            <th>Last log</th>
-        </tr>
-    </thead>
-    <tbody>
-    {% for p in progs %}
-    <tr>
-        <td>{{p.started|date:"Y-m-d"}}</td>
-        <td>{{p.last_change|date:"Y-m-d"}}</td>
-        <td>{{p.applying_for|sdesc_status}}</td>
-        <td><a href="{{ p.get_absolute_url }}">{{p.person}}</a></td>
-        <td><a href="{{ p.get_absolute_url }}">{{p.person.uid}}</a></td>
-	<td>
-	    {% for a in p.advocates.all %}
-	    <a href="{{ a.get_absolute_url }}">{{a.uid}}</a>
-	    {% endfor %}
-	</td>
-	{% if "m" in extras %}
-        <td><a href="{{ p.manager.get_absolute_url }}">{{p.manager.person.uid}}</a></td>
-    {% endif %}
-    <td>
-        {% if p.log_last.logtext %}
-        {{ p.log_last.logtext }}
-        {% else %}
-        [{{p.log_last.progress|sdesc_progress}}]
-        {% endif %}
-    </td>
-    </tr>
-    {% endfor %}
-    </tbody>
-</table>
-{% else %}
-<p><i>none</i></p>
-{% endif %}
-

public/templates/public/process_table.html

-{% load nm %}
-{% if procs %}
-<table class="proctable tablesorter {{class}}">
-<thead>
-    <tr>
-        <th>Appl date</th>
-        <th>Last change</th>
-        <th>Progress</th>
-        <th>Applying for</th>
-        <th>Applicant</th>
-        <th>Uid</th>
-        <th>Advocate(s)</th>
-        <th>Manager</th>
-        {% if visitor.is_admin %}
-        <th>FD comments</th>
-        {% endif %}
-    </tr>
-</thead>
-<tbody>
-    {% for p in procs %}
-    <tr tag="{{p.progress}}">
-        <td>{{p.started|date:"Y-m-d"}}</td>
-        <td>{{p.last_change|date:"Y-m-d"}}</td>
-        <td val="{{ p.progress|seq_progress }}"><a href="{{ p.get_absolute_url }}">{{p.progress|desc_progress}}</a></td>
-        <td val="{{ p.applying_for|seq_status }}">{{p.applying_for|desc_status}}</td>
-        <td><a href="{{ p.get_absolute_url }}">{{p.person.fullname}}</a></td>
-        <td><a href="{{ p.get_absolute_url }}">{{p.person.uid}}</a></td>
-        <td>
-            {% for a in p.advocates.all %}
-            <a href="{{ a.get_absolute_url }}">{{a.uid}}</a>{% if not forloop.last %},{% endif %}
-            {% endfor %}
-        </td>
-        <td>
-            {% if p.manager %}
-            <a href="{{ p.manager.get_absolute_url }}">{{p.manager.person.uid}}</a>
-            {% endif %}
-        </td>
-        {% if visitor.is_admin %}
-        <td>{{ p.person.fd_comment }}</td>
-        {% endif %}
-    </tr>
-    {% endfor %}
-</tbody>
-</table>
-{% endif %}
-