diff options
Diffstat (limited to 'templates/devel')
| -rw-r--r-- | templates/devel/clock.html | 2 | ||||
| -rw-r--r-- | templates/devel/index.html | 69 | ||||
| -rw-r--r-- | templates/devel/packages.html | 4 |
3 files changed, 63 insertions, 12 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index cbf4b834..2eafd529 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -45,7 +45,7 @@ <script type="text/javascript"> $(document).ready(function() { $("#clocks-table:has(tbody tr)").tablesorter( - {widgets: ['zebra'], sortList: [[1,0]]}); + {widgets: ['zebra'], sortList: [[0,0]]}); }); </script> {% endblock %} diff --git a/templates/devel/index.html b/templates/devel/index.html index 6b50d3a0..ad024a34 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load cache %} +{% load package_extras %} {% block title %}Parabola - Hacker Dashboard{% endblock %} @@ -14,8 +15,8 @@ <thead> <tr> <th>Name</th> - <th>Repo</th> <th>Version</th> + <th>Repo</th> <th>Arch</th> <th>Flagged</th> <th>Last Updated</th> @@ -24,16 +25,15 @@ <tbody> {% for pkg in flagged %} <tr class="{% cycle 'odd' 'even' %}"> - <td><a href="{{ pkg.get_absolute_url }}" - title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td> - <td>{{ pkg.repo.name }}</td> + <td>{% pkg_details_link pkg %}</td> <td>{{ pkg.full_version }}</td> + <td>{{ pkg.repo.name }}</td> <td>{{ pkg.arch.name }}</td> <td>{{ pkg.flag_date|date }}</td> <td>{{ pkg.last_update|date }}</td> </tr> {% empty %} - <tr class="empty"><td colspan="4"><em>No flagged packages to display</em></td></tr> + <tr class="empty"><td colspan="6"><em>No flagged packages to display</em></td></tr> {% endfor %} </tbody> </table> @@ -55,8 +55,7 @@ <tr class="{% cycle 'odd' 'even' %}"> <td><a href="{{ todopkg.list.get_absolute_url }}" title="View todo list: {{ todopkg.list.name }}">{{ todopkg.list.name }}</a></td> - <td><a href="{{ todopkg.pkg.get_absolute_url }}" - title="View package details for {{ todopkg.pkg.pkgname }}">{{ todopkg.pkg.pkgname }}</a></td> + <td>{% pkg_details_link todopkg.pkg %}</td> <td>{{ todopkg.pkg.repo.name }}</td> <td>{{ todopkg.pkg.arch.name }}</td> <td>{{ todopkg.pkg.maintainers|join:', ' }}</td> @@ -79,7 +78,6 @@ <th>Package Count</th> <th>Incomplete Count</th> </tr> - </tr> </thead> <tbody> {% for todo in todos %} @@ -93,7 +91,50 @@ <td>{{ todo.incomplete_count }}</td> </tr> {% empty %} - <tr class="empty"><td colspan="3"><em>No package todo lists to display</em></td></tr> + <tr class="empty"><td colspan="6"><em>No package todo lists to display</em></td></tr> + {% endfor %} + </tbody> + </table> + + <h3>Signoff Status</h3> + + <table id="dash-signoffs" class="results"> + <thead> + <tr> + <th>Name</th> + <th>Version</th> + <th>Arch</th> + <th>Target Repo</th> + <th>Last Updated</th> + <th>Approved</th> + <th>Signoffs</th> + </tr> + </thead> + <tbody> + {% for group in signoffs %} + <tr class="{% cycle 'odd' 'even' %}"> + <td>{% pkg_details_link group.package %}</td> + <td>{{ group.version }}</td> + <td>{{ group.arch.name }}</td> + <td>{{ group.target_repo }}</td> + <td>{{ group.last_update|date }}</td> + {% if group.specification.known_bad %} + <td class="approval signoff-bad">Bad</td> + {% else %} + {% if not group.specification.enabled %} + <td class="approval signoff-disabled">Disabled</td> + {% else %} + <td class="approval signoff-{{ group.approved|yesno }}">{{ group.approved|yesno|capfirst }}</td> + {% endif %} + {% endif %} + <td><ul class="signoff-list"> + {% for signoff in group.signoffs %} + <li class="signed-username" title="Signed off by {{ signoff.user }}">{{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}</li> + {% endfor %} + </ul></td> + </tr> + {% empty %} + <tr class="empty"><td colspan="7"><em>No packages you maintain or have packaged need signoffs</em></td></tr> {% endfor %} </tbody> </table> @@ -136,6 +177,7 @@ <th class="key">Arch</th> <th># Packages</th> <th># Flagged</th> + <th># Signed</th> </tr> </thead> <tbody> @@ -148,6 +190,8 @@ <td><a href="/packages/?arch={{ arch.name }}&flagged=Flagged" title="View all flagged packages for the {{ arch.name }} architecture"> <strong>{{ arch.packages.flagged.count }}</strong> packages</a></td> + + <td><strong>{{ arch.packages.signed.count }}</strong> packages</td> </tr> {% endfor %} </tbody> @@ -166,6 +210,7 @@ <th class="key">Repository</th> <th># Packages</th> <th># Flagged</th> + <th># Signed</th> </tr> </thead> <tbody> @@ -178,6 +223,7 @@ <td><a href="/packages/?repo={{ repo.name }}&flagged=Flagged" title="View all flagged packages in the {{ repo.name }} repository"> <strong>{{ repo.packages.flagged.count }}</strong> packages</a></td> + <td><strong>{{ repo.packages.signed.count }}</strong> packages</td> </tr> {% endfor %} </tbody> @@ -252,6 +298,11 @@ $(document).ready(function() { {widgets: ['zebra'], sortList: [[0,0], [1,0]]}); $("#dash-todo:not(:has(tbody tr.empty))").tablesorter( {widgets: ['zebra'], sortList: [[1,1]]}); + $("#dash-signoffs:not(:has(tbody tr.empty))").tablesorter({ + widgets: ['zebra'], + sortList: [[0,0]], + headers: { 6: {sorter: false } } + }); $(".dash-stats").tablesorter({ widgets: ['zebra'], sortList: [[0,0]], diff --git a/templates/devel/packages.html b/templates/devel/packages.html index 8f149a5c..bd126593 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load attributes %} +{% load package_extras %} {% block title %}Parabola - {{ title }}{% endblock %} @@ -32,8 +33,7 @@ <tr class="{% cycle pkgr2,pkgr1 %}"> <td>{{ pkg.arch.name }}</td> <td>{{ pkg.repo.name|capfirst }}</td> - <td><a href="{{ pkg.get_absolute_url }}" - title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td> + <td>{% pkg_details_link pkg %}</td> {% if pkg.flag_date %} <td><span class="flagged">{{ pkg.full_version }}</span></td> {% else %} |