diff options
Diffstat (limited to 'templates/packages')
| -rw-r--r-- | templates/packages/details.html | 2 | ||||
| -rw-r--r-- | templates/packages/files-list.html | 6 | ||||
| -rw-r--r-- | templates/packages/flag_confirmed.html | 5 | ||||
| -rw-r--r-- | templates/packages/packages_list.html | 1 | ||||
| -rw-r--r-- | templates/packages/signoffs.html | 33 |
5 files changed, 29 insertions, 18 deletions
diff --git a/templates/packages/details.html b/templates/packages/details.html index d1e6eee9..068d1f1a 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -142,7 +142,7 @@ <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% userpkgs pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td> </tr><tr> <th>Build Date:</th> - <td>{{ pkg.build_date }} UTC</td> + <td>{{ pkg.build_date|date:"DATETIME_FORMAT" }} UTC</td> </tr><tr> <th>Last Updated:</th> <td>{{ pkg.last_update|date }}</td> diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html index bb89b663..95a85d24 100644 --- a/templates/packages/files-list.html +++ b/templates/packages/files-list.html @@ -2,12 +2,16 @@ <p class="message">Note: This file list was generated from a previous version of the package; it may be out of date.</p> {% endif %} -{% if files.count %} +{% if pkg.files_last_update %} +{% if files|length %} <ul> {% for file in files %} <li>{{ file.directory }}{{ file.filename|default:'' }}</li> {% endfor %} </ul> {% else %} +<p class="message">Package has no files.</p> +{% endif %} +{% else %} <p class="message">No file list available.</p> {% endif %} diff --git a/templates/packages/flag_confirmed.html b/templates/packages/flag_confirmed.html index baa466dd..ebb14608 100644 --- a/templates/packages/flag_confirmed.html +++ b/templates/packages/flag_confirmed.html @@ -4,12 +4,13 @@ {% block content %} <div id="pkg-flag" class="box"> - <h2>Package Flagged - {{ package.pkgname }}</h2> + <h2>Package Flagged - {{ package.pkgname }}</h2> <p>Thank you, the maintainers have been notified the following packages are out-of-date:</p> <ul> {% for pkg in packages %} - <li>{{ pkg.pkgname }} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li> + <li><a href="{{ pkg.get_absolute_url }}" + title="Package details for {{package.pkgname}}">{{ pkg.pkgname }} {{ pkg.full_version }}</a> [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li> {% endfor %} </ul> diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html index 2508d8fd..13b8caba 100644 --- a/templates/packages/packages_list.html +++ b/templates/packages/packages_list.html @@ -5,6 +5,7 @@ {% block content %} <div class="box"> <h2>{{ list_title }} - {{ name }} ({{ arch.name }})</h2> + <p>{{ packages|length }} package{{ packages|pluralize }} found.</p> <table class="results"> <thead> <tr> diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index 157843ac..53e9e46d 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -3,16 +3,19 @@ {% block navbarclass %}anb-packages{% endblock %} {% block content %} -{% if packages %} <div id="dev-signoffs" class="box"> <h2>Package Signoffs</h2> + <p>{{ signoff_groups|length }} signoff group{{ signoff_groups|pluralize }} found. + A "signoff group" consists of packages grouped by pkgbase, architecture, and repository.</p> + <table id="signoffs" class="results"> <thead> <tr> <th>Arch</th> - <th>Package</th> + <th>Package Base</th> + <th># of Packages</th> <th>Version</th> <th>Last Updated</th> <th>Target Repo</th> @@ -21,29 +24,32 @@ </tr> </thead> <tbody> - {% for pkg,target in packages %} + {% for group in signoff_groups %} + {% with group.package as pkg %} <tr class="{% cycle 'odd' 'even' %}"> <td>{{ pkg.arch.name }}</td> <td><a href="{{ pkg.get_absolute_url }}" title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td> + <td>{{ group.packages|length }}</td> <td>{{ pkg.full_version }}</td> - <td>{{ pkg.last_update }}</td> - <td>{{ target }}</td> - <td class="signoff-{{pkg.approved_for_signoff|yesno}}"> - {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td> + <td>{{ pkg.last_update|date }}</td> + <td>{{ group.target_repo }}</td> + <td class="signoff-{{group.approved|yesno}}"> + {{ group.approved|yesno:"Yes,No" }}</td> <td> <ul> - <li><a class="signoff-link" href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/" - title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a> + <li><a class="signoff-link" href="{{ pkg.get_absolute_url }}signoff/" + title="Signoff {{ pkg.pkgname }} for {{ pkg.arch }}">Signoff</a> </li> - {% for signoff in pkg.signoffs %} - <li class="signed-username" title="Signed off by {{signoff.packager}}"> - {{signoff.packager}}</li> + {% 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> - {% endfor %} + {% endwith %} + {% endfor %} </tbody> </table> </div> @@ -57,5 +63,4 @@ $(document).ready(function() { headers: { 6: { sorter: false } } }); }); </script> -{% endif %} {% endblock %} |