diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
| commit | 03fa7e4f27bdb39a8f8f5ed91a87d18bf8357b47 (patch) | |
| tree | c67eafcbda55706f18400b3115a2b8a5be318394 /templates/packages/details_depend.html | |
| parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
| parent | b8ee7b1ee281b45b245fb454228b8ad847c56200 (diff) | |
Merge branch 'archweb' into archweb-generic2
Conflicts:
devel/views.py
feeds.py
public/views.py
settings.py
sitestatic/archweb.js
templates/base.html
templates/devel/profile.html
templates/mirrors/status.html
templates/news/view.html
templates/packages/flaghelp.html
templates/packages/opensearch.xml
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/registration/login.html
templates/releng/results.html
templates/todolists/public_list.html
Diffstat (limited to 'templates/packages/details_depend.html')
| -rw-r--r-- | templates/packages/details_depend.html | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index 8b6e85c9..4aa739c2 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -1,16 +1,14 @@ -{% load package_extras %} -<li> +{% load package_extras %}{% spaceless %}<li> {% ifequal depend.pkg None %} -{% if depend.providers %} -{{ depend.dep.depname }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span> -{% else %} -{{ depend.dep.depname }} <span class="virtual-dep">(virtual)</span> -{% endif %} -{% else %} -{% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|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.optional %} <span class="opt-dep">(optional)</span>{% endif %} -{% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %} -</li> +{% 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>{% endspaceless %} |