diff options
-rw-r--r-- | templates/packages/details_depend.html | 28 | ||||
-rw-r--r-- | templates/packages/details_requiredby.html | 17 |
2 files changed, 20 insertions, 25 deletions
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index a26d67bd..420af93c 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -1,18 +1,14 @@ -{% load package_extras %} -<li> +{% load package_extras %}{% spaceless %}<li> {% ifequal depend.pkg None %} -{% if depend.providers %} -{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span> -{% else %} -{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">(virtual)</span> -{% endif %} -{% else %} +{% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span> +{% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">(virtual)</span> +{% endif %}{% else %} {% pkg_details_link depend.pkg %}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} -{% if depend.pkg.repo.testing %} <span class="testing-dep">(testing)</span>{% endif %} -{% if depend.pkg.repo.staging %} <span class="staging-dep">(staging)</span>{% endif %} -{% endifequal %} -{% if depend.dep.deptype == 'O' %} <span class="opt-dep">(optional)</span>{% endif %} -{% if depend.dep.deptype == 'M' %} <span class="make-dep">(make)</span>{% endif %} -{% if depend.dep.deptype == 'C' %} <span class="check-dep">(check)</span>{% endif %} -{% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %} -</li> +{% if depend.pkg.repo.testing %} <span class="testing-dep">(testing)</span> +{% endif %}{% if depend.pkg.repo.staging %} <span class="staging-dep">(staging)</span> +{% endif %}{% endifequal %} +{% if depend.dep.deptype == 'O' %} <span class="opt-dep">(optional)</span> +{% endif %}{% if depend.dep.deptype == 'M' %} <span class="make-dep">(make)</span> +{% endif %}{% if depend.dep.deptype == 'C' %} <span class="check-dep">(check)</span> +{% endif %}{% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span> +{% endif %}</li>{% endspaceless %} diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index 24f8bbb1..f498bd5e 100644 --- a/templates/packages/details_requiredby.html +++ b/templates/packages/details_requiredby.html @@ -1,9 +1,8 @@ -{% load package_extras %} -<li>{% pkg_details_link req.pkg %} -{% if req.name != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.name }})</span>{% endif %} -{% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %} -{% if req.pkg.repo.staging %}<span class="staging-dep">(staging)</span>{% endif %} -{% if req.deptype == 'O' %}<span class="opt-dep">(optional)</span>{% endif %} -{% if req.deptype == 'M' %}<span class="make-dep">(make)</span>{% endif %} -{% if req.deptype == 'C' %}<span class="check-dep">(check)</span>{% endif %} -</li> +{% load package_extras %}{% spaceless %}<li>{% pkg_details_link req.pkg %} +{% if req.name != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.name }})</span> +{% endif %}{% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span> +{% endif %}{% if req.pkg.repo.staging %}<span class="staging-dep">(staging)</span> +{% endif %}{% if req.deptype == 'O' %}<span class="opt-dep">(optional)</span> +{% endif %}{% if req.deptype == 'M' %}<span class="make-dep">(make)</span> +{% endif %}{% if req.deptype == 'C' %}<span class="check-dep">(check)</span> +{% endif %}</li>{% endspaceless %} |