From f9e173eb95db1785947872af9cc43bb5b5579678 Mon Sep 17 00:00:00 2001 From: eliott Date: Fri, 11 Apr 2008 21:36:18 -0700 Subject: fixes for changes in the model dealing with the urlize -> get_* refactor --- templates/packages/details.html | 143 +++++++++++++++--------------- templates/packages/search.html | 192 +++++++++++++++++++--------------------- 2 files changed, 167 insertions(+), 168 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 1784ab79..6d1f5066 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -1,77 +1,82 @@ {% load package_extras %} {% extends "base.html" %} +{% block title %}Pkg: {{ pkg.pkgname }} - Arch Linux Package Details{% endblock %} {% block content %} -
-

{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

-
-
    -
  • View File List
    • -
  • - {% if pkg.needupdate %} - This package has been flagged out-of-date - {% if not user.is_anonymous %} +
    +

    {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

    +
    + -
    - - - - - - - - - - - - - - - - - - + {% else %} + Flag Package Out-of-Date + (?) + {% endif %} + +
  •  
    • +
  • +
    + + + + +
    • + + +
    Architecture:{{ pkg.arch.name }}
    Repository:{{ pkg.repo.name|capfirst }}
    Description:{{ pkg.pkgdesc }}
    URL:{{ pkg.url }}
    Maintainer:{% if pkg.maintainer %}{{ pkg.maintainer.get_full_name }}{% else %}None{% endif %}
    LastUpdated:
    + + + + + + + + + + + + + + + + + - -
    Architecture:{{ pkg.arch.name }}
    Repository:{{ pkg.repo.name|capfirst }}
    Description:{{ pkg.pkgdesc }}
    Upstream URL:{{ pkg.url }}
    Maintainer:{% if pkg.maintainer %}{{ pkg.maintainer.get_full_name }}{% else %}None{% endif %}
    LastUpdated: {{ pkg.last_update|date:"Y-m-d" }}
    -
    - - - - - -
    -
    -

    Dependencies:

    -
      - {{ pkg.depends_urlize }} -
    -
    -     		-
    -

    Required By:

    -
      - {{ pkg.required_by_urlize }} -
    -
    -
    -
    + + +
    + + + + + +
    +
    +

    Dependencies:

    +
      + {% for dep in pkg.get_depends %} + {% ifequal dep.0 None %} +
    • {{ dep.1 }}
      • + {% else %} +
    • {{ dep.1 }}{{ dep.2 }}
      • + {% endifequal %} + {% endfor %} +
    +
    +     		+
    +

    Required By:

    +
      + {% for req in pkg.get_requiredby %} +
    • {{ req.1 }}
      • + {% endfor %} +
    +
    +
    +
{% endblock %} diff --git a/templates/packages/search.html b/templates/packages/search.html index b58ad07a..7e13a45c 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -1,47 +1,47 @@ {% load validation %} {% load package_extras %} {% extends "base.html" %} - +{% block title %}Arch Linux - Package Search{% endblock %} {% block head %} {% endblock %} {% block content %} -
-

Search Criteria

- {% if errors %} - {% print_errors errors %} - {% endif %} -
-
- - - - - - - - - - -
ArchRepositoryKeywordsLast UpdatePer Page
- - - - - - - - - - - - -
-
-
-

+ + + + + + + + + +
+

- {% if results %} -
- - - {% if not user.is_anonymous %} - - - {% endif %} - - - - - - - - {% for pkg in results %} + {% if results %} +
+
 ArchRepoNameVersionDescriptionLast Updated
+ + + + + + + + + + + {% for pkg in results %} - {% if not user.is_anonymous %} - - {% endif %} - - - - {% if pkg.needupdate %} - - {% else %} - - {% endif %} - - - - {% endfor %} - - - - - - {% if not user.is_anonymous %} - - - - - - - - {% endif %} -
 ArchRepoNameVersionDescriptionLast Updated
{{ pkg.arch.name }}{{ pkg.repo.name|capfirst }}{{ pkg.pkgname }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgdesc }}{{ pkg.last_update|date:"Y-m-d" }}
{% if prevpage %}
<<< Prev{% endif %}		 {% if nextpage %}
Next >>>{% endif %}
  
-
- {% endif %} + + {{ pkg.arch.name }} + {{ pkg.repo.name|capfirst }} + {{ pkg.pkgname }} + {% if pkg.needupdate %} + {{ pkg.pkgver }}-{{ pkg.pkgrel }} + {% else %} + {{ pkg.pkgver }}-{{ pkg.pkgrel }} + {% endif %} + {{ pkg.pkgdesc }} + {{ pkg.last_update|date:"Y-m-d" }} + + {% endfor %} + + {% if prevpage %}
<<< Prev{% endif %} +   + {% if nextpage %}
Next >>>{% endif %} + + +   + + +   + + + + + {% endif %} {% endblock %} -- cgit v1.2.3-2-g168b