From b9c6451f88caa35ab39b6468a99b147d7d7f4937 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 20 Mar 2011 15:51:02 -0500 Subject: Fix news preview with CSRF and AJAX in Django 1.2.5 Signed-off-by: Dan McGee --- templates/news/add.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/news/add.html b/templates/news/add.html index f580e0d0..bb866dc4 100644 --- a/templates/news/add.html +++ b/templates/news/add.html @@ -23,14 +23,14 @@

News: Add Article

- +

- -{% load cdn %}{% jquery %} - - -{% endblock %} diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html new file mode 100644 index 00000000..c897aac5 --- /dev/null +++ b/templates/packages/packages_list.html @@ -0,0 +1,47 @@ +{% extends "base.html" %} +{% block title %}Arch Linux - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %} +{% block navbarclass %}anb-packages{% endblock %} + +{% block content %} +
+

{{ list_title }} - {{ name }} ({{ arch.name }})

+ + + + + + + + + + + + + + {% for pkg in packages %} + + + + + {% if pkg.flag_date %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + +
ArchRepoNameVersionDescriptionLast UpdatedFlag Date
{{ pkg.arch.name }}{{ pkg.repo.name|capfirst }}{{ pkg.pkgname }}{{ pkg.full_version }}{{ pkg.full_version }}{{ pkg.pkgdesc }}{{ pkg.last_update|date }}{{ pkg.flag_date|date }}
+
+{% load cdn %}{% jquery %} + + +{% endblock %} -- cgit v1.2.3-54-g00ecf From a52ddb5c48dd2cb7856779f64611679aca7d660d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 23 Mar 2011 12:47:26 -0500 Subject: Allow virtual base packages to display in web interface Repurpose the old group details page to show a listing of all packages built from a particular pkgbase value, even if this value is not an actual package. Signed-off-by: Dan McGee --- packages/views.py | 26 +++++++++++++++++++++++--- templates/packages/details.html | 3 ++- 2 files changed, 25 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/packages/views.py b/packages/views.py index 374a1a20..263165fd 100644 --- a/packages/views.py +++ b/packages/views.py @@ -83,9 +83,29 @@ def update(request): def details(request, name='', repo='', arch=''): if all([name, repo, arch]): - pkg = get_object_or_404(Package, - pkgname=name, repo__name__iexact=repo, arch__name=arch) - return direct_to_template(request, 'packages/details.html', {'pkg': pkg, }) + try: + pkg = Package.objects.get(pkgname=name, + repo__name__iexact=repo, arch__name=arch) + return direct_to_template(request, 'packages/details.html', + {'pkg': pkg, }) + except Package.DoesNotExist: + arch = get_object_or_404(Arch, name=arch) + arches = [ arch ] + arches.extend(Arch.objects.filter(agnostic=True)) + repo = get_object_or_404(Repo, name__iexact=repo) + pkgs = Package.objects.filter(pkgbase=name, + repo__testing=repo.testing, arch__in=arches) + pkgs = pkgs.select_related('arch', 'repo').order_by('pkgname') + if len(pkgs) == 0: + raise Http404 + context = { + 'list_title': 'Split Package Details', + 'name': name, + 'arch': arch, + 'packages': pkgs, + } + return direct_to_template(request, 'packages/packages_list.html', + context) else: return redirect("/packages/?arch=%s&repo=%s&q=%s" % ( arch.lower(), repo.title(), name)) diff --git a/templates/packages/details.html b/templates/packages/details.html index 051726bd..4253f0b3 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -96,7 +96,8 @@

Versions Elsewhere

{{ pkg.pkgbase }} {% else %} - {{ pkg.pkgbase }} + {{ pkg.pkgbase }} {% endif %} {% endifequal %} -- cgit v1.2.3-54-g00ecf From 73ea5b8abe5de6457834c2981efaa70985dfa3e6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 24 Mar 2011 00:43:15 -0500 Subject: Remove dead merchandise link Addresses FS#23399. Signed-off-by: Dan McGee --- templates/public/index.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index 91a8414c..1f4b2ce5 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -133,8 +133,6 @@

Support

title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Products via Zazzle
  • T-shirts via Freewear
    • -
  • Merchandise via ProstoPrint

    • Tools

    -- cgit v1.2.3-54-g00ecf