diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 21:05:13 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 21:05:13 -0500 |
| commit | 9e90f1968802d350157bcbeef0cebd7d96eb1ada (patch) | |
| tree | 1153f677b807c9d7f40ef2ce4f9ab692ac6979a0 /templates | |
| parent | 60f9b3fe60d5e5b6049ef71d1dfb25dade4fd6a3 (diff) | |
| parent | 20e9a83e05e352ec6e6f8fbe70457951cf9cd047 (diff) | |
Merge commit '20e9a83' from Archweb
Conflicts:
main/fixtures/groups.json
packages/templatetags/package_extras.py
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 5 | ||||
| -rw-r--r-- | templates/packages/details.html | 4 | ||||
| -rw-r--r-- | templates/packages/files.html | 4 | ||||
| -rw-r--r-- | templates/packages/files_list.html (renamed from templates/packages/files-list.html) | 5 | ||||
| -rw-r--r-- | templates/public/developer_list.html | 2 |
5 files changed, 9 insertions, 11 deletions
diff --git a/templates/base.html b/templates/base.html index 08881706..9f893eda 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE html> +<html lang="en"> <head> <title>{% block title %}Parabola GNU/Linux-libre{% endblock %}</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> diff --git a/templates/packages/details.html b/templates/packages/details.html index 4570627f..d0e60ab2 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -132,7 +132,7 @@ {% with pkg.maintainers as maints %} <td>{% if maints %} {% for m in maints %} - {% userpkgs m %}<br/> + {% maintainer_link m %}<br/> {% endfor %} {% else %}Orphan{% endif %} </td> @@ -145,7 +145,7 @@ <td>{{ pkg.installed_size|filesizeformat }}</td> </tr><tr> <th>Last Packager:</th> - <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% userpkgs pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td> + <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% packager_link pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td> </tr><tr> <th>Signed:</th> <td>{{ pkg.is_signed|yesno|capfirst }}</td> diff --git a/templates/packages/files.html b/templates/packages/files.html index 78a40def..8cf6738d 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -8,9 +8,9 @@ <h2>Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}</h2> <div id="metadata"> <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p> - {% include "packages/files-list.html" %} + <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p> + {% include "packages/files_list.html" %} </div> </div> {% endblock %} - diff --git a/templates/packages/files-list.html b/templates/packages/files_list.html index 95a85d24..156d8588 100644 --- a/templates/packages/files-list.html +++ b/templates/packages/files_list.html @@ -5,9 +5,8 @@ of the package; it may be out of date.</p> {% if pkg.files_last_update %} {% if files|length %} <ul> - {% for file in files %} - <li>{{ file.directory }}{{ file.filename|default:'' }}</li> - {% endfor %} +{% for file in files %} +<li>{{ file.directory }}{{ file.filename|default:'' }}</li>{% endfor %} </ul> {% else %} <p class="message">Package has no files.</p> diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index 5aa4c6b2..83c62952 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -18,7 +18,7 @@ </td> <td> <a name="{{ dev.username }}"></a> - <table class="bio bio-{{ dev.username }}" cellspacing="0"> + <table class="bio bio-{{ dev.username }}"> <tr> <th>Name:</th> <td>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}</td> |