summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 19:16:13 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 19:16:13 -0500
commitcdfa6c1195bb6feb812bffc981183f0758ca5e2f (patch)
treed06b43424ad16f905fac7f2af54fec3fbc428e5f
parent4b700666e3405b8dc1891dd7e156b233333c7912 (diff)
parentfd1c992472ea259111a2f4930b73a805c07ee068 (diff)
Merge tag 'release_2012-03-25'
Django 1.4 upgrade and a bunch of other stuff
Diffstat
-rw-r--r--main/models.py4
-rw-r--r--main/templatetags/cdn.py6
-rw-r--r--mirrors/management/commands/mirrorcheck.py3
-rw-r--r--packages/views/search.py8
-rw-r--r--retro/templates/retro/index-20020328.html8
-rw-r--r--retro/templates/retro/index-20030330.html12
-rw-r--r--retro/templates/retro/index-20040327.html24
-rw-r--r--retro/templates/retro/index-20050328.html26
-rw-r--r--retro/templates/retro/index-20060328.html24
-rw-r--r--retro/templates/retro/index-20070324.html18
-rw-r--r--retro/templates/retro/index-20080311.html16
-rw-r--r--retro/templates/retro/index-20090327.html14
-rw-r--r--retro/templates/retro/index-20100208.html16
-rw-r--r--retro/templates/retro/index-20110212.html20
-rw-r--r--retro/templatetags/__init__.py0
-rw-r--r--retro/templatetags/retro.py13
-rw-r--r--retro/views.py4
-rw-r--r--templates/devel/index.html5
18 files changed, 108 insertions, 113 deletions
diff --git a/main/models.py b/main/models.py
index 7d017242..289cbb84 100644
--- a/main/models.py
+++ b/main/models.py
@@ -74,10 +74,6 @@ class PackageManager(models.Manager):
"""Used by dev dashboard."""
return self.filter(flag_date__isnull=False)
- def signed(self):
- """Used by dev dashboard."""
- return self.filter(pgp_signature__isnull=False)
-
def normal(self):
return self.select_related('arch', 'repo')
diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py
index f290a524..ab5d881a 100644
--- a/main/templatetags/cdn.py
+++ b/main/templatetags/cdn.py
@@ -1,8 +1,10 @@
from django import template
from django.conf import settings
+from django.contrib.staticfiles.storage import staticfiles_storage
register = template.Library()
+
@register.simple_tag
def jquery():
version = '1.4.4'
@@ -11,8 +13,8 @@ def jquery():
link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \
'%s/jquery.min.js' % version
else:
- static_url = getattr(settings, 'STATIC_URL', '/static/')
- link = '%sjquery-%s.min.js' % (static_url, version)
+ filename = 'jquery-%s.min.js' % version
+ link = staticfiles_storage.url(filename)
return '<script type="text/javascript" src="%s"></script>' % link
# vim: set ts=4 sw=4 et:
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
index c2928e67..7ffb7773 100644
--- a/mirrors/management/commands/mirrorcheck.py
+++ b/mirrors/management/commands/mirrorcheck.py
@@ -137,8 +137,7 @@ class MirrorCheckPool(object):
logger.debug("joining on all threads")
self.tasks.join()
logger.debug("processing log entries")
- for log in self.logs:
- log.save()
+ MirrorLog.objects.bulk_create(self.logs)
logger.debug("log entries saved")
def check_current_mirrors():
diff --git a/packages/views/search.py b/packages/views/search.py
index 65fcddb3..1431893d 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -44,9 +44,6 @@ class PackageSearchForm(forms.Form):
flagged = forms.ChoiceField(
choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']),
required=False)
- signed = forms.ChoiceField(
- choices=[('', 'All')] + make_choice(['Signed', 'Unsigned']),
- required=False)
limit = LimitTypedChoiceField(
choices=make_choice([50, 100, 250]) + [('all', 'All')],
coerce=coerce_limit_value,
@@ -97,11 +94,6 @@ def parse_form(form, packages):
elif form.cleaned_data['flagged'] == 'Not Flagged':
packages = packages.filter(flag_date__isnull=True)
- if form.cleaned_data['signed'] == 'Signed':
- packages = packages.filter(pgp_signature__isnull=False)
- elif form.cleaned_data['signed'] == 'Unsigned':
- packages = packages.filter(pgp_signature__isnull=True)
-
if form.cleaned_data['last_update']:
lu = form.cleaned_data['last_update']
packages = packages.filter(last_update__gte=
diff --git a/retro/templates/retro/index-20020328.html b/retro/templates/retro/index-20020328.html
index ca74cb4f..8c8f9d62 100644
--- a/retro/templates/retro/index-20020328.html
+++ b/retro/templates/retro/index-20020328.html
@@ -1,8 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+{% load retro_static from retro %}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html><head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Arch Linux</title>
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}main.css">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "main.css" %}">
</head>
<body bgcolor="#000000" link="cccc00" text="#cccccc">
@@ -27,7 +27,7 @@ Devel: &nbsp; 0.2
</tr>
</tbody></table>
</td><td align="right">
-<img src="{{ RETRO_STATIC_URL }}archlogo_black.gif" alt="Arch Logo"><br>
+<img src="{% retro_static year "archlogo_black.gif" %}" alt="Arch Logo"><br>
<span class="quote">
</span>
</td></tr></tbody></table>
@@ -131,7 +131,7 @@ here</a> to use the web interface.
&lt;<a href="mailto:jvinet@zeroflux.org">jvinet@zeroflux.org</a>&gt;
</span>
<a href="http://web.archive.org/web/20020328043401/http://sourceforge.net/">
- <img src="{{ RETRO_STATIC_URL }}sflogo.png" alt="SourceForge Logo" align="right" border="0" height="31" width="105"></a>
+ <img src="{% retro_static year "sflogo.png" %}" alt="SourceForge Logo" align="right" border="0" height="31" width="105"></a>
</p></center>
</body></html>
diff --git a/retro/templates/retro/index-20030330.html b/retro/templates/retro/index-20030330.html
index 59bb9189..449731af 100644
--- a/retro/templates/retro/index-20030330.html
+++ b/retro/templates/retro/index-20030330.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+{% load retro_static from retro %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Arch Linux</title>
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}main.css">
-<link rel="SHORTCUT ICON" href="{{ RETRO_STATIC_URL }}favicon.ico">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "main.css" %}">
+<link rel="SHORTCUT ICON" href="{% retro_static year "favicon.ico" %}">
</head>
-<body background="{{ RETRO_STATIC_URL }}dblue071.jpg" bgcolor="#222222" link="cccc00" text="#cccccc">
+<body background="{% retro_static year "dblue071.jpg" %}" bgcolor="#222222" link="cccc00" text="#cccccc">
<!--BANNER-->
<table class="container" align="center" cellpadding="5" height="100%">
@@ -20,7 +20,7 @@
</span>
</td></tr></tbody></table><br>
</td><td rowspan="2" align="right">
- <img src="{{ RETRO_STATIC_URL }}logo.png">
+ <img src="{% retro_static year "logo.png" %}">
</td></tr><tr><td valign="bottom">
<span class="quote">An i686-optimized Linux distribution.</span>
</td></tr></tbody></table>
@@ -245,6 +245,6 @@ Copyright ©2002, Judd Vinet
&lt;<a href="mailto:jvinet@zeroflux.org">jvinet@zeroflux.org</a>&gt;
</p>
<a href="http://web.archive.org/web/20030330090147/http://sourceforge.net/">
- <img src="{{ RETRO_STATIC_URL }}sflogo.png" alt="SourceForge Logo" align="right" border="0" height="31" width="105"></a>
+ <img src="{% retro_static year "sflogo.png" %}" alt="SourceForge Logo" align="right" border="0" height="31" width="105"></a>
</body></html>
diff --git a/retro/templates/retro/index-20040327.html b/retro/templates/retro/index-20040327.html
index 08588fe5..9c8ea0dd 100644
--- a/retro/templates/retro/index-20040327.html
+++ b/retro/templates/retro/index-20040327.html
@@ -1,10 +1,10 @@
-<html><head>
+{% load retro_static from retro %}<html><head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Arch Linux</title>
<meta name="keywords" content="linux, linux distribution, arch, pacman, i686-optimized, distribution, open source, free, packages, server, daemon, network, systems">
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}fonts.css">
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}containers.css">
-<link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "fonts.css" %}">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "containers.css" %}">
+<link rel="shortcut icon" href="{% retro_static year "favicon.ico" %}">
</head>
<body>
<table style="background-color: rgb(0, 0, 0); width: 100%;" cellspacing="0">
@@ -15,7 +15,7 @@
<td class="headerFill" colspan="2">
<table width="100%">
<tbody><tr>
- <td class="headerDisplay"><img src="{{ RETRO_STATIC_URL }}logoTop.gif"></td>
+ <td class="headerDisplay"><img src="{% retro_static year "logoTop.gif" %}"></td>
<td class="headerDisplay" align="right">
</td>
</tr>
@@ -212,13 +212,13 @@
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
-<a href="http://web.archive.org/web/20040327023505/http://sourceforge.net/"><img src="{{ RETRO_STATIC_URL }}sflogo.png" alt="SourceForge Logo" border="0" height="31" width="105"></a>
+<a href="http://web.archive.org/web/20040327023505/http://sourceforge.net/"><img src="{% retro_static year "sflogo.png" %}" alt="SourceForge Logo" border="0" height="31" width="105"></a>
</td>
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
<!-- paypal code -->
-<img src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
+<img src="{% retro_static year "x-click-butcc-donate.gif" %}" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
<br>
<span class="f4">All money goes directly to server costs</span>
</td>
@@ -243,7 +243,7 @@
<td class="boxSoft">
<table style="width: 100%;" cellspacing="4">
<tbody><tr>
- <td colspan="2" style="text-align: center; width: 50%;"><img src="{{ RETRO_STATIC_URL }}frontComponents.gif" height="30" width="179"><br><img src="{{ RETRO_STATIC_URL }}pad.gif" height="50"></td>
+ <td colspan="2" style="text-align: center; width: 50%;"><img src="{% retro_static year "frontComponents.gif" %}" height="30" width="179"><br><img src="{% retro_static year "pad.gif" %}" height="50"></td>
<td colspan="2" style="text-align: center; width: 100%;" align="right" valign="top">
<table class="boxSoftSmall" style="width: 250px;" align="right" cellspacing="3">
<tbody><tr>
@@ -330,7 +330,7 @@ March 26 20:54 </span></td>
</tr>
</tbody></table>
</td></tr><tr><td>
- <img src="{{ RETRO_STATIC_URL }}pad.gif" height="30"><br>
+ <img src="{% retro_static year "pad.gif" %}" height="30"><br>
<span class="f3">Release Package Lists</span>
<table style="width: 90%;" align="right">
<tbody><tr>
@@ -360,7 +360,7 @@ March 26 20:54 </span></td>
</td>
</tr>
<tr>
- <td colspan="4"><img src="{{ RETRO_STATIC_URL }}pad.gif" height="10" width="1"></td>
+ <td colspan="4"><img src="{% retro_static year "pad.gif" %}" height="10" width="1"></td>
</tr>
</tbody></table>
</td>
@@ -378,7 +378,7 @@ March 26 20:54 </span></td>
<td class="boxSoft">
<table style="width: 100%;" cellspacing="4">
<tbody><tr>
- <td colspan="2" style="text-align: center; width: 50%;"><img src="{{ RETRO_STATIC_URL }}frontNews.gif" height="30" width="179"><br><img src="{{ RETRO_STATIC_URL }}pad.gif" height="50"></td>
+ <td colspan="2" style="text-align: center; width: 50%;"><img src="{% retro_static year "frontNews.gif" %}" height="30" width="179"><br><img src="{% retro_static year "pad.gif" %}" height="50"></td>
<td colspan="2" style="text-align: center; width: 50%;" align="right" valign="top">
<table class="boxSoftSmall" style="width: 250px;" align="right" cellspacing="3">
<tbody><tr>
@@ -455,7 +455,7 @@ March 26 20:54 </span></td>
</td>
</tr>
<tr>
- <td colspan="4"><img src="{{ RETRO_STATIC_URL }}pad.gif" height="10" width="1"></td>
+ <td colspan="4"><img src="{% retro_static year "pad.gif" %}" height="10" width="1"></td>
</tr>
</tbody></table>
</td>
diff --git a/retro/templates/retro/index-20050328.html b/retro/templates/retro/index-20050328.html
index 2ac8c580..8b4f9e75 100644
--- a/retro/templates/retro/index-20050328.html
+++ b/retro/templates/retro/index-20050328.html
@@ -1,10 +1,10 @@
-<html><head>
+{% load retro_static from retro %}<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Arch Linux</title>
<meta name="keywords" content="linux, linux distribution, arch, pacman, i686-optimized, distribution, open source, free, packages, server, daemon, network, systems">
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}fonts.css">
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}containers.css">
-<link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "fonts.css" %}">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "containers.css" %}">
+<link rel="shortcut icon" href="{% retro_static year "favicon.ico" %}">
</head>
<body>
<table style="background-color: rgb(0, 0, 0); width: 100%;" cellspacing="0">
@@ -15,7 +15,7 @@
<td class="headerFill" colspan="2">
<table width="100%">
<tbody><tr>
- <td class="headerDisplay"><img src="{{ RETRO_STATIC_URL }}logoTop.png"></td>
+ <td class="headerDisplay"><img src="{% retro_static year "logoTop.png" %}"></td>
<td class="headerDisplay" align="right">
</td>
</tr>
@@ -284,18 +284,18 @@
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
-<a href="http://web.archive.org/web/20050328032247/http://www.archlinux.org/"><img src="{{ RETRO_STATIC_URL }}button.png" alt="Arch Linux" border="0"></a>
+<a href="http://web.archive.org/web/20050328032247/http://www.archlinux.org/"><img src="{% retro_static year "button.png" %}" alt="Arch Linux" border="0"></a>
</td>
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
-<a href="http://web.archive.org/web/20050328032247/http://sourceforge.net/"><img src="{{ RETRO_STATIC_URL }}sflogo.png" alt="SourceForge Logo" border="0" height="31" width="105"></a>
+<a href="http://web.archive.org/web/20050328032247/http://sourceforge.net/"><img src="{% retro_static year "sflogo.png" %}" alt="SourceForge Logo" border="0" height="31" width="105"></a>
</td>
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
<!-- paypal code -->
-<img src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
+<img src="{% retro_static year "x-click-butcc-donate.gif" %}" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
<br>
<span class="f4">All money goes directly to server costs</span>
</td>
@@ -320,7 +320,7 @@
<td class="boxSoft">
<table style="width: 100%;" cellspacing="4">
<tbody><tr>
- <td colspan="2" style="text-align: center; width: 50%;"><img src="{{ RETRO_STATIC_URL }}frontComponents.gif" height="30" width="179"><br><img src="{{ RETRO_STATIC_URL }}pad.gif" height="50"></td>
+ <td colspan="2" style="text-align: center; width: 50%;"><img src="{% retro_static year "frontComponents.gif" %}" height="30" width="179"><br><img src="{% retro_static year "pad.gif" %}" height="50"></td>
<td colspan="2" style="text-align: center; width: 100%;" align="right" valign="top">
<table class="boxSoftSmall" style="width: 250px;" align="right" cellspacing="3">
<tbody><tr>
@@ -401,7 +401,7 @@ March 24 05:13 </span></td>
</tr>
</tbody></table>
</td></tr><tr><td>
- <img src="{{ RETRO_STATIC_URL }}pad.gif" height="30"><br>
+ <img src="{% retro_static year "pad.gif" %}" height="30"><br>
<span class="f3">Release Package Lists</span>
<table style="width: 90%;" align="right">
<tbody><tr>
@@ -434,7 +434,7 @@ March 24 05:13 </span></td>
</td>
</tr>
<tr>
- <td colspan="4"><img src="{{ RETRO_STATIC_URL }}pad.gif" height="10" width="1"></td>
+ <td colspan="4"><img src="{% retro_static year "pad.gif" %}" height="10" width="1"></td>
</tr>
</tbody></table>
</td>
@@ -452,7 +452,7 @@ March 24 05:13 </span></td>
<td class="boxSoft">
<table style="width: 100%;" cellspacing="4">
<tbody><tr>
- <td colspan="2" style="text-align: center; width: 50%;"><img src="{{ RETRO_STATIC_URL }}frontNews.gif" height="30" width="179"><br><img src="{{ RETRO_STATIC_URL }}pad.gif" height="50"></td>
+ <td colspan="2" style="text-align: center; width: 50%;"><img src="{% retro_static year "frontNews.gif" %}" height="30" width="179"><br><img src="{% retro_static year "pad.gif" %}" height="50"></td>
<td colspan="2" style="text-align: center; width: 50%;" align="right" valign="top">
<table class="boxSoftSmall" style="width: 250px;" align="right" cellspacing="3">
<tbody><tr>
@@ -578,7 +578,7 @@ You can enab...</span></div> </span>
</td>
</tr>
<tr>
- <td colspan="4"><img src="{{ RETRO_STATIC_URL }}pad.gif" height="10" width="1"></td>
+ <td colspan="4"><img src="{% retro_static year "pad.gif" %}" height="10" width="1"></td>
</tr>
</tbody></table>
</td>
diff --git a/retro/templates/retro/index-20060328.html b/retro/templates/retro/index-20060328.html
index 6f39c0ed..f45024df 100644
--- a/retro/templates/retro/index-20060328.html
+++ b/retro/templates/retro/index-20060328.html
@@ -1,12 +1,12 @@
-<html><head>
+{% load retro_static from retro %}<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Arch Linux</title>
<meta name="keywords" content="linux, linux distribution, arch, pacman, i686-optimized, distribution, open source, free, packages, server, daemon, network, systems">
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}fonts.css">
-<link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}containers.css">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "fonts.css" %}">
+<link rel="stylesheet" type="text/css" href="{% retro_static year "containers.css" %}">
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Feed" href="http://web.archive.org/web/20060328003102/http://www.archlinux.org/rdf_news.php">
<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20060328003102/http://www.archlinux.org/rdf_feed.php">
-<link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+<link rel="shortcut icon" href="{% retro_static year "favicon.ico" %}">
</head>
<body>
<table style="background-color: rgb(0, 0, 0); width: 100%;" cellspacing="0">
@@ -17,7 +17,7 @@
<td class="headerFill" colspan="2">
<table width="100%">
<tbody><tr>
- <td class="headerDisplay"><img src="{{ RETRO_STATIC_URL }}logoTop.png"></td>
+ <td class="headerDisplay"><img src="{% retro_static year "logoTop.png" %}"></td>
<td class="headerDisplay" align="right">
</td>
</tr>
@@ -317,13 +317,13 @@
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
- <a href="http://web.archive.org/web/20060328003102/http://www.archlinux.org/"><img src="{{ RETRO_STATIC_URL }}button.png" alt="Arch Linux" border="0"></a>
+ <a href="http://web.archive.org/web/20060328003102/http://www.archlinux.org/"><img src="{% retro_static year "button.png" %}" alt="Arch Linux" border="0"></a>
</td>
</tr>
<tr>
<td style="background-color: rgb(238, 238, 238);" align="center"><br>
<!-- paypal code -->
-<img src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
+<img src="{% retro_static year "x-click-butcc-donate.gif" %}" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
</td>
</tr>
<tr>
@@ -346,7 +346,7 @@
<td class="boxSoft">
<table style="width: 100%;" cellspacing="4">
<tbody><tr>
- <td colspan="2" style="text-align: center; width: 50%;"><img src="{{ RETRO_STATIC_URL }}frontComponents.gif" height="30" width="179"><br><img src="{{ RETRO_STATIC_URL }}pad.gif" height="50"></td>
+ <td colspan="2" style="text-align: center; width: 50%;"><img src="{% retro_static year "frontComponents.gif" %}" height="30" width="179"><br><img src="{% retro_static year "pad.gif" %}" height="50"></td>
<td colspan="2" style="text-align: center; width: 100%;" align="right" valign="top">
<table class="boxSoftSmall" style="width: 250px;" align="right" cellspacing="3">
<tbody><tr>
@@ -427,7 +427,7 @@ March 27 13:34 </span></td>
</tr>
</tbody></table>
</td></tr><tr><td>
- <img src="{{ RETRO_STATIC_URL }}pad.gif" height="30"><br>
+ <img src="{% retro_static year "pad.gif" %}" height="30"><br>
<span class="f3">Release Package Lists</span>
<table style="width: 90%;" align="right">
<tbody><tr>
@@ -472,7 +472,7 @@ March 27 13:34 </span></td>
</td>
</tr>
<tr>
- <td colspan="4"><img src="{{ RETRO_STATIC_URL }}pad.gif" height="10" width="1"></td>
+ <td colspan="4"><img src="{% retro_static year "pad.gif" %}" height="10" width="1"></td>
</tr>
</tbody></table>
</td>
@@ -490,7 +490,7 @@ March 27 13:34 </span></td>
<td class="boxSoft">
<table style="width: 100%;" cellspacing="4">
<tbody><tr>
- <td colspan="2" style="text-align: center; width: 50%;"><img src="{{ RETRO_STATIC_URL }}frontNews.gif" height="30" width="179"><br><img src="{{ RETRO_STATIC_URL }}pad.gif" height="50"></td>
+ <td colspan="2" style="text-align: center; width: 50%;"><img src="{% retro_static year "frontNews.gif" %}" height="30" width="179"><br><img src="{% retro_static year "pad.gif" %}" height="50"></td>
<td colspan="2" style="text-align: center; width: 50%;" align="right" valign="top">
<table class="boxSoftSmall" style="width: 250px;" align="right" cellspacing="3">
<tbody><tr>
@@ -622,7 +622,7 @@ Xorg7 has finally moved into Current. The upgrade is pretty sm...</span></div>
</td>
</tr>
<tr>
- <td colspan="4"><img src="{{ RETRO_STATIC_URL }}pad.gif" height="10" width="1"></td>
+ <td colspan="4"><img src="{% retro_static year "pad.gif" %}" height="10" width="1"></td>
</tr>
</tbody></table>
</td>
diff --git a/retro/templates/retro/index-20070324.html b/retro/templates/retro/index-20070324.html
index c4739927..14453726 100644
--- a/retro/templates/retro/index-20070324.html
+++ b/retro/templates/retro/index-20070324.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd ">
+{% load retro_static from retro %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd ">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<title>Arch Linux</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" href="{{ RETRO_STATIC_URL }}arch.css">
- <link rel="icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
- <link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
+ <link rel="stylesheet" href="{% retro_static year "arch.css" %}">
+ <link rel="icon" href="{% retro_static year "favicon.ico" %}" type="image/x-icon">
+ <link rel="shortcut icon" href="{% retro_static year "favicon.ico" %}" type="image/x-icon">
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/news/">
<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/packages/">
@@ -14,8 +14,8 @@
<div id="head_container">
<div id="title">
- <div id="logo"><a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{{ RETRO_STATIC_URL }}logo.png" alt="Arch Logo"></a></div>
- <a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{{ RETRO_STATIC_URL }}title.png" alt="Arch Linux"></a>
+ <div id="logo"><a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{% retro_static year "logo.png" %}" alt="Arch Logo"></a></div>
+ <a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{% retro_static year "title.png" %}" alt="Arch Linux"></a>
</div>
<div style="float: right; color: #eeeeee; font-size: small">
@@ -51,7 +51,7 @@
<table width="100%">
<tbody><tr>
<td><h3>Recent Updates</h3></td>
- <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/packages/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a></td>
+ <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/packages/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a></td>
</tr>
<tr>
@@ -264,7 +264,7 @@
</div>
<br><br>
<div style="float:right;position:relative;bottom:-25px">
- <a href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/news/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a>
+ <a href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/news/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a>
</div>
<h2 class="title">Latest News</h2>
<div>
@@ -376,7 +376,7 @@ MODULES= in rc.conf - Recent ...</p>
</div>
<div class="foot">
Copyright © 2002-2006, Judd Vinet &lt;<a href="mailto:jvinet@zeroflux.org">jvinet@zeroflux.org</a>&gt;<br><br>
- <img src="{{ RETRO_STATIC_URL }}button.png" alt="Arch Linux">
+ <img src="{% retro_static year "button.png" %}" alt="Arch Linux">
</div>
</body></html>
diff --git a/retro/templates/retro/index-20080311.html b/retro/templates/retro/index-20080311.html
index d48a632e..89a7de95 100644
--- a/retro/templates/retro/index-20080311.html
+++ b/retro/templates/retro/index-20080311.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd ">
+{% load retro_static from retro %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd ">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<title>Arch Linux</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" href="{{ RETRO_STATIC_URL }}arch.css">
- <link rel="icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
- <link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
+ <link rel="stylesheet" href="{% retro_static year "arch.css" %}">
+ <link rel="icon" href="{% retro_static year "favicon.ico" %}" type="image/x-icon">
+ <link rel="shortcut icon" href="{% retro_static year "favicon.ico" %}" type="image/x-icon">
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/news/">
<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/packages/">
@@ -14,8 +14,8 @@
<div id="head_container">
<div id="title">
- <div id="logo"><a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{{ RETRO_STATIC_URL }}logo.png" alt="Arch Logo"></a></div>
- <a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{{ RETRO_STATIC_URL }}title.png" alt="Arch Linux"></a>
+ <div id="logo"><a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{% retro_static year "logo.png" %}" alt="Arch Logo"></a></div>
+ <a href="http://web.archive.org/web/20070324064759/http://archlinux.org/"><img src="{% retro_static year "title.png" %}" alt="Arch Linux"></a>
</div>
<div id="main_nav">
<ul>
@@ -43,7 +43,7 @@
<table width="100%">
<tbody><tr>
<td><h3>Recent Updates</h3></td>
- <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/packages/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a></td>
+ <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/packages/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a></td>
</tr>
<tr>
@@ -272,7 +272,7 @@
</div>
<br><br>
<div style="float:right;position:relative;bottom:-25px">
- <a href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/news/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a>
+ <a href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/news/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a>
</div>
<h2 class="title">Latest News</h2>
<div>
diff --git a/retro/templates/retro/index-20090327.html b/retro/templates/retro/index-20090327.html
index 70c64736..e780d78d 100644
--- a/retro/templates/retro/index-20090327.html
+++ b/retro/templates/retro/index-20090327.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+{% load retro_static from retro %}<!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"><head>
<title>Arch Linux</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" href="{{ RETRO_STATIC_URL }}arch.css">
- <link rel="icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
- <link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
+ <link rel="stylesheet" href="{% retro_static year "arch.css" %}">
+ <link rel="icon" href="{% retro_static year "favicon.ico" %}" type="image/x-icon">
+ <link rel="shortcut icon" href="{% retro_static year "favicon.ico" %}" type="image/x-icon">
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/news/">
<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/packages/">
@@ -42,7 +42,7 @@
<table width="100%">
<tbody><tr>
<td><h3>Recent Updates</h3></td>
- <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/packages/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a></td>
+ <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/packages/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a></td>
</tr>
<tr>
@@ -156,7 +156,7 @@
<li><a href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/svn/">SVN</a></li>
<li><a href="http://web.archive.org/web/20090327235558/http://projects.archlinux.org/">Projects</a></li>
</ul>
- <a href="http://web.archive.org/web/20090327235558/http://www.sevenl.net/" title="SevenL Networks - Dedicated Arch Linux servers"><img src="{{ RETRO_STATIC_URL }}sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution"></a>
+ <a href="http://web.archive.org/web/20090327235558/http://www.sevenl.net/" title="SevenL Networks - Dedicated Arch Linux servers"><img src="{% retro_static year "sevenl_button.png" %}" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution"></a>
</div>
<div class="left">
@@ -184,7 +184,7 @@
</div>
<br><br>
<div style="float:right;position:relative;bottom:-25px">
- <a href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/news/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a>
+ <a href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/news/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a>
</div>
<h2 class="title">Latest News</h2>
<div>
diff --git a/retro/templates/retro/index-20100208.html b/retro/templates/retro/index-20100208.html
index 1d488248..b30d4cb4 100644
--- a/retro/templates/retro/index-20100208.html
+++ b/retro/templates/retro/index-20100208.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+{% load retro_static from retro %}<!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"><head>
<title>Arch Linux</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}arch.css">
- <link rel="icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
- <link rel="shortcut icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+ <link rel="stylesheet" type="text/css" href="{% retro_static year "arch.css" %}">
+ <link rel="icon" type="image/x-icon" href="{% retro_static year "favicon.ico" %}">
+ <link rel="shortcut icon" type="image/x-icon" href="{% retro_static year "favicon.ico" %}">
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/news/">
<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/packages/">
@@ -46,7 +46,7 @@
<table width="100%">
<tbody><tr>
<td><h3>Recent Updates</h3></td>
- <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/packages/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a></td>
+ <td style="vertical-align: top; text-align: right;"><a href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/packages/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a></td>
</tr>
<tr>
@@ -165,8 +165,8 @@
<li><a href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/svn/">SVN</a></li>
<li><a href="http://web.archive.org/web/20100208061823/http://projects.archlinux.org/">Projects</a></li>
</ul>
- <a href="http://web.archive.org/web/20100208061823/http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="{{ RETRO_STATIC_URL }}vnet_button.png" class="" title="" alt="velocity network - it's about time"></a>
- <a href="http://web.archive.org/web/20100208061823/https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="{{ RETRO_STATIC_URL }}sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution"></a>
+ <a href="http://web.archive.org/web/20100208061823/http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="{% retro_static year "vnet_button.png" %}" class="" title="" alt="velocity network - it's about time"></a>
+ <a href="http://web.archive.org/web/20100208061823/https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="{% retro_static year "sevenl_button.png" %}" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution"></a>
</div>
<div class="left">
@@ -194,7 +194,7 @@
</div>
<br><br>
<div style="float:right;position:relative;bottom:-25px">
- <a href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/news/"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a>
+ <a href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/news/"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a>
</div>
<h2 class="title">Latest News</h2>
<div>
diff --git a/retro/templates/retro/index-20110212.html b/retro/templates/retro/index-20110212.html
index e304a727..db4dfa41 100644
--- a/retro/templates/retro/index-20110212.html
+++ b/retro/templates/retro/index-20110212.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+{% load retro_static from retro %}<!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"><head>
<title>Arch Linux</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}archweb.css" media="screen, projection">
- <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}archweb-print.css" media="print">
- <link rel="icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
- <link rel="shortcut icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+ <link rel="stylesheet" type="text/css" href="{% retro_static year "archweb.css" %}" media="screen, projection">
+ <link rel="stylesheet" type="text/css" href="{% retro_static year "archweb-print.css" %}" media="print">
+ <link rel="icon" type="image/x-icon" href="{% retro_static year "favicon.ico" %}">
+ <link rel="shortcut icon" type="image/x-icon" href="{% retro_static year "favicon.ico" %}">
<link rel="search" type="application/opensearchdescription+xml" href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/opensearch/packages/" title="Arch Linux Packages">
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/feeds/news/">
@@ -71,7 +71,7 @@
<h3>Latest News <span class="more">(<a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/news/" title="Browse the news archives">more</a>)</span></h3>
- <a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/feeds/news/" title="Arch News RSS Feed" class="rss-icon"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a>
+ <a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/feeds/news/" title="Arch News RSS Feed" class="rss-icon"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a>
<h4><a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/news/mysql-55-is-now-in-extra/" title="View full article: MySQL 5.5 is now in [extra]">MySQL 5.5 is now in [extra]</a></h4>
@@ -199,7 +199,7 @@ use the proper directories.</p></div>
<h3>Recent Updates <span class="more">(<a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/packages/?sort=-last_update" title="Browse all of the latest packages">more</a>)</span></h3>
- <a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/feeds/packages/" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="{{ RETRO_STATIC_URL }}rss.png" alt="RSS Feed"></a>
+ <a href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/feeds/packages/" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="{% retro_static year "rss.png" %}" alt="RSS Feed"></a>
<table>
@@ -413,13 +413,13 @@ use the proper directories.</p></div>
<div id="arch-sponsors" class="widget">
<a href="http://web.archive.org/web/20110212035546/http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network">
- <img src="{{ RETRO_STATIC_URL }}vnet_button.png" alt="Velocity Network - It's about time">
+ <img src="{% retro_static year "vnet_button.png" %}" alt="Velocity Network - It's about time">
</a>
<a href="http://web.archive.org/web/20110212035546/https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">
- <img src="{{ RETRO_STATIC_URL }}sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution">
+ <img src="{% retro_static year "sevenl_button.png" %}" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution">
</a>
<a href="http://web.archive.org/web/20110212035546/http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner">
- <img src="{{ RETRO_STATIC_URL }}airvm_button.png" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner">
+ <img src="{% retro_static year "airvm_button.png" %}" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner">
</a>
</div>
diff --git a/retro/templatetags/__init__.py b/retro/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/retro/templatetags/__init__.py
diff --git a/retro/templatetags/retro.py b/retro/templatetags/retro.py
new file mode 100644
index 00000000..c7fd9f00
--- /dev/null
+++ b/retro/templatetags/retro.py
@@ -0,0 +1,13 @@
+from django import template
+from django.contrib.staticfiles.storage import staticfiles_storage
+
+register = template.Library()
+
+
+@register.simple_tag
+def retro_static(year, path):
+ """Like the built-in {% static %} tag but with a little extra magic."""
+ full_path = "%s/%s" % (year, path)
+ return staticfiles_storage.url(full_path)
+
+# vim: set ts=4 sw=4 et:
diff --git a/retro/views.py b/retro/views.py
index 5ce6d19d..3bc59e9f 100644
--- a/retro/views.py
+++ b/retro/views.py
@@ -1,4 +1,3 @@
-from django.conf import settings
from django.http import Http404
from django.views.decorators.cache import cache_page
from django.views.generic.simple import direct_to_template
@@ -24,9 +23,8 @@ def retro_homepage(request, year):
template = RETRO_YEAR_MAP.get(year, None)
if template is None:
raise Http404
- static_url = '%s%d/' % (settings.STATIC_URL, year)
context = {
- 'RETRO_STATIC_URL': static_url,
+ 'year': year,
}
return direct_to_template(request, 'retro/%s' % template, context)
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 7661f3b9..3318da58 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -183,7 +183,6 @@
<th class="key">Arch</th>
<th># Packages</th>
<th># Flagged</th>
- <th># Signed</th>
</tr>
</thead>
<tbody>
@@ -196,8 +195,6 @@
<td><a href="/packages/?arch={{ arch.name }}&amp;flagged=Flagged"
title="View all flagged packages for the {{ arch.name }} architecture">
<strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
-
- <td><strong>{{ arch.packages.signed.count }}</strong> packages</td>
</tr>
{% endfor %}
</tbody>
@@ -216,7 +213,6 @@
<th class="key">Repository</th>
<th># Packages</th>
<th># Flagged</th>
- <th># Signed</th>
</tr>
</thead>
<tbody>
@@ -229,7 +225,6 @@
<td><a href="/packages/?repo={{ repo.name }}&amp;flagged=Flagged"
title="View all flagged packages in the {{ repo.name }} repository">
<strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
- <td><strong>{{ repo.packages.signed.count }}</strong> packages</td>
</tr>
{% endfor %}
</tbody>
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-18 09:22:23 +0000