diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/devel/index.html | 7 | ||||
| -rw-r--r-- | templates/packages/details.html | 9 | ||||
| -rw-r--r-- | templates/packages/flagged.html | 2 | ||||
| -rw-r--r-- | templates/packages/search.html | 6 |
4 files changed, 14 insertions, 10 deletions
diff --git a/templates/devel/index.html b/templates/devel/index.html index 12c0791e..acbe90bf 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -65,18 +65,17 @@ <br /><br /> <div class="greybox"> + <div>Counts are by 'pkgbase' and not raw number of packages.</div> <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Maintainer</h3> <table class="results" width="100%" style="display: none"> <tr> <th width="50%">Maintainer</th> <th># Packages</th> - <th># Flagged</th> </tr> {% for maint in maintainers %} <tr class="{% cycle pkgr2,pkgr1 %}"> <td><strong>{{ maint.get_full_name }}</strong></td> - <td><a href="/packages/?maintainer={{ maint.username }}"><strong>{{ maint.maintained_packages.count }}</strong> packages</a></td> - <td><a href="/packages/?maintainer={{ maint.username }}&flagged=Flagged"><strong>{{ maint.maintained_packages.flagged.count }}</strong> packages</a></td> + <td><a href="/packages/?maintainer={{ maint.username }}"><strong>{{ maint.package_relations.count }}</strong> packages</a></td> </tr> {% endfor %} </table> @@ -99,7 +98,7 @@ <th>Version</th> <th>Arch</th> </tr> - {% for pkg in user.maintained_packages.flagged %} + {% for pkg in flagged %} <tr class="{% cycle pkgr2,pkgr1 %}"> <td> <a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a> diff --git a/templates/packages/details.html b/templates/packages/details.html index def07501..648b6483 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -49,7 +49,14 @@ <td>{{ pkg.license }}</td> </tr><tr> <th>Maintainer:</th> - <td>{% if pkg.maintainer %}{{ pkg.maintainer.get_full_name }}{% else %}None{% endif %}</td> + {% with pkg.maintainers as maints %} + <td>{% if maints %} + {% for m in maints %} + {{ m.get_full_name }}<br/> + {% endfor %} + {% else %}Orphan{% endif %} + </td> + {% endwith %} </tr><tr> <th>Package Size:</th> <td>{{ pkg.compressed_size|filesizeformat }}</td> diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html index 64cb2452..3461bbda 100644 --- a/templates/packages/flagged.html +++ b/templates/packages/flagged.html @@ -3,6 +3,6 @@ {% block content %} <p> - {{pkg.pkgname}} on {{pkg.arch}} has already been flagged out of date. + {{pkg.pkgname}} has already been flagged out of date. </p> {% endblock %} diff --git a/templates/packages/search.html b/templates/packages/search.html index e760788e..4f7bc776 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -44,7 +44,7 @@ <table class="results" width="100%"> {% if paginator %} <tr> - <td colspan="{% if user.is_authenticated %}6{% else %}5{% endif %}"> + <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}"> {{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}. </td> @@ -77,7 +77,6 @@ <th><a href="/packages/{% buildsortqs "pkgname" %}">Name</a></th> <th>Version</th> <th>Description</th> - <th><a href="/packages/{% buildsortqs "maintainer" %}">Maintainer</a></th> <th><a href="/packages/{% buildsortqs "-last_update" %}">Last Updated</a></th> </tr> @@ -95,13 +94,12 @@ <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td> {% endif %} <td>{{ pkg.pkgdesc }}</td> - <td>{{ pkg.maintainer|default:"Orphan" }}</td> <td>{{ pkg.last_update|date:"Y-m-d" }}</td> </tr> {% endfor %} {% if paginator %} <tr> - <td colspan="{% if user.is_authenticated %}6{% else %}5{% endif %}"> + <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}"> {{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}. </td> |