diff options
author | Guilherme Salgado <guilherme.salgado@linaro.org> | 2011-06-30 15:10:54 -0300 |
---|---|---|
committer | Guilherme Salgado <guilherme.salgado@linaro.org> | 2011-06-30 15:10:54 -0300 |
commit | 85965bc62643d0e6b26c7376efb4a5f2030c53a1 (patch) | |
tree | fa23488c666b785197065660caa8f4385e8b89e7 /templates | |
parent | 0cfc76c5b93b3d35daa4b33db1704d04176608fa (diff) |
More assorted tweaks/fixes
- Show the patch list on a project's page
- Link email message IDs to gmane
- Reorganize the team page so that the chart is now at the top
- Remove some unnecessary stuff (download/permalink) from the patch page
Diffstat (limited to 'templates')
-rw-r--r-- | templates/patchmetrics/project.html | 80 | ||||
-rw-r--r-- | templates/patchmetrics/team.html | 33 | ||||
-rw-r--r-- | templates/patchwork/patch-list.html | 7 | ||||
-rw-r--r-- | templates/patchwork/patch.html | 24 |
4 files changed, 70 insertions, 74 deletions
diff --git a/templates/patchmetrics/project.html b/templates/patchmetrics/project.html index 31c2283..c102ebe 100644 --- a/templates/patchmetrics/project.html +++ b/templates/patchmetrics/project.html @@ -19,41 +19,49 @@ {% 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> </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> - {% if project.commit_url %} - <td><a href="{{project.commit_url}}{{project.last_seen_commit_ref}}" - >{{project.last_seen_commit_ref}}</a></td> - {% else %} - <td>{{project.last_seen_commit_ref}}</td> - {% endif %} - </tr> -</table> +<div class="yui3-g"> + <div class="yui3-u-1-2"> + <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.</p> + + {{patches_per_month_chart|safe}} + </div> + <div class="yui3-u-1-2"> + <h2>Project details</h2> + <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> + {% if project.commit_url %} + <td><a href="{{project.commit_url}}{{project.last_seen_commit_ref}}" + >{{project.last_seen_commit_ref}}</a></td> + {% else %} + <td>{{project.last_seen_commit_ref}}</td> + {% endif %} + </tr> + </table> + </div> +</div> + +<div> + <h2>Patches</h2> + {% include "patchwork/patch-list.html" %} +</div> {% endblock %} diff --git a/templates/patchmetrics/team.html b/templates/patchmetrics/team.html index 3993d83..f1cfe88 100644 --- a/templates/patchmetrics/team.html +++ b/templates/patchmetrics/team.html @@ -19,22 +19,27 @@ {% block body %} -<h2>Team members</h2> - <p> - {% for member in team.members %} - {{member.get_profile.person.name}}{% if not forloop.last %},{% endif %} - {% endfor %} - </p> +<div class="yui3-g"> + <div class="yui3-u-19-24"> + <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> + + {{patches_per_month_chart|safe}} + </div> + <div class="yui3-u-5-24"> + <h2>Team members</h2> + <ul> + {% for name in member_names %} + <li>{{name}}</li> + {% endfor %} + </ul> + </div> +</div> -<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> - -{{patches_per_month_chart|safe}} <br /> - <h2>Patches</h2> {% include "patchwork/patch-list.html" %} diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html index 7f842b6..db5d225 100644 --- a/templates/patchwork/patch-list.html +++ b/templates/patchwork/patch-list.html @@ -26,13 +26,6 @@ </tr> </table> -{% if page.paginator.long_page and user.is_authenticated %} -<div class="floaty"> - <a title="jump to form" href="#patchforms"><span - style="font-size: 120%">▾</span></a> -</div> -{% endif %} - <form method="post"> {% csrf_token %} <input type="hidden" name="form" value="patchlistform"/> diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html index 7c7a443..bba1dc5 100644 --- a/templates/patchwork/patch.html +++ b/templates/patchwork/patch.html @@ -38,27 +38,17 @@ function toggle_headers(link_id, headers_id) <td>{{ patch.name }}</td></tr> </tr> <tr> - <th>Date</th> - <td>{{ patch.date }}</td> - </tr> - <tr> - <th>Message ID</th> - <td>{{ patch.msgid }}</td> + <th>Project</th> + <td><a href="{% url patchmetrics.views.project project_id=patch.project.linkname %}" + >{{project.name}}</a></td> </tr> <tr> - <th>Download</th> - <td> - <a href="{% url patchwork.views.patch.mbox patch_id=patch.id %}" - >mbox</a> -{% if patch.content %}| - <a href="{% url patchwork.views.patch.content patch_id=patch.id %}" - >patch</a> -{% endif %} - </td> + <th>Date</th> + <td>{{ patch.date }}</td> </tr> <tr> - <th>Permalink</th> - <td><a href="{{ patch.get_absolute_url }}">{{ patch.get_absolute_url }}</a> + <th>List thread</th> + <td><a href="http://mid.gmane.org/{{patch.msgid}}">{{patch.msgid}}</a></td> </tr> <tr> <th>State</td> |