A couple fixes to small issues detected during the deployment plus a bunch of UI improvements

6 files changed, 63 insertions, 39 deletions

diff --git a/templates/base.html b/templates/base.html
index cf0b99a..c16f020 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,11 +21,6 @@
     <a href="{% url patchwork.views.user.profile %}"
      ><strong>{{ user.username }}</strong></a>
     <br/>
-     <a href="{% url patchwork.views.user.todo_lists %}">todo
-      ({{ user.get_profile.n_todo_patches }})</a> ::
-     <a href="{% url patchwork.views.bundle.bundles %}">bundles</a>
-     <br/>
-     <a href="{% url patchwork.views.user.profile %}">profile</a> ::
      <a href="{% url auth_logout %}">logout</a>
 {% else %}
      <br/>
diff --git a/templates/patchmetrics/faq.html b/templates/patchmetrics/faq.html
index 43d18aa..92c6803 100644
--- a/templates/patchmetrics/faq.html
+++ b/templates/patchmetrics/faq.html
@@ -19,7 +19,7 @@ not included in our statistics:</p>
   <li>Are in the 'Superseded' state;</li>
   <li>Submitted to one of the following projects:
     {% for p in ignored_projects %}
-      <a href="{% url patchwork.views.project.project project_id=p.linkname %}"
+      <a href="{% url patchwork.views.patch.list project_id=p.linkname %}"
         >{{p.name}}</a>{% if not forloop.last %},{% endif %}
     {% endfor %}
   </li>
diff --git a/templates/patchmetrics/frontpage.html b/templates/patchmetrics/frontpage.html
index 6f9ad9f..ecdf1fc 100644
--- a/templates/patchmetrics/frontpage.html
+++ b/templates/patchmetrics/frontpage.html
@@ -45,7 +45,7 @@ common questions.</p>
   <div style="line-height: 2; min-height: 20em" class="break-after">
     <h3>Stats per project</h3>
     {% for p in projects %}
-      <a href="{% url patchwork.views.project.project project_id=p.linkname %}"
+      <a href="{% url patchmetrics.views.project project_id=p.linkname %}"
         >{{p.name}}</a>
       {% if not forloop.last %}&nbsp;|&nbsp;{% endif %}
     {% endfor %}
diff --git a/templates/patchmetrics/project.html b/templates/patchmetrics/project.html
new file mode 100644
index 0000000..6375d31
--- /dev/null
+++ b/templates/patchmetrics/project.html
@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+
+{% block headers %}
+  <script language="JavaScript" type="text/javascript"
+   src="/js/jquery-1.3.min.js">
+  </script>
+  <script language="JavaScript" type="text/javascript"
+   src="/js/jquery.gchart.min.js">
+  </script>
+{% endblock %}
+
+{% block title %}{{ project.name }}{% endblock %}
+{% block heading %}{{ project.name }}{% endblock %}
+
+{% block body %}
+
+<h2>Patch metrics</h2>
+
+<p>There are <strong>{{total_patches}}</strong> patches submitted to this
+project and <strong>{{accepted_patches}}</strong> have already been accepted
+upstream.
+<a href="{% url patchwork.views.patch.list project_id=project.linkname %}">See
+  all patches that haven't been accepted upstream yet</a>.</p>
+
+{{patches_per_month_chart|safe}}
+<p>&nbsp;</p>
+
+<table class="horizontal">
+ <tr>
+  <th>List address</th>
+  <td>{{project.listemail}}</td>
+ </tr>
+ <tr>
+  <th>Source tree</th>
+  <td>
+   {% if project.source_tree %}
+    {{project.source_tree}}
+   {% else %}
+    Not specified
+   {% endif %}
+  </td>
+ </tr>
+ <tr>
+  <th>Last commit scanned</th>
+  <td>{{project.last_seen_commit_ref}}</td>
+ </tr>
+</table>
+
+{% endblock %}
diff --git a/templates/patchmetrics/team.html b/templates/patchmetrics/team.html
index 9053105..d2b187f 100644
--- a/templates/patchmetrics/team.html
+++ b/templates/patchmetrics/team.html
@@ -14,26 +14,19 @@
 
 {% block body %}
 
-<table class="horizontal">
-  <tr>
-    <th>Team members:</th>
-    <td>
-      {% for member in team.members %}
-        {{member.get_profile.name}}{% if not forloop.last %},{% endif %}
-      {% endfor %}
-    </td>
-  </tr>
-  <tr>
-    <th>Submitted patches:</th>
-    <td>TODO</td>
-  </tr>
-  <tr>
-    <th>Accepted patches:</th>
-    <td>TODO</td>
-  </tr>
-</table>
+<h2>Team members</h2>
+  <p>
+    {% for member in team.members %}
+      {{member.get_profile.person.name}}{% if not forloop.last %},{% endif %}
+    {% endfor %}
+  </p>
+
+<h2>Patch metrics</h2>
+
+<p>There are <strong>{{total_submitted}}</strong> patches submitted by
+members of this team, and <strong>{{total_accepted}}</strong> of those have
+already been accepted upstream.</p>
 
-<p>&nbsp;</p>
 {{patches_per_month_chart|safe}}
 <p>&nbsp;</p>
 
diff --git a/templates/patchwork/project.html b/templates/patchwork/project.html
index 92b4729..637c17a 100644
--- a/templates/patchwork/project.html
+++ b/templates/patchwork/project.html
@@ -1,14 +1,5 @@
 {% extends "base.html" %}
 
-{% block headers %}
-  <script language="JavaScript" type="text/javascript"
-   src="/js/jquery-1.3.min.js">
-  </script>
-  <script language="JavaScript" type="text/javascript"
-   src="/js/jquery.gchart.min.js">
-  </script>
-{% endblock %}
-
 {% block title %}{{ project.name }}{% endblock %}
 {% block heading %}{{ project.name }}{% endblock %}
 
@@ -53,10 +44,6 @@
  </tr>
 </table>
 
-<p>&nbsp;</p>
-{{patches_per_month_chart|safe}}
-<p>&nbsp;</p>
-
 {% if settings.ENABLE_XMLRPC %}
 <p>Sample <a href="{% url patchwork.views.help "pwclient/" %}">patchwork
 client</a> configuration for this project: <a